@oxyhq/services 5.7.5 → 5.8.2

package/src/ui/context/OxyContext.tsx

@@ -1,6 +1,6 @@
-import React, { createContext, useContext, useEffect, useCallback, ReactNode, useMemo } from 'react';
+import React, { createContext, useContext, useEffect, useCallback, ReactNode, useMemo, useRef, useState } from 'react';
 import { OxyServices } from '../../core';
-import { User } from '../../models/interfaces';
+import { User, ApiError } from '../../models/interfaces';
 import { SecureLoginResponse, SecureClientSession, MinimalUserData } from '../../models/secureSession';
 import { DeviceManager } from '../../utils/deviceManager';
 import { useSessionSocket } from '../hooks/useSessionSocket';
@@ -49,9 +49,11 @@ const OxyContext = createContext<OxyContextState | null>(null);
 // Props for the OxyContextProvider
 export interface OxyContextProviderProps {
   children: ReactNode;
-  oxyServices: OxyServices;
+  oxyServices?: OxyServices; // Now optional - will be created automatically if not provided
+  baseURL?: string; // New: API base URL for automatic service creation
   storageKeyPrefix?: string;
   onAuthStateChange?: (user: User | null) => void;
+  onError?: (error: ApiError) => void; // New: Error callback
   bottomSheetRef?: React.RefObject<any>;
 }
 
@@ -110,17 +112,33 @@ const getStorage = async (): Promise<StorageInterface> => {
 
 // Storage keys for secure sessions
 const getSecureStorageKeys = (prefix = 'oxy_secure') => ({
-  sessions: `${prefix}_sessions`, // Array of SecureClientSession objects
-  activeSessionId: `${prefix}_active_session_id`, // ID of currently active session
+  activeSessionId: `${prefix}_active_session_id`, // Only store the active session ID
 });
 
-export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
+export const OxyProvider: React.FC<OxyContextProviderProps> = ({
   children,
-  oxyServices,
+  oxyServices: providedOxyServices,
+  baseURL,
   storageKeyPrefix = 'oxy_secure',
   onAuthStateChange,
+  onError,
   bottomSheetRef,
 }) => {
+  // Create oxyServices automatically if not provided
+  const oxyServicesRef = useRef<OxyServices | null>(null);
+
+  if (!oxyServicesRef.current) {
+    if (providedOxyServices) {
+      oxyServicesRef.current = providedOxyServices;
+    } else if (baseURL) {
+      oxyServicesRef.current = new OxyServices({ baseURL });
+    } else {
+      throw new Error('Either oxyServices or baseURL must be provided to OxyContextProvider');
+    }
+  }
+
+  const oxyServices = oxyServicesRef.current;
+
   // Zustand state
   const user = useAuthStore((state) => state.user);
   const isAuthenticated = useAuthStore((state) => state.isAuthenticated);
@@ -156,94 +174,60 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
     initStorage();
   }, []);
 
