auth work

ws/ws.go

@@ -100,13 +100,12 @@ func WsHandler(w http.ResponseWriter, r *http.Request) {
 			if err != nil {
 				errmsg := fmt.Sprintf("Error marshalling token: %v", err)
 				config.Logger.Error(errmsg)
-				continue
+				return
 			}
 			if err := conn.WriteMessage(websocket.TextMessage, respJson); err != nil {
 				config.Logger.Error(fmt.Sprintf("Error writing response: %v", err))
-				continue
+				return
 			}
-			continue
 		}
 		payload.Payload = structs.WsLoginPayload{}
 		token := map[string]string{
@@ -135,16 +134,19 @@ func WsHandler(w http.ResponseWriter, r *http.Request) {
 				if err := broadcast.BroadcastToClients(); err != nil {
 					errmsg := fmt.Sprintf("Unable to broadcast to peer(s): %v", err)
 					config.Logger.Error(errmsg)
+					return
 				}
 			default:
 				errmsg := fmt.Sprintf("Unknown request type: %s", payload.Type)
 				config.Logger.Warn(errmsg)
+				return
 			}
 		} else {
 			switch payload.Type {
 			case "login":
 				if err = loginHandler(conn, msg, payload); err != nil {
 					config.Logger.Error(fmt.Sprintf("%v", err))
+					return
 				}
 			case "setup":
 				config.Logger.Info("Setup")
@@ -152,6 +154,7 @@ func WsHandler(w http.ResponseWriter, r *http.Request) {
 			default:
 				errmsg := fmt.Sprintf("Unknown request type: %s", payload.Type)
 				config.Logger.Warn(errmsg)
+				return
 			}
 		}
 	}
@@ -185,7 +188,6 @@ func loginHandler(conn *websocket.Conn, msg []byte, payload structs.WsPayload) e
 		config.Logger.Info("Login failed")
 		return fmt.Errorf("Failed auth")
 	}
-	return nil
 }
 
 
@@ -204,11 +206,12 @@ func unauthHandler(conn *websocket.Conn, r *http.Request) {
 	resp, err := json.Marshal(blob)
 	if err != nil {
 		config.Logger.Error(fmt.Sprintf("Error unmarshalling message: %v", err))
+		return
 	}
 	if err := conn.WriteMessage(websocket.TextMessage, resp); err != nil {
 		config.Logger.Error(fmt.Sprintf("Error writing response: %v", err))
+		return
 	}
-	return
 }
 
 // client send: