@oxyhq/services 5.13.27 → 5.13.29

package/lib/typescript/ui/screens/AccountSettingsScreen.d.ts

@@ -1,5 +1,7 @@
 import React from 'react';
 import type { BaseScreenProps } from '../navigation/types';
-declare const _default: React.NamedExoticComponent<BaseScreenProps>;
+declare const _default: React.NamedExoticComponent<BaseScreenProps & {
+    initialField?: string;
+}>;
 export default _default;
 //# sourceMappingURL=AccountSettingsScreen.d.ts.map

package/lib/typescript/ui/screens/AccountSettingsScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccountSettingsScreen.d.ts","sourceRoot":"","sources":["../../../../src/ui/screens/AccountSettingsScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAC;AAcjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;;AAuhE3D,wBAAiD"}
+{"version":3,"file":"AccountSettingsScreen.d.ts","sourceRoot":"","sources":["../../../../src/ui/screens/AccountSettingsScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4D,MAAM,OAAO,CAAC;AAcjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;;mBAqBc,MAAM;;AAqhE/E,wBAAiD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "5.13.27",
+  "version": "5.13.29",
   "description": "Reusable OxyHQ module to handle authentication, user management, karma system, device-based session management and more 🚀",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

package/src/core/mixins/OxyServices.devices.ts

@@ -98,6 +98,25 @@ export function OxyServicesDevicesMixin<T extends typeof OxyServicesBase>(Base:
         throw this.handleError(error);
       }
     }
+
+    /**
+     * Get security information (TOTP status, backup codes count)
+     * @returns Security information object
+     */
+    async getSecurityInfo(): Promise<{
+      twoFactorEnabled: boolean;
+      totpCreatedAt: string | null;
+      backupCodesCount: number;
+      recoveryEmail: string | null;
+    }> {
+      try {
+        return await this.makeRequest('GET', '/api/devices/security', undefined, {
+          cache: false,
+        });
+      } catch (error) {
+        throw this.handleError(error);
+      }
+    }
   };
 }
 

package/src/ui/context/OxyContext.tsx

@@ -894,10 +894,18 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     }
   }, [bottomSheetRef]);
 