-  // Effect to initialize authentication state
+  // Effect to initialize authentication state - only store session ID
   useEffect(() => {
     const initAuth = async () => {
       if (!storage) return;
 
       useAuthStore.setState({ isLoading: true });
       try {
-        // Load stored sessions
-        const sessionsData = await storage.getItem(keys.sessions);
+        // Only load the active session ID from storage
         const storedActiveSessionId = await storage.getItem(keys.activeSessionId);
 
-        console.log('SecureAuth - sessionsData:', sessionsData);
         console.log('SecureAuth - activeSessionId:', storedActiveSessionId);
 
-        if (sessionsData) {
-          const parsedSessions: SecureClientSession[] = JSON.parse(sessionsData);
-
-          // Migrate old session format to include user info
-          const migratedSessions: SecureClientSession[] = [];
-          let shouldUpdateStorage = false;
-
-          for (const session of parsedSessions) {
-            if (!session.userId) {
-              // Session is missing user info, try to fetch it
-              try {
-                const sessionUser = await oxyServices.getUserBySession(session.sessionId);
-                migratedSessions.push({
-                  ...session,
-                  userId: sessionUser.id
-                });
-                shouldUpdateStorage = true;
-                console.log(`Migrated session ${session.sessionId} for user ${sessionUser.id}`);
-              } catch (error) {
-                // Session might be invalid, skip it
-                console.log(`Removing invalid session ${session.sessionId}:`, error);
-                shouldUpdateStorage = true;
+        if (storedActiveSessionId) {
+          // Validate the stored session with the backend
+          try {
+            const validation = await oxyServices.validateSession(storedActiveSessionId);
+
+            if (validation.valid) {
+              console.log('SecureAuth - session validated successfully');
+              setActiveSessionId(storedActiveSessionId);
+
+              // Get access token for API calls
+              await oxyServices.getTokenBySession(storedActiveSessionId);
+
+              // Load full user data from backend
+              const fullUser = await oxyServices.getUserBySession(storedActiveSessionId);
+              loginSuccess(fullUser);
+              setMinimalUser({
+                id: fullUser.id,
+                username: fullUser.username,
+                avatar: fullUser.avatar
+              });
+
+              // Load sessions from backend
+              const serverSessions = await oxyServices.getSessionsBySessionId(storedActiveSessionId);
+              const clientSessions: SecureClientSession[] = serverSessions.map(serverSession => ({
+                sessionId: serverSession.sessionId,
+                deviceId: serverSession.deviceId,
+                expiresAt: serverSession.expiresAt || new Date().toISOString(),
+                lastActive: serverSession.lastActive || new Date().toISOString(),
+                userId: serverSession.userId || fullUser.id
+              }));
+              setSessions(clientSessions);
+
+              if (onAuthStateChange) {
+                onAuthStateChange(fullUser);
               }
             } else {
-              // Session already has user info
-              migratedSessions.push(session);
-            }
-          }
-
-          // Update storage if we made changes
-          if (shouldUpdateStorage) {
-            await saveSessionsToStorage(migratedSessions);
-          }
-
-          setSessions(migratedSessions);
-
-          if (storedActiveSessionId && migratedSessions.length > 0) {
-            const activeSession = migratedSessions.find(s => s.sessionId === storedActiveSessionId);
-
-            if (activeSession) {
-              console.log('SecureAuth - activeSession found:', activeSession);
-
-              // Validate session
-              try {
-                const validation = await oxyServices.validateSession(activeSession.sessionId);
-
-                if (validation.valid) {
-                  console.log('SecureAuth - session validated successfully');
-                  setActiveSessionId(activeSession.sessionId);
-
-                  // Get access token for API calls
-                  await oxyServices.getTokenBySession(activeSession.sessionId);
-
-                  // Load full user data
-                  const fullUser = await oxyServices.getUserBySession(activeSession.sessionId);
-                  loginSuccess(fullUser);
-                  setMinimalUser({
-                    id: fullUser.id,
-                    username: fullUser.username,
-                    avatar: fullUser.avatar
-                  });
-
-                  if (onAuthStateChange) {
-                    onAuthStateChange(fullUser);
-                  }
-                } else {
-                  console.log('SecureAuth - session invalid, removing');
-                  await removeInvalidSession(activeSession.sessionId);
-                }
-              } catch (error) {
-                console.error('SecureAuth - session validation error:', error);
-                await removeInvalidSession(activeSession.sessionId);
-              }
+              console.log('SecureAuth - session invalid, clearing storage');
+              await clearAllStorage();
             }
+          } catch (error) {
+            console.error('SecureAuth - session validation error:', error);
+            await clearAllStorage();
           }
         }
       } catch (err) {
@@ -257,33 +241,15 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
     if (storage) {
       initAuth();
     }
-  }, [storage, oxyServices, keys, onAuthStateChange]);
+  }, [storage, oxyServices, keys, onAuthStateChange, loginSuccess, setMinimalUser]);
 
-  // Effect to restore token on app load or session switch
-  useEffect(() => {
-    const restoreToken = async () => {
-      if (activeSessionId && oxyServices) {
-        try {
-          await oxyServices.getTokenBySession(activeSessionId);
-          setTokenReady(true);
-        } catch (err) {
-          // If token restoration fails, force logout
-          await logout();
-          setTokenReady(false);
-        }
-      } else {
-        setTokenReady(true); // No session, so token is not needed
-      }
-    };
-    restoreToken();
-    // Only run when activeSessionId or oxyServices changes
-  }, [activeSessionId, oxyServices]);
 
-  // Remove invalid session
+
+  // Remove invalid session - refresh sessions from backend
   const removeInvalidSession = useCallback(async (sessionId: string): Promise<void> => {
+    // Remove from local state
     const filteredSessions = sessions.filter(s => s.sessionId !== sessionId);
     setSessions(filteredSessions);
-    await saveSessionsToStorage(filteredSessions);
 
     // If there are other sessions, switch to the first one
     if (filteredSessions.length > 0) {
@@ -301,13 +267,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
     }
   }, [sessions, storage, keys, onAuthStateChange, logoutStore]);
 
-  // Save sessions to storage
-  const saveSessionsToStorage = useCallback(async (sessionsList: SecureClientSession[]): Promise<void> => {
-    if (!storage) return;
-    await storage.setItem(keys.sessions, JSON.stringify(sessionsList));
-  }, [storage, keys.sessions]);
-
-  // Save active session ID to storage
+  // Save active session ID to storage (only session ID, no user data)
   const saveActiveSessionId = useCallback(async (sessionId: string): Promise<void> => {
     if (!storage) return;
     await storage.setItem(keys.activeSessionId, sessionId);
@@ -317,7 +277,6 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
   const clearAllStorage = useCallback(async (): Promise<void> => {
     if (!storage) return;
     try {
-      await storage.removeItem(keys.sessions);
       await storage.removeItem(keys.activeSessionId);
     } catch (err) {
       console.error('Clear secure storage error:', err);
@@ -356,8 +315,8 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
     }
   }, [oxyServices, onAuthStateChange, loginSuccess, saveActiveSessionId]);
 
-  // Secure login method
-  const login = async (username: string, password: string, deviceName?: string): Promise<User> => {
+  // Secure login method - only store session ID, retrieve data from backend
+  const login = useCallback(async (username: string, password: string, deviceName?: string): Promise<User> => {
     if (!storage) throw new Error('Storage not initialized');
     useAuthStore.setState({ isLoading: true, error: null });
 
@@ -378,56 +337,29 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
         deviceFingerprint
       );
 
-      // Create client session object with user info for duplicate detection
-      const clientSession: SecureClientSession = {
-        sessionId: response.sessionId,
-        deviceId: response.deviceId,
-        expiresAt: response.expiresAt,
-        lastActive: new Date().toISOString(),
-        userId: response.user.id
-      };
-
-      // Check if this user already has a session (prevent duplicate accounts)
-      const existingUserSessionIndex = sessions.findIndex(s =>
-        s.userId === response.user.id
-      );
-
-      let updatedSessions: SecureClientSession[];
-
-      if (existingUserSessionIndex !== -1) {
-        // User already has a session - replace it with the new one (reused session scenario)
-        const existingSession = sessions[existingUserSessionIndex];
-        updatedSessions = [...sessions];
-        updatedSessions[existingUserSessionIndex] = clientSession;
-
-        console.log(`Reusing/updating existing session for user ${response.user.id}. Previous session: ${existingSession.sessionId}, New session: ${response.sessionId}`);
-
-        // If the replaced session was the active one, update active session
-        if (activeSessionId === existingSession.sessionId) {
-          setActiveSessionId(response.sessionId);
-          await saveActiveSessionId(response.sessionId);
-        }
-      } else {
-        // Add new session for new user
-        updatedSessions = [...sessions, clientSession];
-        console.log(`Added new session for user ${response.user.id} on device ${response.deviceId}`);
-      }
-
-      setSessions(updatedSessions);
-      await saveSessionsToStorage(updatedSessions);
-
-      // Set as active session
+      // Set as active session (only store session ID)
       setActiveSessionId(response.sessionId);
       await saveActiveSessionId(response.sessionId);
 
       // Get access token for API calls
       await oxyServices.getTokenBySession(response.sessionId);
 
-      // Load full user data
+      // Load full user data from backend
       const fullUser = await oxyServices.getUserBySession(response.sessionId);
       loginSuccess(fullUser);
       setMinimalUser(response.user);
 
+      // Load sessions from backend
+      const serverSessions = await oxyServices.getSessionsBySessionId(response.sessionId);
+      const clientSessions: SecureClientSession[] = serverSessions.map(serverSession => ({
+        sessionId: serverSession.sessionId,
+        deviceId: serverSession.deviceId,
+        expiresAt: serverSession.expiresAt || new Date().toISOString(),
+        lastActive: serverSession.lastActive || new Date().toISOString(),
+        userId: serverSession.userId || fullUser.id
+      }));
+      setSessions(clientSessions);
+
       if (onAuthStateChange) {
         onAuthStateChange(fullUser);
       }
@@ -439,20 +371,19 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
     } finally {
       useAuthStore.setState({ isLoading: false });
     }
-  };
+  }, [storage, oxyServices, saveActiveSessionId, loginSuccess, setMinimalUser, onAuthStateChange, loginFailure]);
 
   // Logout method
-  const logout = async (targetSessionId?: string): Promise<void> => {
+  const logout = useCallback(async (targetSessionId?: string): Promise<void> => {
     if (!activeSessionId) return;
 
     try {
       const sessionToLogout = targetSessionId || activeSessionId;
       await oxyServices.logoutSecureSession(activeSessionId, sessionToLogout);
 
-      // Remove session from local storage
+      // Remove session from local state
       const filteredSessions = sessions.filter(s => s.sessionId !== sessionToLogout);
       setSessions(filteredSessions);
-      await saveSessionsToStorage(filteredSessions);
 
       // If logging out active session
       if (sessionToLogout === activeSessionId) {
@@ -475,10 +406,10 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
       console.error('Logout error:', error);
       useAuthStore.setState({ error: 'Logout failed' });
     }
-  };
+  }, [activeSessionId, oxyServices, sessions, switchToSession, logoutStore, setMinimalUser, storage, keys.activeSessionId, onAuthStateChange]);
 
   // Logout all sessions
-  const logoutAll = async (): Promise<void> => {
+  const logoutAll = useCallback(async (): Promise<void> => {
     console.log('logoutAll called with activeSessionId:', activeSessionId);
 
     if (!activeSessionId) {
@@ -515,10 +446,30 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
       useAuthStore.setState({ error: `Logout all failed: ${error instanceof Error ? error.message : 'Unknown error'}` });
       throw error;
     }
-  };
+  }, [activeSessionId, oxyServices, logoutStore, setMinimalUser, clearAllStorage, onAuthStateChange]);
+
+  // Effect to restore token on app load or session switch
+  useEffect(() => {
+    const restoreToken = async () => {
+      if (activeSessionId && oxyServices) {
+        try {
+          await oxyServices.getTokenBySession(activeSessionId);
+          setTokenReady(true);
+        } catch (err) {
+          // If token restoration fails, force logout
+          await logout();
+          setTokenReady(false);
+        }
+      } else {
+        setTokenReady(true); // No session, so token is not needed
+      }
+    };
+    restoreToken();
+    // Only run when activeSessionId or oxyServices changes
+  }, [activeSessionId, oxyServices, logout]);
 
   // Sign up method
-  const signUp = async (username: string, email: string, password: string): Promise<User> => {
+  const signUp = useCallback(async (username: string, email: string, password: string): Promise<User> => {
     if (!storage) throw new Error('Storage not initialized');
 
     useAuthStore.setState({ isLoading: true, error: null });
@@ -540,42 +491,82 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
     } finally {
       useAuthStore.setState({ isLoading: false });
     }
-  };
+  }, [storage, oxyServices, login, loginFailure]);
 
   // Switch session method
-  const switchSession = async (sessionId: string): Promise<void> => {
+  const switchSession = useCallback(async (sessionId: string): Promise<void> => {
     await switchToSession(sessionId);
-  };
+  }, [switchToSession]);
 
   // Remove session method
-  const removeSession = async (sessionId: string): Promise<void> => {
+  const removeSession = useCallback(async (sessionId: string): Promise<void> => {
     await logout(sessionId);
-  };
+  }, [logout]);
 
   // Refresh sessions method
-  const refreshSessions = async (): Promise<void> => {
-    if (!activeSessionId) return;
+  const refreshSessions = useCallback(async (): Promise<void> => {
+    console.log('refreshSessions called with activeSessionId:', activeSessionId);
+
+    if (!activeSessionId) {
+      console.log('refreshSessions: No activeSessionId, returning');
+      return;
+    }
 
     try {
+      console.log('refreshSessions: Calling getSessionsBySessionId...');
       const serverSessions = await oxyServices.getSessionsBySessionId(activeSessionId);
+      console.log('refreshSessions: Server sessions received:', serverSessions);
 
       // Update local sessions with server data
       const updatedSessions: SecureClientSession[] = serverSessions.map(serverSession => ({
         sessionId: serverSession.sessionId,
         deviceId: serverSession.deviceId,
-        expiresAt: new Date().toISOString(), // You might want to get this from server
-        lastActive: new Date().toISOString()
+        expiresAt: serverSession.expiresAt || new Date().toISOString(),
+        lastActive: serverSession.lastActive || new Date().toISOString(),
+        userId: serverSession.userId || user?.id
       }));
 
+      console.log('refreshSessions: Updated sessions:', updatedSessions);
       setSessions(updatedSessions);
-      await saveSessionsToStorage(updatedSessions);
+      console.log('refreshSessions: Sessions updated in state');
     } catch (error) {
       console.error('Refresh sessions error:', error);
+
+      // If the current session is invalid, try to find another valid session
+      if (sessions.length > 1) {
+        console.log('Current session invalid, trying to switch to another session...');
+        const otherSessions = sessions.filter(s => s.sessionId !== activeSessionId);
+
+        for (const session of otherSessions) {
+          try {
+            // Try to validate this session
+            await oxyServices.validateSession(session.sessionId);
+            console.log('Found valid session, switching to:', session.sessionId);
+            await switchToSession(session.sessionId);
+            return; // Successfully switched to another session
+          } catch (sessionError) {
+            console.log('Session validation failed for:', session.sessionId, sessionError);
+            continue; // Try next session
+          }
+        }
+      }
+
+      // If no valid sessions found, clear all sessions
+      console.log('No valid sessions found, clearing all sessions');
+      setSessions([]);
+      setActiveSessionId(null);
+      logoutStore();
+      setMinimalUser(null);
+      await clearAllStorage();
+
+      if (onAuthStateChange) {
+        onAuthStateChange(null);
+      }
     }
-  };
+  }, [activeSessionId, oxyServices, user?.id, sessions, switchToSession, logoutStore, setMinimalUser, clearAllStorage, onAuthStateChange]);
 
   // Device management methods
-  const getDeviceSessions = async (): Promise<any[]> => {
+  const getDeviceSessions = useCallback(async (): Promise<any[]> => {
     if (!activeSessionId) throw new Error('No active session');
 
     try {
@@ -584,9 +575,9 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
       console.error('Get device sessions error:', error);
       throw error;
     }
-  };
+  }, [activeSessionId, oxyServices]);
 
-  const logoutAllDeviceSessions = async (): Promise<void> => {
+  const logoutAllDeviceSessions = useCallback(async (): Promise<void> => {
     if (!activeSessionId) throw new Error('No active session');
 
     try {
@@ -606,9 +597,9 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
       console.error('Logout all device sessions error:', error);
       throw error;
     }
-  };
+  }, [activeSessionId, oxyServices, logoutStore, setMinimalUser, clearAllStorage, onAuthStateChange]);
 
-  const updateDeviceName = async (deviceName: string): Promise<void> => {
+  const updateDeviceName = useCallback(async (deviceName: string): Promise<void> => {
     if (!activeSessionId) throw new Error('No active session');
 
     try {
@@ -620,7 +611,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
       console.error('Update device name error:', error);
       throw error;
     }
-  };
+  }, [activeSessionId, oxyServices]);
 
   // Bottom sheet control methods
   const showBottomSheet = useCallback((screenOrConfig?: string | { screen: string; props?: Record<string, any> }) => {
@@ -638,6 +629,7 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
         bottomSheetRef.current.present();
       } else {
         console.warn('No expand or present method available on bottomSheetRef');
+        console.log('Available methods on bottomSheetRef.current:', Object.keys(bottomSheetRef.current));
       }
 
       // Then navigate to the specified screen if provided
@@ -657,6 +649,8 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
       }
     } else {
       console.warn('bottomSheetRef is not available');
+      console.warn('To fix this, ensure you pass a bottomSheetRef to OxyProvider:');
+      console.warn('<OxyProvider baseURL="..." bottomSheetRef={yourBottomSheetRef}>');
     }
   }, [bottomSheetRef]);
 
@@ -672,16 +666,38 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
     userId: user?.id,
     activeSessionId,
     refreshSessions,
-    logout: () => logout(),
+    logout,
     baseURL: oxyServices.getBaseURL(),
-    onRemoteSignOut: () => {
+    onRemoteSignOut: useCallback(() => {
       toast.info('You have been signed out remotely.');
       logout();
-    },
+    }, [logout]),
   });
 
   // Context value
