fix linter

Author: icerzack

.gitignore

@@ -19,4 +19,5 @@
 
 # Go workspace file
 go.work
-.idea
+.idea
+config.yaml

cmd/config.go

@@ -15,8 +15,8 @@ type Config struct {
 			Port       int `yaml:"port"`
 			Validation struct {
 				JWTHeaderName      string `yaml:"jwt_header_name"`
-				JWTValidationURL   string `yaml:"jwt_url"`
-				BoardValidationURL string `yaml:"board_url"`
+				JWTValidationURL   string `yaml:"jwt_validation_url"`
+				BoardValidationURL string `yaml:"board_validation_url"`
 			} `yaml:"validation"`
 		} `yaml:"rest"`
 	} `yaml:"apps"`

config-example.yaml

@@ -0,0 +1,14 @@
+apps:
+  log_level: "DEBUG"
+  rest:
+    port: 8080
+    validation:
+      jwt_header_name: "<YOUR_JWT_HEADER_NAME>"
+      jwt_validation_url: "<YOUR_JWT_VALIDATION_URL>"
+      board_validation_url: "<YOUR_BOARD_VALIDATION_URL>"
+
+storage:
+  users:
+    type: "in-memory"
+  rooms:
+    type: "in-memory"

config.yaml

@@ -109,13 +109,14 @@ func (ws *WebSocketHandler) messageHandler(conn *websocket.Conn, msg []byte) {
 	case MessageConnectRequest:
 		ws.registerUser(conn, v)
 	case MessageNewDataRequest:
-		ws.sendDataToRoom(conn, v)
+		ws.sendDataToRoom(v)
 	case MessageSetLeaderRequest:
-		ws.setLeader(conn, v)
+		ws.setLeader(v)
 	}
 }
 
-func (ws *WebSocketHandler) setLeader(conn *websocket.Conn, request MessageSetLeaderRequest) {
+//nolint:cyclop
+func (ws *WebSocketHandler) setLeader(request MessageSetLeaderRequest) {
 	// Get the UserID from the JWT token
 	userID, err := ws.validateJWT(request.Jwt)
 	if err != nil {
@@ -146,13 +147,14 @@ func (ws *WebSocketHandler) setLeader(conn *websocket.Conn, request MessageSetLe
 	}
 
 	// Set the leader
-	if currentRoom.LeaderID == "0" {
+	switch currentRoom.LeaderID {
+	case "0":
 		currentRoom.SetLeader(userID)
 		ws.logger.Debug("User set as the leader", zap.String("userID", userID), zap.String("boardID", request.BoardID))
-	} else if currentRoom.LeaderID == userID {
+	case userID:
 		currentRoom.SetLeader("0")
 		ws.logger.Debug("Leader removed", zap.String("userID", userID), zap.String("boardID", request.BoardID))
-	} else {
+	default:
 		return
 	}
 
@@ -177,7 +179,8 @@ func (ws *WebSocketHandler) setLeader(conn *websocket.Conn, request MessageSetLe
 	}
 }
 
-func (ws *WebSocketHandler) sendDataToRoom(conn *websocket.Conn, request MessageNewDataRequest) {
+//nolint:cyclop
+func (ws *WebSocketHandler) sendDataToRoom(request MessageNewDataRequest) {
 	// Get the UserID from the JWT token
 	userID, err := ws.validateJWT(request.Jwt)
 	if err != nil {
@@ -278,7 +281,7 @@ func (ws *WebSocketHandler) unregisterUser(conn *websocket.Conn) {
 	}
 
 	// Get the users ids
-	var userIDs []string
+	userIDs := make([]string, 0)
 	for _, u := range currentRoom.GetUsers() {
 		userIDs = append(userIDs, u.ID)
 	}
@@ -304,7 +307,8 @@ func (ws *WebSocketHandler) registerUser(conn *websocket.Conn, request MessageCo
 
 	// Check if the user has access to the board
 	if !ws.validateBoardAccess(request.BoardID, request.Jwt) {
-		ws.logger.Debug("User not allowed to access this board", zap.String("userID", userID), zap.String("boardID", request.BoardID))
+		ws.logger.Debug("User not allowed to access this board",
+			zap.String("userID", userID), zap.String("boardID", request.BoardID))
 		return
 	}
 
@@ -335,7 +339,7 @@ func (ws *WebSocketHandler) registerUser(conn *websocket.Conn, request MessageCo
 	currentRoom.AddUser(newUser)
 
 	// Get the users ids
-	var userIDs []string
+	userIDs := make([]string, 0)
 	for _, u := range currentRoom.GetUsers() {
 		userIDs = append(userIDs, u.ID)
 	}
@@ -375,26 +379,6 @@ func (ws *WebSocketHandler) sendUserConnected(request MessageUserConnectedRespon
 	}
 }
 
-func (ws *WebSocketHandler) sendUserFailedToConnect(conn *websocket.Conn, reason string) {
-	failedUser, err := ws.userStorage.GetWhere(func(u *user.User) bool {
-		return u.Conn == conn
-	})
-	if err != nil {
-		return
-	}
-	err = failedUser.Conn.WriteJSON(MessageUserFailedToConnectResponse{
-		Message: Message{
-			Event: EventUserFailedToConnect,
-		},
-		UserID: failedUser.ID,
-		Reason: reason,
-	})
-	if err != nil {
-		return
-	}
-	failedUser.Conn.Close()
-}
-
 func (ws *WebSocketHandler) sendUserDisconnected(request MessageUserDisconnectedResponse) {
 	// Get the room
 	currentRoom, _ := ws.roomStorage.Get(request.BoardID)

internal/rest/ws/handler.go

@@ -21,6 +21,7 @@ type MessageNewDataRequest struct {
 	Data    Data   `json:"data"`
 }
 
+//nolint:tagliatelle
 type MessageUserConnectedResponse struct {
 	Message
 	BoardID  string   `json:"board_id"`
@@ -46,6 +47,7 @@ type MessageUserFailedToConnectResponse struct {
 	Reason string `json:"reason"`
 }
 
+//nolint:tagliatelle
 type MessageUserDisconnectedResponse struct {
 	Message
 	BoardID  string   `json:"board_id"`