+  // Get current deviceId from active session
+  const currentDeviceId = useMemo(() => {
+    if (!activeSessionId || !sessions.length) return null;
+    const activeSession = sessions.find(s => s.sessionId === activeSessionId);
+    return activeSession?.deviceId || null;
+  }, [activeSessionId, sessions]);
+
   // Integrate socket for real-time session updates
   useSessionSocket({
     userId: user?.id,
     activeSessionId,
+    currentDeviceId,
     refreshSessions,
     logout,
     baseURL: oxyServices.getBaseURL(),

package/src/ui/hooks/useSessionSocket.ts

@@ -5,13 +5,14 @@ import { toast } from '../../lib/sonner';
 interface UseSessionSocketProps {
   userId: string | null | undefined;
   activeSessionId: string | null | undefined;
+  currentDeviceId: string | null | undefined;
   refreshSessions: () => Promise<void>;
   logout: () => Promise<void>;
   baseURL: string;
   onRemoteSignOut?: () => void;
 }
 
-export function useSessionSocket({ userId, activeSessionId, refreshSessions, logout, baseURL, onRemoteSignOut }: UseSessionSocketProps) {
+export function useSessionSocket({ userId, activeSessionId, currentDeviceId, refreshSessions, logout, baseURL, onRemoteSignOut }: UseSessionSocketProps) {
   const socketRef = useRef<any>(null);
   const joinedRoomRef = useRef<string | null>(null);
   
@@ -20,6 +21,7 @@ export function useSessionSocket({ userId, activeSessionId, refreshSessions, log
   const logoutRef = useRef(logout);
   const onRemoteSignOutRef = useRef(onRemoteSignOut);
   const activeSessionIdRef = useRef(activeSessionId);
+  const currentDeviceIdRef = useRef(currentDeviceId);
 
   // Update refs when callbacks change
   useEffect(() => {
@@ -27,7 +29,8 @@ export function useSessionSocket({ userId, activeSessionId, refreshSessions, log
     logoutRef.current = logout;
     onRemoteSignOutRef.current = onRemoteSignOut;
     activeSessionIdRef.current = activeSessionId;
-  }, [refreshSessions, logout, onRemoteSignOut, activeSessionId]);
+    currentDeviceIdRef.current = currentDeviceId;
+  }, [refreshSessions, logout, onRemoteSignOut, activeSessionId, currentDeviceId]);
 
   useEffect(() => {
     if (!userId || !baseURL) {
@@ -71,22 +74,72 @@ export function useSessionSocket({ userId, activeSessionId, refreshSessions, log
       }
     };
 
-    const handleSessionUpdate = (data: { type: string; sessionId: string }) => {
+    const handleSessionUpdate = (data: { 
+      type: string; 
+      sessionId?: string; 
+      deviceId?: string; 
+      sessionIds?: string[] 
+    }) => {
       if (__DEV__) {
         console.log('Received session_update:', data);
       }
       
-      // Use refs to get latest callback versions
-      refreshSessionsRef.current();
+      const currentActiveSessionId = activeSessionIdRef.current;
+      const currentDeviceId = currentDeviceIdRef.current;
       
-      // If the current session was logged out, handle it specially
-      if (data.sessionId === activeSessionIdRef.current) {
-        if (onRemoteSignOutRef.current) {
-          onRemoteSignOutRef.current();
+      // Handle different event types
+      if (data.type === 'session_removed') {
+        // If the removed sessionId matches the current activeSessionId, immediately logout
+        if (data.sessionId === currentActiveSessionId) {
+          if (onRemoteSignOutRef.current) {
+            onRemoteSignOutRef.current();
+          } else {
+            toast.info('You have been signed out remotely.');
+          }
+          logoutRef.current();
         } else {
-          toast.info('You have been signed out remotely.');
+          // Otherwise, just refresh the sessions list
+          refreshSessionsRef.current();
+        }
+      } else if (data.type === 'device_removed') {
+        // If the removed deviceId matches the current device, immediately logout
+        if (data.deviceId && data.deviceId === currentDeviceId) {
+          if (onRemoteSignOutRef.current) {
+            onRemoteSignOutRef.current();
+          } else {
+            toast.info('This device has been removed. You have been signed out.');
+          }
+          logoutRef.current();
+        } else {
+          // Otherwise, refresh sessions and device list
+          refreshSessionsRef.current();
+        }
+      } else if (data.type === 'sessions_removed') {
+        // If the current activeSessionId is in the removed sessionIds list, immediately logout
+        if (data.sessionIds && currentActiveSessionId && data.sessionIds.includes(currentActiveSessionId)) {
+          if (onRemoteSignOutRef.current) {
+            onRemoteSignOutRef.current();
+          } else {
+            toast.info('You have been signed out remotely.');
+          }
+          logoutRef.current();
+        } else {
+          // Otherwise, refresh sessions list
+          refreshSessionsRef.current();
+        }
+      } else {
+        // For other event types (e.g., session_created), refresh sessions
+        refreshSessionsRef.current();
+        
+        // If the current session was logged out (legacy behavior), handle it specially
+        if (data.sessionId === currentActiveSessionId) {
+          if (onRemoteSignOutRef.current) {
+            onRemoteSignOutRef.current();
+          } else {
+            toast.info('You have been signed out remotely.');
+          }
+          logoutRef.current();
         }
-        logoutRef.current();
       }
     };
 

package/src/ui/screens/AccountSettingsScreen.tsx

@@ -33,11 +33,12 @@ const locationSearchCache = new TTLCache<any[]>(60 * 60 * 1000); // 1 hour cache
 registerCacheForCleanup(linkMetadataCache);
 registerCacheForCleanup(locationSearchCache);
 
-const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
+const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string }> = ({
     onClose,
     theme,
     goBack,
     navigate,
+    initialField,
 }) => {
     const { user: userFromContext, oxyServices, isLoading: authLoading, isAuthenticated, showBottomSheet, activeSessionId } = useOxy();
     const { t } = useI18n();
@@ -241,6 +242,24 @@ const AccountSettingsScreen: React.FC<BaseScreenProps> = ({
         }
     }, [user, avatarFileId, isUpdatingAvatar, optimisticAvatarId]);
 
+    // Set initial editing field if provided via props (e.g., from navigation)
+    // Use a ref to track if we've already set the initial field to avoid loops
+    const hasSetInitialFieldRef = useRef(false);
+    const previousInitialFieldRef = useRef<string | undefined>(undefined);
+    useEffect(() => {
+        // If initialField changed, reset the flag
+        if (previousInitialFieldRef.current !== initialField) {
+            hasSetInitialFieldRef.current = false;
+            previousInitialFieldRef.current = initialField;
+        }
+        
+        // Set the editing field if initialField is provided and we haven't set it yet
+        if (initialField && !hasSetInitialFieldRef.current) {
+            setEditingField(initialField);
+            hasSetInitialFieldRef.current = true;
+        }
+    }, [initialField]);
+
     const handleSave = async () => {
         if (!user) return;