Fix reconnect auth bug

sofvanh · Dec 3, 2024 · def911a · def911a
1 parent 7cb42f8
commit def911a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/frontend/src/contexts/AuthContext.tsx b/frontend/src/contexts/AuthContext.tsx
@@ -33,19 +33,20 @@ export const AuthProvider: React.FC<{ children: ReactNode }> = ({ children }) =>
       return;
     }
 
-    if (storedToken && socket && !user && !loading) {
+    if (storedToken && socket) {
       setLoading(true);
       socket.emit('authenticate', storedToken, (response: any) => {
         if (response.success) {
           setUser(response.user);
         } else {
           console.error('Authentication failed');
           localStorage.removeItem(TOKEN_STORAGE_KEY);
+          setUser(null);
         }
         setLoading(false);
       });
     }
-  }, [socket, loading, user]);
+  }, [socket]);
 
   const signIn = (response: CredentialResponse) => {
     localStorage.setItem(TOKEN_STORAGE_KEY, response.credential!);

diff --git a/frontend/src/contexts/WebSocketContext.tsx b/frontend/src/contexts/WebSocketContext.tsx
@@ -16,6 +16,21 @@ export const WebSocketProvider: React.FC<{ children: React.ReactNode }> = ({ chi
   useEffect(() => {
     const socket = getSocket();
     socket.connect();
+
+    // Handle reconnection authentication
+    socket.io.on('reconnect', () => {
+      const storedToken = localStorage.getItem('mindmeld_auth_token');
+      if (storedToken) {
+        socket.emit('authenticate', storedToken, (response: any) => {
+          if (!response.success) {
+            console.error('Re-authentication failed after reconnect');
+            localStorage.removeItem('mindmeld_auth_token');
+            window.location.reload();
+          }
+        });
+      }
+    });
+
     setSocket(socket);
 
     return () => {