auth work

ws/ws.go

@@ -101,13 +101,18 @@ func WsHandler(w http.ResponseWriter, r *http.Request) {
 				config.Logger.Error(fmt.Sprintf("Error writing response: %v", err))
 			}
 		}
+		var msgType structs.WsType
+		err = json.Unmarshal(msg, &msgType)
+		if err != nil {
+			config.Logger.Warn(fmt.Sprintf("Error marshalling token: %v", err))
+		}
 		payload.Payload = structs.WsLoginPayload{}
 		token := map[string]string{
 			"id":    payload.Token.ID,
 			"token": payload.Token.Token,
 		}
 		if auth.CheckToken(token, conn, r, conf.FirstBoot) {
-			switch payload.Payload.Type {
+			switch msgType.Payload.Type {
 			case "new_ship":
 				config.Logger.Info("New ship")
 			case "pier_upload":
@@ -134,7 +139,7 @@ func WsHandler(w http.ResponseWriter, r *http.Request) {
 				config.Logger.Warn(errmsg)
 			}
 		} else {
-			switch payload.Payload.Type {
+			switch msgType.Payload.Type {
 			case "login":
 				if err = loginHandler(conn, msg, payload); err != nil {
 					config.Logger.Error(fmt.Sprintf("%v", err))