@oxyhq/services 5.17.5 → 5.17.8

package/src/ui/hooks/mutations/useAccountMutations.ts

@@ -13,7 +13,7 @@ const getDeviceIdForSession = (sessions: ClientSession[] = [], sessionId: string
  * Update user profile with optimistic updates and offline queue support
  */
 export const useUpdateProfile = () => {
-  const { oxyServices, activeSessionId, user, syncIdentity, sessions } = useOxy();
+  const { oxyServices, activeSessionId, user, sessions } = useOxy();
   const queryClient = useQueryClient();
 
   return useMutation({
@@ -24,19 +24,7 @@ export const useUpdateProfile = () => {
           // Try to get token for the session
           await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
         } catch (tokenError) {
-          // If getting token fails, might be an offline session - try syncing
-          const errorMessage = tokenError instanceof Error ? tokenError.message : String(tokenError);
-          if (errorMessage.includes('AUTH_REQUIRED_OFFLINE_SESSION') || errorMessage.includes('offline')) {
-            try {
-              await syncIdentity();
-              // Retry getting token after sync
-              await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
-            } catch (syncError) {
-              throw new Error('Session needs to be synced. Please try again.');
-            }
-          } else {
-            throw tokenError;
-          }
+          throw tokenError;
         }
       }
 
@@ -48,19 +36,7 @@ export const useUpdateProfile = () => {
         
         // Handle authentication errors
         if (status === 401 || errorMessage.includes('Authentication required') || errorMessage.includes('Invalid or missing authorization header')) {
-          // Try to sync session and get token
-          if (activeSessionId) {
-            try {
-              await syncIdentity();
-              await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
-              // Retry the update after getting token
-              return await oxyServices.updateProfile(updates);
-            } catch (retryError) {
-              throw new Error('Authentication failed. Please sign in again.');
-            }
-          } else {
-            throw new Error('No active session. Please sign in.');
-          }
+          throw error;
         }
         
         // TanStack Query will automatically retry on network errors
@@ -127,7 +103,7 @@ export const useUpdateProfile = () => {
  * Upload avatar with progress tracking and offline queue support
  */
 export const useUploadAvatar = () => {
-  const { oxyServices, activeSessionId, syncIdentity, sessions } = useOxy();
+  const { oxyServices, activeSessionId, sessions } = useOxy();
   const queryClient = useQueryClient();
 
   return useMutation({
@@ -137,17 +113,7 @@ export const useUploadAvatar = () => {
         try {
           await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
         } catch (tokenError) {
-          const errorMessage = tokenError instanceof Error ? tokenError.message : String(tokenError);
-          if (errorMessage.includes('AUTH_REQUIRED_OFFLINE_SESSION') || errorMessage.includes('offline')) {
-            try {
-              await syncIdentity();
-              await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
-            } catch (syncError) {
-              throw new Error('Session needs to be synced. Please try again.');
-            }
-          } else {
-            throw tokenError;
-          }
+          throw tokenError;
         }
       }
 
@@ -168,23 +134,7 @@ export const useUploadAvatar = () => {
         
         // Handle authentication errors
         if (status === 401 || errorMessage.includes('Authentication required') || errorMessage.includes('Invalid or missing authorization header')) {
-          if (activeSessionId) {
-            try {
-              await syncIdentity();
-              await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
-              // Retry upload
-              const uploadResult = await oxyServices.assetUpload(file as any, 'public');
-              const fileId = uploadResult?.file?.id || uploadResult?.id || uploadResult;
-              if (!fileId || typeof fileId !== 'string') {
-                throw new Error('Failed to get file ID from upload result');
-              }
-              return await oxyServices.updateProfile({ avatar: fileId });
-            } catch (retryError) {
-              throw new Error('Authentication failed. Please sign in again.');
-            }
-          } else {
-            throw new Error('No active session. Please sign in.');
-          }
+          throw error;
         }
         
         // TanStack Query will automatically retry on network errors
@@ -286,7 +236,7 @@ export const useUpdateAccountSettings = () => {
  * Update privacy settings with optimistic updates and authentication handling
  */
 export const useUpdatePrivacySettings = () => {
-  const { oxyServices, activeSessionId, syncIdentity, sessions } = useOxy();
+  const { oxyServices, activeSessionId, sessions } = useOxy();
   const queryClient = useQueryClient();
 
   return useMutation({
@@ -304,19 +254,7 @@ export const useUpdatePrivacySettings = () => {
           // Try to get token for the session
           await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
         } catch (tokenError) {
-          // If getting token fails, might be an offline session - try syncing
-          const errorMessage = tokenError instanceof Error ? tokenError.message : String(tokenError);
-          if (errorMessage.includes('AUTH_REQUIRED_OFFLINE_SESSION') || errorMessage.includes('offline')) {
-            try {
-              await syncIdentity();
-              // Retry getting token after sync
-              await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
-            } catch (syncError) {
-              throw new Error('Session needs to be synced. Please try again.');
-            }
-          } else {
-            throw tokenError;
-          }
+          throw tokenError;
         }
       }
 
@@ -328,19 +266,7 @@ export const useUpdatePrivacySettings = () => {
         
         // Handle authentication errors
         if (status === 401 || errorMessage.includes('Authentication required') || errorMessage.includes('Invalid or missing authorization header')) {
-          // Try to sync session and get token
-          if (activeSessionId) {
-            try {
-              await syncIdentity();
-              await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
-              // Retry the update after getting token
-              return await oxyServices.updatePrivacySettings(settings, targetUserId);
-            } catch (retryError) {
-              throw new Error('Authentication failed. Please sign in again.');
-            }
-          } else {
-            throw new Error('No active session. Please sign in.');
-          }
+          throw error;
         }
         
         // TanStack Query will automatically retry on network errors
@@ -424,7 +350,7 @@ export const useUpdatePrivacySettings = () => {
  * Upload file with authentication handling and progress tracking
  */
 export const useUploadFile = () => {
-  const { oxyServices, activeSessionId, syncIdentity, sessions } = useOxy();
+  const { oxyServices, activeSessionId, sessions } = useOxy();
 
   return useMutation({
     mutationFn: async ({ 
@@ -444,19 +370,7 @@ export const useUploadFile = () => {
           // Try to get token for the session
           await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
         } catch (tokenError) {
-          // If getting token fails, might be an offline session - try syncing
-          const errorMessage = tokenError instanceof Error ? tokenError.message : String(tokenError);
-          if (errorMessage.includes('AUTH_REQUIRED_OFFLINE_SESSION') || errorMessage.includes('offline')) {
-            try {
-              await syncIdentity();
-              // Retry getting token after sync
-              await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
-            } catch (syncError) {
-              throw new Error('Session needs to be synced. Please try again.');
-            }
-          } else {
-            throw tokenError;
-          }
+          throw tokenError;
         }
       }
 
@@ -468,19 +382,7 @@ export const useUploadFile = () => {
         
         // Handle authentication errors
         if (status === 401 || errorMessage.includes('Authentication required') || errorMessage.includes('Invalid or missing authorization header')) {
-          // Try to sync session and get token
-          if (activeSessionId) {
-            try {
-              await syncIdentity();
-              await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
-              // Retry the upload after getting token
-              return await oxyServices.assetUpload(file as any, visibility, metadata, onProgress);
-            } catch (retryError) {
-              throw new Error('Authentication failed. Please sign in again.');
-            }
-          } else {
-            throw new Error('No active session. Please sign in.');
-          }
+          throw error;
         }
         
         // TanStack Query will automatically retry on network errors

package/src/ui/hooks/queries/useAccountQueries.ts

@@ -128,7 +128,7 @@ export const useUsersBySessions = (sessionIds: string[], options?: { enabled?: b
  * Get privacy settings for a user
  */
 export const usePrivacySettings = (userId?: string, options?: { enabled?: boolean }) => {
-  const { oxyServices, activeSessionId, syncIdentity, sessions } = useOxy();
+  const { oxyServices, activeSessionId, sessions } = useOxy();
   // Use getCurrentUserId() which returns MongoDB ObjectId from JWT token
   // Never use user?.id as it may be set to publicKey
   const targetUserId = userId || oxyServices.getCurrentUserId() || undefined;
@@ -147,19 +147,7 @@ export const usePrivacySettings = (userId?: string, options?: { enabled?: boolea
           // Try to get token for the session
           await oxyServices.getTokenBySession(activeSessionId, deviceId);
         } catch (tokenError) {
-          // If getting token fails, might be an offline session - try syncing
-          const errorMessage = tokenError instanceof Error ? tokenError.message : String(tokenError);
-          if (errorMessage.includes('AUTH_REQUIRED_OFFLINE_SESSION') || errorMessage.includes('offline')) {
-            try {
-              await syncIdentity();
-              // Retry getting token after sync
-              await oxyServices.getTokenBySession(activeSessionId, deviceId);
-            } catch (syncError) {
-              throw new Error('Session needs to be synced. Please try again.');
-            }
-          } else {
-            throw tokenError;
-          }
+          throw tokenError;
         }
       }
 
@@ -171,19 +159,7 @@ export const usePrivacySettings = (userId?: string, options?: { enabled?: boolea
         
         // Handle authentication errors
         if (status === 401 || errorMessage.includes('Authentication required') || errorMessage.includes('Invalid or missing authorization header')) {
-          // Try to sync session and get token
-          if (activeSessionId) {
-            try {
-              await syncIdentity();
-              await oxyServices.getTokenBySession(activeSessionId, deviceId);
-              // Retry the request after getting token
-              return await oxyServices.getPrivacySettings(targetUserId);
-            } catch (retryError) {
-              throw new Error('Authentication failed. Please sign in again.');
-            }
-          } else {
-            throw new Error('No active session. Please sign in.');
-          }
+          throw error;
         }
         
         // TanStack Query will automatically retry on network errors

package/src/ui/hooks/queries/useServicesQueries.ts

@@ -89,7 +89,7 @@ export const useDeviceSessions = (options?: { enabled?: boolean }) => {
  * Get user devices
  */
 export const useUserDevices = (options?: { enabled?: boolean }) => {
-  const { oxyServices, isAuthenticated, activeSessionId, syncIdentity, sessions } = useOxy();
+  const { oxyServices, isAuthenticated, activeSessionId, sessions } = useOxy();
   const deviceId = activeSessionId ? sessions.find((s) => s.sessionId === activeSessionId)?.deviceId : undefined;
 
   return useQuery({
@@ -101,19 +101,7 @@ export const useUserDevices = (options?: { enabled?: boolean }) => {
           // Try to get token for the session
           await oxyServices.getTokenBySession(activeSessionId, deviceId);
         } catch (tokenError) {
-          // If getting token fails, might be an offline session - try syncing
-          const errorMessage = tokenError instanceof Error ? tokenError.message : String(tokenError);
-          if (errorMessage.includes('AUTH_REQUIRED_OFFLINE_SESSION') || errorMessage.includes('offline')) {
-            try {
-              await syncIdentity();
-              // Retry getting token after sync
-              await oxyServices.getTokenBySession(activeSessionId, deviceId);
-            } catch (syncError) {
-              throw new Error('Session needs to be synced. Please try again.');
-            }
-          } else {
-            throw tokenError;
-          }
+          throw tokenError;
         }
       }
 
@@ -125,19 +113,7 @@ export const useUserDevices = (options?: { enabled?: boolean }) => {
         
         // Handle authentication errors
         if (status === 401 || errorMessage.includes('Authentication required') || errorMessage.includes('Invalid or missing authorization header')) {
-          // Try to sync session and get token
-          if (activeSessionId) {
-            try {
-              await syncIdentity();
-              await oxyServices.getTokenBySession(activeSessionId, deviceId);
-              // Retry the request after getting token
-              return await oxyServices.getUserDevices();
-            } catch (retryError) {
-              throw new Error('Authentication failed. Please sign in again.');
-            }
-          } else {
-            throw new Error('No active session. Please sign in.');
-          }
+          throw error;
         }
         
         // TanStack Query will automatically retry on network errors

package/src/ui/hooks/useSessionSocket.ts

@@ -13,20 +13,17 @@ interface UseSessionSocketProps {
   clearSessionState: () => Promise<void>;
   baseURL: string;
   getAccessToken: () => string | null;
-  getTransferCode?: (transferId: string) => { code: string; sourceDeviceId: string | null; publicKey: string; timestamp: number } | null;
   onRemoteSignOut?: () => void;
   onSessionRemoved?: (sessionId: string) => void;
-  onIdentityTransferComplete?: (data: { transferId: string; sourceDeviceId: string; publicKey: string; transferCode?: string; completedAt: string }) => void;
 }
 
-export function useSessionSocket({ userId, activeSessionId, currentDeviceId, refreshSessions, logout, clearSessionState, baseURL, getAccessToken, getTransferCode, onRemoteSignOut, onSessionRemoved, onIdentityTransferComplete }: 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);
   const accessTokenRef = useRef<string | null>(null);
   const handlersSetupRef = useRef<boolean>(false);
   const lastRegisteredSocketIdRef = useRef<string | null>(null);
   const getAccessTokenRef = useRef(getAccessToken);
-  const getTransferCodeRef = useRef(getTransferCode);
   
   // Store callbacks in refs to avoid re-joining when they change
   const refreshSessionsRef = useRef(refreshSessions);
@@ -34,7 +31,6 @@ export function useSessionSocket({ userId, activeSessionId, currentDeviceId, ref
   const clearSessionStateRef = useRef(clearSessionState);
   const onRemoteSignOutRef = useRef(onRemoteSignOut);
   const onSessionRemovedRef = useRef(onSessionRemoved);
-  const onIdentityTransferCompleteRef = useRef(onIdentityTransferComplete);
   const activeSessionIdRef = useRef(activeSessionId);
   const currentDeviceIdRef = useRef(currentDeviceId);
 
@@ -45,12 +41,10 @@ export function useSessionSocket({ userId, activeSessionId, currentDeviceId, ref
     clearSessionStateRef.current = clearSessionState;
     onRemoteSignOutRef.current = onRemoteSignOut;
     onSessionRemovedRef.current = onSessionRemoved;
-    onIdentityTransferCompleteRef.current = onIdentityTransferComplete;
     activeSessionIdRef.current = activeSessionId;
     currentDeviceIdRef.current = currentDeviceId;
     getAccessTokenRef.current = getAccessToken;
-    getTransferCodeRef.current = getTransferCode;
-  }, [refreshSessions, logout, clearSessionState, onRemoteSignOut, onSessionRemoved, onIdentityTransferComplete, activeSessionId, currentDeviceId, getAccessToken, getTransferCode]);
+  }, [refreshSessions, logout, clearSessionState, onRemoteSignOut, onSessionRemoved, activeSessionId, currentDeviceId, getAccessToken]);
 
   useEffect(() => {
     if (!userId || !baseURL) {
@@ -307,104 +301,6 @@ export function useSessionSocket({ userId, activeSessionId, currentDeviceId, ref
             }
           });
         }
-      } else if (data.type === 'identity_transfer_complete') {
-        // Handle identity transfer completion notification
-        const transferData = data as {
-          type: 'identity_transfer_complete';
-          transferId: string;
-          sourceDeviceId: string;
-          publicKey: string;
-          transferCode?: string;
-          completedAt: string;
-        };
-        
-        logger.debug('Received identity_transfer_complete event', {
-          component: 'useSessionSocket',
-          transferId: transferData.transferId,
-          sourceDeviceId: transferData.sourceDeviceId,
-          currentDeviceId,
-          activeSessionId: activeSessionIdRef.current,
-          socketConnected: socket.connected,
-          userId,
-          room: joinedRoomRef.current,
-          publicKey: transferData.publicKey.substring(0, 16) + '...',
-        });
-        
-        // CRITICAL: Only call handler on the SOURCE device (the one that initiated the transfer)
-        // The new device (target) should NEVER process this event - it would delete its own identity!
-        
-        // Check if this device has a stored transfer code (most reliable check - only source device has this)
-        const hasStoredTransferCode = getTransferCodeRef.current && !!getTransferCodeRef.current(transferData.transferId);
-        
-        // Also check deviceId match (exact match required)
-        const deviceIdMatches = transferData.sourceDeviceId && 
-                                currentDeviceId && 
-                                transferData.sourceDeviceId === currentDeviceId;
-        
-        // ONLY call handler if BOTH conditions are met:
-        // 1. Has stored transfer code (definitive proof this is the source device)
-        // 2. DeviceId matches (additional verification)
-        // If deviceId is null/undefined, we still allow if stored code exists (logged out source device)
-        // But we NEVER process if no stored code exists (definitely not the source device)
-        const shouldCallHandler = !!transferData.transferId && 
-                                  hasStoredTransferCode && 
-                                  (deviceIdMatches || !currentDeviceId); // Allow if deviceId matches OR device is logged out (but has stored code)
-        
-        if (shouldCallHandler) {
-          const matchReason = deviceIdMatches 
-            ? 'deviceId-exact-with-stored-code'
-            : (currentDeviceId ? 'deviceId-mismatch-but-has-stored-code' : 'logged-out-source-device-with-stored-code');
-          
-          logger.debug('Matched source device, calling transfer complete handler', {
-            component: 'useSessionSocket',
-            transferId: transferData.transferId,
-            sourceDeviceId: transferData.sourceDeviceId,
-            currentDeviceId,
-            matchReason,
-            hasHandler: !!onIdentityTransferCompleteRef.current,
-            socketConnected: socket.connected,
-            socketId: socket.id,
-          });
-          
-          if (onIdentityTransferCompleteRef.current) {
-            try {
-              logger.debug('Calling onIdentityTransferComplete handler', {
-                component: 'useSessionSocket',
-                transferId: transferData.transferId,
-              });
-              
-              onIdentityTransferCompleteRef.current({
-                transferId: transferData.transferId,
-                sourceDeviceId: transferData.sourceDeviceId,
-                publicKey: transferData.publicKey,
-                transferCode: transferData.transferCode,
-                completedAt: transferData.completedAt,
-              });
-              
-              logger.debug('onIdentityTransferComplete handler called successfully', {
-                component: 'useSessionSocket',
-                transferId: transferData.transferId,
-              });
-            } catch (error) {
-              logger.error('Error calling onIdentityTransferComplete handler', error instanceof Error ? error : new Error(String(error)), {
-                component: 'useSessionSocket',
-                transferId: transferData.transferId,
-              });
-            }
-          } else {
-            logger.debug('No onIdentityTransferComplete handler registered', {
-              component: 'useSessionSocket',
-              transferId: transferData.transferId,
-            });
-          }
-        } else {
-          logger.debug('Not the source device, ignoring transfer completion', {
-            component: 'useSessionSocket',
-            sourceDeviceId: transferData.sourceDeviceId,
-            currentDeviceId,
-            hasActiveSession: activeSessionIdRef.current !== null,
-          });
-        }
       } else {
         // For other event types (e.g., session_created), refresh sessions (with error handling)
         refreshSessionsRef.current().catch((error) => {