@oxyhq/auth 1.1.4 → 1.2.0

package/dist/cjs/hooks/useSessionSocket.js

@@ -10,10 +10,9 @@ const sonner_1 = require("sonner");
 const core_1 = require("@oxyhq/core");
 const core_2 = require("@oxyhq/core");
 const debug = (0, core_2.createDebugLogger)('SessionSocket');
-function useSessionSocket({ userId, activeSessionId, currentDeviceId, refreshSessions, logout, clearSessionState, baseURL, onRemoteSignOut, onSessionRemoved }) {
+function useSessionSocket({ userId, activeSessionId, currentDeviceId, refreshSessions, logout, clearSessionState, baseURL, getAccessToken, onRemoteSignOut, onSessionRemoved }) {
     const socketRef = (0, react_1.useRef)(null);
-    const joinedRoomRef = (0, react_1.useRef)(null);
-    // Store callbacks in refs to avoid re-joining when they change
+    // Store callbacks in refs to avoid reconnecting when they change
     const refreshSessionsRef = (0, react_1.useRef)(refreshSessions);
     const logoutRef = (0, react_1.useRef)(logout);
     const clearSessionStateRef = (0, react_1.useRef)(clearSessionState);
@@ -21,6 +20,7 @@ function useSessionSocket({ userId, activeSessionId, currentDeviceId, refreshSes
     const onSessionRemovedRef = (0, react_1.useRef)(onSessionRemoved);
     const activeSessionIdRef = (0, react_1.useRef)(activeSessionId);
     const currentDeviceIdRef = (0, react_1.useRef)(currentDeviceId);
+    const getAccessTokenRef = (0, react_1.useRef)(getAccessToken);
     // Update refs when callbacks change
     (0, react_1.useEffect)(() => {
         refreshSessionsRef.current = refreshSessions;
@@ -30,35 +30,32 @@ function useSessionSocket({ userId, activeSessionId, currentDeviceId, refreshSes
         onSessionRemovedRef.current = onSessionRemoved;
         activeSessionIdRef.current = activeSessionId;
         currentDeviceIdRef.current = currentDeviceId;
-    }, [refreshSessions, logout, clearSessionState, onRemoteSignOut, onSessionRemoved, activeSessionId, currentDeviceId]);
+        getAccessTokenRef.current = getAccessToken;
+    }, [refreshSessions, logout, clearSessionState, onRemoteSignOut, onSessionRemoved, activeSessionId, currentDeviceId, getAccessToken]);
     (0, react_1.useEffect)(() => {
         if (!userId || !baseURL) {
             // Clean up if userId or baseURL becomes invalid
-            if (socketRef.current && joinedRoomRef.current) {
-                socketRef.current.emit('leave', { userId: joinedRoomRef.current });
-                joinedRoomRef.current = null;
+            if (socketRef.current) {
+                socketRef.current.disconnect();
+                socketRef.current = null;
             }
             return;
         }
-        const roomId = `user:${userId}`;
-        // Only create socket if it doesn't exist
-        if (!socketRef.current) {
-            socketRef.current = (0, socket_io_client_1.default)(baseURL, {
-                transports: ['websocket'],
-            });
+        // Disconnect previous socket if switching users
+        if (socketRef.current) {
+            socketRef.current.disconnect();
+            socketRef.current = null;
         }
+        // Connect with auth token; use callback so reconnections get a fresh token
+        socketRef.current = (0, socket_io_client_1.default)(baseURL, {
+            transports: ['websocket'],
+            auth: (cb) => {
+                const token = getAccessTokenRef.current();
+                cb({ token: token ?? '' });
+            },
+        });
         const socket = socketRef.current;
-        // Only join if we haven't already joined this room
-        if (joinedRoomRef.current !== roomId) {
-            // Leave previous room if switching users
-            if (joinedRoomRef.current) {
-                socket.emit('leave', { userId: joinedRoomRef.current });
-            }
-            socket.emit('join', { userId: roomId });
-            joinedRoomRef.current = roomId;
-            debug.log('Emitting join for room:', roomId);
-        }
-        // Set up event handlers (only once per socket instance)
+        // Server auto-joins the user to `user:<userId>` room on connection
         const handleConnect = () => {
             debug.log('Socket connected:', socket.id);
         };
@@ -205,11 +202,8 @@ function useSessionSocket({ userId, activeSessionId, currentDeviceId, refreshSes
         return () => {
             socket.off('connect', handleConnect);
             socket.off('session_update', handleSessionUpdate);
-            // Only leave on unmount if we're still in this room
-            if (joinedRoomRef.current === roomId) {
-                socket.emit('leave', { userId: roomId });
-                joinedRoomRef.current = null;
-            }
+            socket.disconnect();
+            socketRef.current = null;
         };
     }, [userId, baseURL]); // Only depend on userId and baseURL - callbacks are in refs
 }

package/dist/esm/hooks/useSessionSocket.js

@@ -4,10 +4,9 @@ import { toast } from 'sonner';
 import { logger } from '@oxyhq/core';
 import { createDebugLogger } from '@oxyhq/core';
 const debug = createDebugLogger('SessionSocket');
-export function useSessionSocket({ userId, activeSessionId, currentDeviceId, refreshSessions, logout, clearSessionState, baseURL, onRemoteSignOut, onSessionRemoved }) {
+export function useSessionSocket({ userId, activeSessionId, currentDeviceId, refreshSessions, logout, clearSessionState, baseURL, getAccessToken, onRemoteSignOut, onSessionRemoved }) {
     const socketRef = useRef(null);
-    const joinedRoomRef = useRef(null);
-    // Store callbacks in refs to avoid re-joining when they change
+    // Store callbacks in refs to avoid reconnecting when they change
     const refreshSessionsRef = useRef(refreshSessions);
     const logoutRef = useRef(logout);
     const clearSessionStateRef = useRef(clearSessionState);
@@ -15,6 +14,7 @@ export function useSessionSocket({ userId, activeSessionId, currentDeviceId, ref
     const onSessionRemovedRef = useRef(onSessionRemoved);
     const activeSessionIdRef = useRef(activeSessionId);
     const currentDeviceIdRef = useRef(currentDeviceId);
+    const getAccessTokenRef = useRef(getAccessToken);
     // Update refs when callbacks change
     useEffect(() => {
         refreshSessionsRef.current = refreshSessions;
@@ -24,35 +24,32 @@ export function useSessionSocket({ userId, activeSessionId, currentDeviceId, ref
         onSessionRemovedRef.current = onSessionRemoved;
         activeSessionIdRef.current = activeSessionId;
         currentDeviceIdRef.current = currentDeviceId;
-    }, [refreshSessions, logout, clearSessionState, onRemoteSignOut, onSessionRemoved, activeSessionId, currentDeviceId]);
+        getAccessTokenRef.current = getAccessToken;
+    }, [refreshSessions, logout, clearSessionState, onRemoteSignOut, onSessionRemoved, activeSessionId, currentDeviceId, getAccessToken]);
     useEffect(() => {
         if (!userId || !baseURL) {
             // Clean up if userId or baseURL becomes invalid
-            if (socketRef.current && joinedRoomRef.current) {
-                socketRef.current.emit('leave', { userId: joinedRoomRef.current });
-                joinedRoomRef.current = null;
+            if (socketRef.current) {
+                socketRef.current.disconnect();
+                socketRef.current = null;
             }
             return;
         }
-        const roomId = `user:${userId}`;
-        // Only create socket if it doesn't exist
-        if (!socketRef.current) {
-            socketRef.current = io(baseURL, {
-                transports: ['websocket'],
-            });
+        // Disconnect previous socket if switching users
+        if (socketRef.current) {
+            socketRef.current.disconnect();
+            socketRef.current = null;
         }
+        // Connect with auth token; use callback so reconnections get a fresh token
+        socketRef.current = io(baseURL, {
+            transports: ['websocket'],
+            auth: (cb) => {
+                const token = getAccessTokenRef.current();
+                cb({ token: token ?? '' });
+            },
+        });
         const socket = socketRef.current;
-        // Only join if we haven't already joined this room
-        if (joinedRoomRef.current !== roomId) {
-            // Leave previous room if switching users
-            if (joinedRoomRef.current) {
-                socket.emit('leave', { userId: joinedRoomRef.current });
-            }
-            socket.emit('join', { userId: roomId });
-            joinedRoomRef.current = roomId;
-            debug.log('Emitting join for room:', roomId);
-        }
-        // Set up event handlers (only once per socket instance)
+        // Server auto-joins the user to `user:<userId>` room on connection
         const handleConnect = () => {
             debug.log('Socket connected:', socket.id);
         };
@@ -199,11 +196,8 @@ export function useSessionSocket({ userId, activeSessionId, currentDeviceId, ref
         return () => {
             socket.off('connect', handleConnect);
             socket.off('session_update', handleSessionUpdate);
-            // Only leave on unmount if we're still in this room
-            if (joinedRoomRef.current === roomId) {
-                socket.emit('leave', { userId: roomId });
-                joinedRoomRef.current = null;
-            }
+            socket.disconnect();
+            socketRef.current = null;
         };
     }, [userId, baseURL]); // Only depend on userId and baseURL - callbacks are in refs
 }

package/dist/types/hooks/useSessionSocket.d.ts

@@ -6,8 +6,9 @@ interface UseSessionSocketProps {
     logout: () => Promise<void>;
     clearSessionState: () => Promise<void>;
     baseURL: string;
+    getAccessToken: () => string | null;
     onRemoteSignOut?: () => void;
     onSessionRemoved?: (sessionId: string) => void;
 }
-export declare function useSessionSocket({ userId, activeSessionId, currentDeviceId, refreshSessions, logout, clearSessionState, baseURL, onRemoteSignOut, onSessionRemoved }: UseSessionSocketProps): void;
+export declare function useSessionSocket({ userId, activeSessionId, currentDeviceId, refreshSessions, logout, clearSessionState, baseURL, getAccessToken, onRemoteSignOut, onSessionRemoved }: UseSessionSocketProps): void;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/auth",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "description": "OxyHQ Web Authentication SDK — headless auth with React hooks for Next.js, Vite, and web apps",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/hooks/useSessionSocket.ts

@@ -14,15 +14,15 @@ interface UseSessionSocketProps {
   logout: () => Promise<void>;
   clearSessionState: () => Promise<void>;
   baseURL: string;
+  getAccessToken: () => string | null;
   onRemoteSignOut?: () => void;
   onSessionRemoved?: (sessionId: string) => void;
 }
 
-export function useSessionSocket({ userId, activeSessionId, currentDeviceId, refreshSessions, logout, clearSessionState, baseURL, onRemoteSignOut, onSessionRemoved }: UseSessionSocketProps) {
+export function useSessionSocket({ userId, activeSessionId, currentDeviceId, refreshSessions, logout, clearSessionState, baseURL, getAccessToken, onRemoteSignOut, onSessionRemoved }: UseSessionSocketProps) {
   const socketRef = useRef<any>(null);
-  const joinedRoomRef = useRef<string | null>(null);
-  
-  // Store callbacks in refs to avoid re-joining when they change
+
+  // Store callbacks in refs to avoid reconnecting when they change
   const refreshSessionsRef = useRef(refreshSessions);
   const logoutRef = useRef(logout);
   const clearSessionStateRef = useRef(clearSessionState);
@@ -30,6 +30,7 @@ export function useSessionSocket({ userId, activeSessionId, currentDeviceId, ref
   const onSessionRemovedRef = useRef(onSessionRemoved);
   const activeSessionIdRef = useRef(activeSessionId);
   const currentDeviceIdRef = useRef(currentDeviceId);
+  const getAccessTokenRef = useRef(getAccessToken);
 
   // Update refs when callbacks change
   useEffect(() => {
@@ -40,42 +41,36 @@ export function useSessionSocket({ userId, activeSessionId, currentDeviceId, ref
     onSessionRemovedRef.current = onSessionRemoved;
     activeSessionIdRef.current = activeSessionId;
     currentDeviceIdRef.current = currentDeviceId;
-  }, [refreshSessions, logout, clearSessionState, onRemoteSignOut, onSessionRemoved, activeSessionId, currentDeviceId]);
+    getAccessTokenRef.current = getAccessToken;
+  }, [refreshSessions, logout, clearSessionState, onRemoteSignOut, onSessionRemoved, activeSessionId, currentDeviceId, getAccessToken]);
 
   useEffect(() => {
     if (!userId || !baseURL) {
       // Clean up if userId or baseURL becomes invalid
-      if (socketRef.current && joinedRoomRef.current) {
-        socketRef.current.emit('leave', { userId: joinedRoomRef.current });
-        joinedRoomRef.current = null;
+      if (socketRef.current) {
+        socketRef.current.disconnect();
+        socketRef.current = null;
       }
       return;
     }
 
-    const roomId = `user:${userId}`;
-    
-    // Only create socket if it doesn't exist
-    if (!socketRef.current) {
-      socketRef.current = io(baseURL, {
-        transports: ['websocket'],
-      });
+    // Disconnect previous socket if switching users
+    if (socketRef.current) {
+      socketRef.current.disconnect();
+      socketRef.current = null;
     }
-    const socket = socketRef.current;
 
-    // Only join if we haven't already joined this room
-    if (joinedRoomRef.current !== roomId) {
-      // Leave previous room if switching users
-      if (joinedRoomRef.current) {
-        socket.emit('leave', { userId: joinedRoomRef.current });
-      }
-      
-      socket.emit('join', { userId: roomId });
-      joinedRoomRef.current = roomId;
-      
-      debug.log('Emitting join for room:', roomId);
-    }
+    // Connect with auth token; use callback so reconnections get a fresh token
+    socketRef.current = io(baseURL, {
+      transports: ['websocket'],
+      auth: (cb: (data: { token: string }) => void) => {
+        const token = getAccessTokenRef.current();
+        cb({ token: token ?? '' });
+      },
+    });
+    const socket = socketRef.current;
 
-    // Set up event handlers (only once per socket instance)
+    // Server auto-joins the user to `user:<userId>` room on connection
     const handleConnect = () => {
       debug.log('Socket connected:', socket.id);
     };
@@ -222,12 +217,8 @@ export function useSessionSocket({ userId, activeSessionId, currentDeviceId, ref
     return () => {
       socket.off('connect', handleConnect);
       socket.off('session_update', handleSessionUpdate);
-      
-      // Only leave on unmount if we're still in this room
-      if (joinedRoomRef.current === roomId) {
-        socket.emit('leave', { userId: roomId });
-        joinedRoomRef.current = null;
-      }
+      socket.disconnect();
+      socketRef.current = null;
     };
   }, [userId, baseURL]); // Only depend on userId and baseURL - callbacks are in refs
 }