-  const contextValue: OxyContextState = {
+  const contextValue: OxyContextState = useMemo(() => ({
+    user,
+    minimalUser,
+    sessions,
+    activeSessionId,
+    isAuthenticated,
+    isLoading,
+    error,
+    login,
+    logout,
+    logoutAll,
+    signUp,
+    switchSession,
+    removeSession,
+    refreshSessions,
+    getDeviceSessions,
+    logoutAllDeviceSessions,
+    updateDeviceName,
+    oxyServices,
+    bottomSheetRef,
+    showBottomSheet,
+    hideBottomSheet,
+  }), [
     user,
     minimalUser,
     sessions,
@@ -691,22 +707,19 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
     error,
     login,
     logout,
-    logoutAll: async () => { await logout(); },
-    signUp: async (username, email, password) => {
-      await signUp(username, email, password);
-      return user as User; // Return the latest user from Zustand
-    },
-    switchSession: async (sessionId) => { await switchToSession(sessionId); },
-    removeSession: async (sessionId) => { await removeSession(sessionId); },
-    refreshSessions: async () => { await refreshSessions(); },
-    getDeviceSessions: async () => { return await getDeviceSessions(); },
-    logoutAllDeviceSessions: async () => { await logoutAllDeviceSessions(); },
-    updateDeviceName: async (deviceName) => { await updateDeviceName(deviceName); },
+    logoutAll,
+    signUp,
+    switchSession,
+    removeSession,
+    refreshSessions,
+    getDeviceSessions,
+    logoutAllDeviceSessions,
+    updateDeviceName,
     oxyServices,
     bottomSheetRef,
     showBottomSheet,
     hideBottomSheet,
-  };
+  ]);
 
   // Wrap children rendering to block until token is ready
   if (!tokenReady) {
@@ -720,6 +733,9 @@ export const OxyContextProvider: React.FC<OxyContextProviderProps> = ({
   );
 };
 
+// Alias for backward compatibility
+export const OxyContextProvider = OxyProvider;
+
 // Hook to use the context
 export const useOxy = (): OxyContextState => {
   const context = useContext(OxyContext);

package/src/ui/hooks/index.ts

@@ -1 +1 @@
-export { useFollow } from './useFollow'; 
+export { useFollow, useFollowerCounts } from './useFollow';