@oxyhq/services 5.16.27 → 5.16.29

package/lib/typescript/ui/hooks/useTransferQueries.d.ts

@@ -1,28 +1,18 @@
+import type { OxyServices } from '../../core';
 /**
  * Query keys for transfer-related queries
  */
 export declare const transferQueryKeys: {
-    all: readonly ["transfers"];
-    completion: (transferId: string) => readonly ["transfers", "completion", string];
     pending: () => readonly ["transfers", "pending"];
 };
-/**
- * Hook to check if a transfer was completed
- * Only runs when authenticated and transferId is provided
- */
-export declare const useCheckTransferCompletion: (transferId: string | null, enabled?: boolean) => import("@tanstack/react-query").UseQueryResult<{
-    completed: boolean;
-    transferId?: string;
-    sourceDeviceId?: string;
-    publicKey?: string;
-    transferCode?: string;
-    completedAt?: string;
-} | null, any>;
 /**
  * Hook to check all pending transfers for completion
  * Used when app comes back online
+ *
+ * This version accepts oxyServices and isAuthenticated as parameters to avoid
+ * circular dependency when used inside OxyContext
  */
-export declare const useCheckPendingTransfers: () => import("@tanstack/react-query").UseQueryResult<{
+export declare const useCheckPendingTransfers: (oxyServices?: OxyServices | null, isAuthenticated?: boolean) => import("@tanstack/react-query").UseQueryResult<{
     transferId: string;
     completed: boolean;
     data?: {

package/lib/typescript/ui/hooks/useTransferQueries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useTransferQueries.d.ts","sourceRoot":"","sources":["../../../../src/ui/hooks/useTransferQueries.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,eAAO,MAAM,iBAAiB;;6BAEH,MAAM;;CAEhC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,0BAA0B,GAAI,YAAY,MAAM,GAAG,IAAI,EAAE,UAAS,OAAc;eAYxE,OAAO;iBACL,MAAM;qBACF,MAAM;gBACX,MAAM;mBACH,MAAM;kBACP,MAAM;cAgC7B,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB;gBAajB,MAAM;eACP,OAAO;WACX;QACL,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB;WA2DR,CAAC"}
+{"version":3,"file":"useTransferQueries.d.ts","sourceRoot":"","sources":["../../../../src/ui/hooks/useTransferQueries.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C;;GAEG;AACH,eAAO,MAAM,iBAAiB;;CAE7B,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,GACnC,cAAc,WAAW,GAAG,IAAI,EAChC,kBAAkB,OAAO;gBAaP,MAAM;eACP,OAAO;WACX;QACL,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB;WA2DR,CAAC"}

package/lib/typescript/ui/stores/transferStore.d.ts

@@ -32,8 +32,4 @@ export declare const useTransferCodesForPersistence: () => {
     transferCodes: Record<string, TransferCodeData>;
     activeTransferId: string | null;
 };
-/**
- * Hook to check if store has been restored
- */
-export declare const useTransferStoreRestored: () => boolean;
 //# sourceMappingURL=transferStore.d.ts.map

package/lib/typescript/ui/stores/transferStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transferStore.d.ts","sourceRoot":"","sources":["../../../../src/ui/stores/transferStore.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;CAC3C;AAED,MAAM,WAAW,aAAa;IAE5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAGhD,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAGhC,UAAU,EAAE,OAAO,CAAC;IAGpB,iBAAiB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAChH,eAAe,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,gBAAgB,GAAG,IAAI,CAAC;IACjE,iBAAiB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,mBAAmB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,KAAK,IAAI,CAAC;IAC7F,sBAAsB,EAAE,MAAM,KAAK,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC,CAAC;IACpF,mBAAmB,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IACzC,mBAAmB,EAAE,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IACzD,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IACvG,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AAUD,eAAO,MAAM,gBAAgB,4EAyI1B,CAAC;AAEJ;;GAEG;AACH,eAAO,MAAM,8BAA8B;;;CAO1C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,wBAAwB,eAEpC,CAAC"}
+{"version":3,"file":"transferStore.d.ts","sourceRoot":"","sources":["../../../../src/ui/stores/transferStore.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;CAC3C;AAED,MAAM,WAAW,aAAa;IAE5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAGhD,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAGhC,UAAU,EAAE,OAAO,CAAC;IAGpB,iBAAiB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAChH,eAAe,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,gBAAgB,GAAG,IAAI,CAAC;IACjE,iBAAiB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,mBAAmB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,KAAK,IAAI,CAAC;IAC7F,sBAAsB,EAAE,MAAM,KAAK,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,gBAAgB,CAAA;KAAE,CAAC,CAAC;IACpF,mBAAmB,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IACzC,mBAAmB,EAAE,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IACzD,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IACvG,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AAUD,eAAO,MAAM,gBAAgB,4EAyI1B,CAAC;AAEJ;;GAEG;AACH,eAAO,MAAM,8BAA8B;;;CAO1C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "5.16.27",
+  "version": "5.16.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/crypto/keyManager.ts

@@ -124,8 +124,9 @@ export class KeyManager {
   /**
    * Invalidate cached identity state
    * Called internally when identity is created/deleted/imported
+   * Can also be called externally to force a fresh state check (e.g., on app startup)
    */
-  private static invalidateCache(): void {
+  static invalidateCache(): void {
     KeyManager.cachedPublicKey = null;
     KeyManager.cachedHasIdentity = null;
   }
@@ -434,6 +435,9 @@ export class KeyManager {
       return false; // Identity storage is only available on native platforms
     }
     try {
+      // Invalidate cache before restoring to ensure fresh state
+      KeyManager.invalidateCache();
+      
       const store = await initSecureStore();
       
       // Check if backup exists

package/src/ui/context/OxyContext.tsx

@@ -165,7 +165,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
 
   const {
     user,
-    isAuthenticated,
+    isAuthenticated: isAuthenticatedFromStore,
     isLoading,
     error,
     loginSuccess,
@@ -219,12 +219,16 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
 
     const checkAndRestoreIdentity = async () => {
       try {
+        // CRITICAL: Invalidate cache on app startup to ensure fresh state check
+        // This prevents stale cache from previous session from showing incorrect state
+        KeyManager.invalidateCache();
+        
         // Check if identity exists and verify integrity
         const hasIdentity = await KeyManager.hasIdentity();
         if (hasIdentity) {
           const isValid = await KeyManager.verifyIdentityIntegrity();
           if (!isValid) {
-            // Try to restore from backup
+            // Try to restore from backup (cache will be invalidated inside restoreIdentityFromBackup)
             const restored = await KeyManager.restoreIdentityFromBackup();
             if (__DEV__) {
               logger(restored
@@ -237,7 +241,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
             await KeyManager.backupIdentity();
           }
         } else {
-          // No identity - try to restore from backup
+          // No identity - try to restore from backup (cache will be invalidated inside restoreIdentityFromBackup)
           const restored = await KeyManager.restoreIdentityFromBackup();
           if (restored && __DEV__) {
             logger('Identity restored from backup on startup');
@@ -254,9 +258,6 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     checkAndRestoreIdentity();
   }, [storage, isStorageReady, logger]);
 
-  // Offline queuing is now handled by TanStack Query mutations
-  // No need for custom offline queue
-
   const {
     currentLanguage,
     metadata: currentLanguageMetadata,
@@ -276,7 +277,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
   const {
     sessions,
     activeSessionId,
-    setActiveSessionId,
+    setActiveSessionId: setActiveSessionIdFromHook,
     updateSessions,
     switchSession,
     refreshSessions,
@@ -313,7 +314,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     storage,
     sessions,
     activeSessionId,
-    setActiveSessionId,
+    setActiveSessionId: setActiveSessionIdFromHook,
     updateSessions,
     saveActiveSessionId,
     clearSessionState,
@@ -559,7 +560,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
         clearTimeout(checkTimeout);
       }
     };
-  }, [oxyServices, storage, syncIdentity, logger, hasIdentity, isAuthenticated]);
+  }, [oxyServices, storage, syncIdentity, logger, hasIdentity]);
 
   const { getDeviceSessions, logoutAllDeviceSessions, updateDeviceName } = useDeviceManagement({
     oxyServices,
@@ -631,6 +632,24 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
             // Don't log expected session errors during restoration
           } else if (isTimeoutOrNetworkError(switchError)) {
             // Timeout/network error - non-critical, don't block
+            // However, if we have valid sessions, we should still set activeSessionId
+            // so that isAuthenticated can be computed correctly
+            if (validSessions.length > 0) {
+              const matchingSession = validSessions.find(s => s.sessionId === storedActiveSessionId);
+              if (matchingSession) {
+                // Set active session even if validation timed out (offline scenario)
+                setActiveSessionIdFromHook(storedActiveSessionId);
+                // Try to get user from session if possible (might fail offline, but that's OK)
+                try {
+                  const validation = await oxyServices.validateSession(storedActiveSessionId, { useHeaderValidation: false });
+                  if (validation?.valid && validation.user) {
+                    loginSuccess(validation.user);
+                  }
+                } catch {
+                  // Ignore - we're offline, will sync when online
+                }
+              }
+            }
             if (__DEV__) {
               loggerUtil.debug('Active session validation timeout (expected when offline)', { component: 'OxyContext', method: 'restoreSessionsFromStorage' }, switchError as unknown);
             }
@@ -639,6 +658,26 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
             logger('Active session validation error', switchError);
           }
         }
+      } else if (validSessions.length > 0) {
+        // No stored active session, but we have valid sessions - activate the first one
+        const firstSession = validSessions[0];
+        try {
+          await switchSession(firstSession.sessionId);
+        } catch (switchError) {
+          // If switch fails, at least set the activeSessionId so UI can show sessions
+          if (isTimeoutOrNetworkError(switchError)) {
+            setActiveSessionIdFromHook(firstSession.sessionId);
+            // Try to get user from session
+            try {
+              const validation = await oxyServices.validateSession(firstSession.sessionId, { useHeaderValidation: false });
+              if (validation?.valid && validation.user) {
+                loginSuccess(validation.user);
+              }
+            } catch {
+              // Ignore - offline scenario
+            }
+          }
+        }
       }
     } catch (error) {
       if (__DEV__) {
@@ -657,6 +696,8 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     storageKeys.sessionIds,
     switchSession,
     updateSessions,
+    setActiveSessionIdFromHook,
+    loginSuccess,
   ]);
 
   useEffect(() => {
@@ -673,6 +714,18 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     : undefined;
   const currentDeviceId = activeSession?.deviceId ?? null;
 
+  // Compute isAuthenticated from actual session state, not just auth store
+  // This ensures UI shows correct state even if loginSuccess wasn't called during restoration
+  const isAuthenticatedFromSessions = useMemo(() => {
+    return !!(activeSessionId && sessions.length > 0 && user);
+  }, [activeSessionId, sessions.length, user]);
+
+  // Use session-based authentication state if auth store says not authenticated but we have sessions
+  // This handles the case where sessions were restored but loginSuccess wasn't called
+  const computedIsAuthenticated = useMemo(() => {
+    return isAuthenticatedFromStore || isAuthenticatedFromSessions;
+  }, [isAuthenticatedFromStore, isAuthenticatedFromSessions]);
+
   // Get userId from JWT token (MongoDB ObjectId) for socket room matching
   // user.id is set to publicKey for compatibility, but socket rooms use MongoDB ObjectId
   // The JWT token's userId field contains the MongoDB ObjectId
@@ -801,7 +854,9 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
   }, [logger, logout]);
 
   // Check pending transfers when authenticated and online using TanStack Query
-  const { data: pendingTransferResults } = useCheckPendingTransfers();
+  // Check for pending transfers that may have completed while offline
+  // Results are processed via socket events (onIdentityTransferComplete), so we don't need to process query results here
+  useCheckPendingTransfers(oxyServices, computedIsAuthenticated);
 
   const handleIdentityTransferComplete = useCallback(
     async (data: { transferId: string; sourceDeviceId: string; publicKey: string; transferCode?: string; completedAt: string }) => {
@@ -1022,7 +1077,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     sessions,
     activeSessionId,
     currentDeviceId,
-    isAuthenticated,
+    isAuthenticated: computedIsAuthenticated,
     isLoading,
     isTokenReady: tokenReady,
     isStorageReady,
@@ -1089,7 +1144,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     currentNativeLanguageName,
     error,
     getDeviceSessions,
-    isAuthenticated,
+    computedIsAuthenticated,
     isLoading,
     logout,
     logoutAll,

package/src/ui/hooks/useTransferQueries.ts

@@ -1,77 +1,25 @@
-import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
-import { useOxy } from '../context/OxyContext';
+import { useQuery } from '@tanstack/react-query';
 import { useTransferStore } from '../stores/transferStore';
+import type { OxyServices } from '../../core';
 
 /**
  * Query keys for transfer-related queries
  */
 export const transferQueryKeys = {
-  all: ['transfers'] as const,
-  completion: (transferId: string) => ['transfers', 'completion', transferId] as const,
   pending: () => ['transfers', 'pending'] as const,
 };
 
-/**
- * Hook to check if a transfer was completed
- * Only runs when authenticated and transferId is provided
- */
-export const useCheckTransferCompletion = (transferId: string | null, enabled: boolean = true) => {
-  const { oxyServices, isAuthenticated } = useOxy();
-  
-  return useQuery({
-    queryKey: transferId ? transferQueryKeys.completion(transferId) : ['transfers', 'completion', 'null'],
-    queryFn: async () => {
-      if (!transferId || !oxyServices) {
-        return null;
-      }
-
-      try {
-        const response = await oxyServices.makeRequest<{
-          completed: boolean;
-          transferId?: string;
-          sourceDeviceId?: string;
-          publicKey?: string;
-          transferCode?: string;
-          completedAt?: string;
-        }>(
-          'GET',
-          `/api/identity/check-transfer/${transferId}`,
-          undefined,
-          { cache: false }
-        );
-
-        return response;
-      } catch (error: any) {
-        // Handle 401 errors gracefully - don't throw, just return null
-        if (error?.status === 401 || error?.message?.includes('401') || error?.message?.includes('authentication')) {
-          if (__DEV__) {
-            console.warn('[useCheckTransferCompletion] Authentication required, skipping check');
-          }
-          return null;
-        }
-        throw error;
-      }
-    },
-    enabled: enabled && !!transferId && isAuthenticated && !!oxyServices,
-    staleTime: 30 * 1000, // 30 seconds - completion status doesn't change frequently
-    gcTime: 5 * 60 * 1000, // 5 minutes
-    retry: (failureCount, error: any) => {
-      // Don't retry on 401 errors
-      if (error?.status === 401 || error?.message?.includes('401')) {
-        return false;
-      }
-      return failureCount < 2;
-    },
-    retryDelay: (attemptIndex) => Math.min(1000 * 2 ** attemptIndex, 5000),
-  });
-};
-
 /**
  * Hook to check all pending transfers for completion
  * Used when app comes back online
+ * 
+ * This version accepts oxyServices and isAuthenticated as parameters to avoid
+ * circular dependency when used inside OxyContext
  */
-export const useCheckPendingTransfers = () => {
-  const { oxyServices, isAuthenticated } = useOxy();
+export const useCheckPendingTransfers = (
+  oxyServices?: OxyServices | null,
+  isAuthenticated?: boolean
+) => {
   const getAllPendingTransfers = useTransferStore((state) => state.getAllPendingTransfers);
   const pendingTransfers = getAllPendingTransfers();
   
@@ -145,7 +93,7 @@ export const useCheckPendingTransfers = () => {
 
       return results;
     },
-    enabled: isAuthenticated && !!oxyServices && pendingTransfers.length > 0,
+    enabled: (isAuthenticated ?? false) && !!oxyServices && pendingTransfers.length > 0,
     staleTime: 30 * 1000, // 30 seconds
     gcTime: 5 * 60 * 1000, // 5 minutes
     retry: false, // Don't retry - we'll check again on next reconnect

package/src/ui/stores/transferStore.ts

@@ -192,10 +192,4 @@ export const useTransferCodesForPersistence = () => {
   );
 };
 
-/**
- * Hook to check if store has been restored
- */
-export const useTransferStoreRestored = () => {
-  return useTransferStore((state) => state.isRestored);
-};