auth work

broadcast/broadcast.go

@@ -39,25 +39,6 @@ func init() {
 	broadcastState = broadcast
 }
 
-// adds ws client
-func RegisterClient(conn *websocket.Conn) {
-	clients[conn] = true
-	broadcastJson, err := GetStateJson()
-	if err != nil {
-		return
-	}
-	// when a new ws client registers, send them the current broadcast
-	if err := conn.WriteMessage(websocket.TextMessage, broadcastJson); err != nil {
-		fmt.Println("Error writing response:", err)
-		return
-	}
-}
-
-// remove ws client
-func UnregisterClient(conn *websocket.Conn) {
-	delete(clients, conn)
-}
-
 // take in config file and addt'l info to initialize broadcast
 func bootstrapBroadcastState(conf structs.SysConfig) (structs.AuthBroadcast, error) {
 	config.Logger.Info("Bootstrapping state")

ws/ws.go

@@ -132,7 +132,10 @@ func WsHandler(w http.ResponseWriter, r *http.Request) {
 					config.Logger.Error(errmsg)
 				}
 				if err := conn.WriteMessage(websocket.TextMessage, respJson); err != nil {
-					config.Logger.Error(fmt.Sprintf("Error writing response: %v", err))
+					err := auth.RemoveFromAuthMap(newToken["id"],false)
+					if err != nil {
+						config.Logger.Error(fmt.Sprintf("Error removing token: %v", err))
+					}
 				}
 			default:
 				errmsg := fmt.Sprintf("Unknown unauth request type: %s", payload.Type)
@@ -204,7 +207,7 @@ func unauthHandler(conn *websocket.Conn, r *http.Request) {
 		return
 	}
 	if err := conn.WriteMessage(websocket.TextMessage, resp); err != nil {
-		config.Logger.Error(fmt.Sprintf("Error writing response: %v", err))
+		config.Logger.Error(fmt.Sprintf("Error writing unauth response: %v", err))
 		return
 	}
 }