@oxyhq/services 5.17.16 → 5.17.18

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

@@ -1,20 +1,16 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import type { User } from '../../../models/interfaces';
-import type { ClientSession } from '../../../models/session';
 import { queryKeys, invalidateAccountQueries, invalidateUserQueries } from '../queries/queryKeys';
 import { useOxy } from '../../context/OxyContext';
 import { toast } from '../../../lib/sonner';
-import { refreshAccountInStore } from '../../utils/avatarUtils';
-import { logger } from '../../../utils/loggerUtils';
-
-const getDeviceIdForSession = (sessions: ClientSession[] = [], sessionId: string | null) =>
-  sessionId ? sessions.find((s) => s.sessionId === sessionId)?.deviceId : undefined;
+import { refreshAvatarInStore } from '../../utils/avatarUtils';
+import { useAuthStore } from '../../stores/authStore';
 
 /**
  * Update user profile with optimistic updates and offline queue support
  */
 export const useUpdateProfile = () => {
-  const { oxyServices, activeSessionId, user, sessions } = useOxy();
+  const { oxyServices, activeSessionId, user } = useOxy();
   const queryClient = useQueryClient();
 
   return useMutation({
@@ -23,9 +19,16 @@ export const useUpdateProfile = () => {
       if (!oxyServices.hasValidToken() && activeSessionId) {
         try {
           // Try to get token for the session
-          await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
+          await oxyServices.getTokenBySession(activeSessionId);
         } catch (tokenError) {
-          throw 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')) {
+            // Session sync should be handled by the app layer
+            throw new Error('Session needs to be synced. Please try again.');
+          } else {
+            throw tokenError;
+          }
         }
       }
 
@@ -37,7 +40,8 @@ export const useUpdateProfile = () => {
         
         // Handle authentication errors
         if (status === 401 || errorMessage.includes('Authentication required') || errorMessage.includes('Invalid or missing authorization header')) {
-          throw error;
+          // Session sync should be handled by the app layer
+          throw new Error('Authentication failed. Please sign in again.');
         }
         
         // TanStack Query will automatically retry on network errors
@@ -80,29 +84,25 @@ export const useUpdateProfile = () => {
       }
       toast.error(error instanceof Error ? error.message : 'Failed to update profile');
     },
-    // On success, update cache and sync to store
-    onSuccess: async (data, updates) => {
-      logger.debug('Profile update successful', {
-        component: 'useUpdateProfile',
-        username: data.username,
-        updatedFields: Object.keys(updates)
-      });
-
+    // On success, invalidate and refetch
+    onSuccess: (data, updates) => {
       // Update cache with server response
       queryClient.setQueryData(queryKeys.accounts.current(), data);
       if (activeSessionId) {
         queryClient.setQueryData(queryKeys.users.profile(activeSessionId), data);
       }
-
-      // Refresh accountStore with all updated profile data (synchronizes immediately)
-      if (activeSessionId && oxyServices) {
-        refreshAccountInStore(activeSessionId, data, oxyServices);
+      
+      // Update authStore so frontend components see the changes immediately
+      useAuthStore.getState().setUser(data);
+      
+      // If avatar was updated, refresh accountStore with cache-busted URL
+      if (updates.avatar && activeSessionId && oxyServices) {
+        refreshAvatarInStore(activeSessionId, updates.avatar, oxyServices);
       }
-
-      // Only invalidate specific queries that need refresh (not everything)
+      
+      // Invalidate all related queries to refresh everywhere
+      invalidateUserQueries(queryClient);
       invalidateAccountQueries(queryClient);
-
-      logger.debug('Profile update complete', { component: 'useUpdateProfile' });
     },
   });
 };
@@ -111,7 +111,7 @@ export const useUpdateProfile = () => {
  * Upload avatar with progress tracking and offline queue support
  */
 export const useUploadAvatar = () => {
-  const { oxyServices, activeSessionId, sessions } = useOxy();
+  const { oxyServices, activeSessionId } = useOxy();
   const queryClient = useQueryClient();
 
   return useMutation({
@@ -119,9 +119,15 @@ export const useUploadAvatar = () => {
       // Ensure we have a valid token before making the request
       if (!oxyServices.hasValidToken() && activeSessionId) {
         try {
-          await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
+          await oxyServices.getTokenBySession(activeSessionId);
         } catch (tokenError) {
-          throw tokenError;
+          const errorMessage = tokenError instanceof Error ? tokenError.message : String(tokenError);
+          if (errorMessage.includes('AUTH_REQUIRED_OFFLINE_SESSION') || errorMessage.includes('offline')) {
+            // Session sync should be handled by the app layer
+            throw new Error('Session needs to be synced. Please try again.');
+          } else {
+            throw tokenError;
+          }
         }
       }
 
@@ -142,7 +148,8 @@ export const useUploadAvatar = () => {
         
         // Handle authentication errors
         if (status === 401 || errorMessage.includes('Authentication required') || errorMessage.includes('Invalid or missing authorization header')) {
-          throw error;
+          // Session sync should be handled by the app layer
+          throw new Error('Authentication failed. Please sign in again.');
         }
         
         // TanStack Query will automatically retry on network errors
@@ -176,35 +183,24 @@ export const useUploadAvatar = () => {
       }
       toast.error(error instanceof Error ? error.message : 'Failed to upload avatar');
     },
-    onSuccess: async (data) => {
-      logger.debug(
-        'Avatar upload successful',
-        { component: 'useUploadAvatar', method: 'onSuccess', data }
-      );
-      
+    onSuccess: (data) => {
       queryClient.setQueryData(queryKeys.accounts.current(), data);
       if (activeSessionId) {
         queryClient.setQueryData(queryKeys.users.profile(activeSessionId), data);
       }
       
-      // Refresh accountStore with all updated profile data (including avatar)
-      if (activeSessionId && oxyServices) {
-        refreshAccountInStore(activeSessionId, data, oxyServices);
+      // Update authStore so frontend components see the changes immediately
+      useAuthStore.getState().setUser(data);
+      
+      // Refresh accountStore with cache-busted URL if avatar was updated
+      if (data?.avatar && activeSessionId && oxyServices) {
+        refreshAvatarInStore(activeSessionId, data.avatar, oxyServices);
       }
       
       // Invalidate all related queries to refresh everywhere
-      await invalidateUserQueries(queryClient);
-      await invalidateAccountQueries(queryClient);
-      
-      // Explicitly refetch to ensure UI updates
-      await queryClient.refetchQueries({ queryKey: queryKeys.accounts.current() });
-      
+      invalidateUserQueries(queryClient);
+      invalidateAccountQueries(queryClient);
       toast.success('Avatar updated successfully');
-      
-      logger.debug(
-        'Avatar update complete - cache invalidated and refetched',
-        { component: 'useUploadAvatar', method: 'onSuccess' }
-      );
     },
   });
 };
@@ -245,6 +241,9 @@ export const useUpdateAccountSettings = () => {
     onSuccess: (data) => {
       queryClient.setQueryData(queryKeys.accounts.current(), data);
       
+      // Update authStore so frontend components see the changes immediately
+      useAuthStore.getState().setUser(data);
+      
       invalidateAccountQueries(queryClient);
       toast.success('Settings updated successfully');
     },
@@ -258,14 +257,12 @@ export const useUpdateAccountSettings = () => {
  * Update privacy settings with optimistic updates and authentication handling
  */
 export const useUpdatePrivacySettings = () => {
-  const { oxyServices, activeSessionId, sessions } = useOxy();
+  const { oxyServices, activeSessionId, user } = useOxy();
   const queryClient = useQueryClient();
 
   return useMutation({
     mutationFn: async ({ settings, userId }: { settings: Record<string, any>; userId?: string }) => {
-      // 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();
+      const targetUserId = userId || user?.id;
       if (!targetUserId) {
         throw new Error('User ID is required');
       }
@@ -274,9 +271,16 @@ export const useUpdatePrivacySettings = () => {
       if (!oxyServices.hasValidToken() && activeSessionId) {
         try {
           // Try to get token for the session
-          await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
+          await oxyServices.getTokenBySession(activeSessionId);
         } catch (tokenError) {
-          throw 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')) {
+            // Session sync should be handled by the app layer
+            throw new Error('Session needs to be synced. Please try again.');
+          } else {
+            throw tokenError;
+          }
         }
       }
 
@@ -288,7 +292,8 @@ export const useUpdatePrivacySettings = () => {
         
         // Handle authentication errors
         if (status === 401 || errorMessage.includes('Authentication required') || errorMessage.includes('Invalid or missing authorization header')) {
-          throw error;
+          // Session sync should be handled by the app layer
+          throw new Error('Authentication failed. Please sign in again.');
         }
         
         // TanStack Query will automatically retry on network errors
@@ -297,7 +302,7 @@ export const useUpdatePrivacySettings = () => {
     },
     // Optimistic update
     onMutate: async ({ settings, userId }) => {
-      const targetUserId = userId || oxyServices.getCurrentUserId();
+      const targetUserId = userId || user?.id;
       if (!targetUserId) return;
 
       // Cancel outgoing refetches
@@ -331,7 +336,7 @@ export const useUpdatePrivacySettings = () => {
     },
     // On error, rollback
     onError: (error, { userId }, context) => {
-      const targetUserId = userId || oxyServices.getCurrentUserId();
+      const targetUserId = userId || user?.id;
       if (context?.previousPrivacySettings && targetUserId) {
         queryClient.setQueryData(queryKeys.privacy.settings(targetUserId), context.previousPrivacySettings);
       }
@@ -342,7 +347,7 @@ export const useUpdatePrivacySettings = () => {
     },
     // On success, invalidate and refetch
     onSuccess: (data, { userId }) => {
-      const targetUserId = userId || oxyServices.getCurrentUserId();
+      const targetUserId = userId || user?.id;
       if (targetUserId) {
         queryClient.setQueryData(queryKeys.privacy.settings(targetUserId), data);
       }
@@ -354,12 +359,15 @@ export const useUpdatePrivacySettings = () => {
           privacySettings: data,
         };
         queryClient.setQueryData<User>(queryKeys.accounts.current(), updatedUser);
+        
+        // Update authStore so frontend components see the changes immediately
+        useAuthStore.getState().setUser(updatedUser);
       }
       invalidateAccountQueries(queryClient);
     },
     // Always refetch after error or success
     onSettled: (data, error, { userId }) => {
-      const targetUserId = userId || oxyServices.getCurrentUserId();
+      const targetUserId = userId || user?.id;
       if (targetUserId) {
         queryClient.invalidateQueries({ queryKey: queryKeys.privacy.settings(targetUserId) });
       }
@@ -372,7 +380,7 @@ export const useUpdatePrivacySettings = () => {
  * Upload file with authentication handling and progress tracking
  */
 export const useUploadFile = () => {
-  const { oxyServices, activeSessionId, sessions } = useOxy();
+  const { oxyServices, activeSessionId } = useOxy();
 
   return useMutation({
     mutationFn: async ({ 
@@ -390,9 +398,16 @@ export const useUploadFile = () => {
       if (!oxyServices.hasValidToken() && activeSessionId) {
         try {
           // Try to get token for the session
-          await oxyServices.getTokenBySession(activeSessionId, getDeviceIdForSession(sessions, activeSessionId));
+          await oxyServices.getTokenBySession(activeSessionId);
         } catch (tokenError) {
-          throw 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')) {
+            // Session sync should be handled by the app layer
+            throw new Error('Session needs to be synced. Please try again.');
+          } else {
+            throw tokenError;
+          }
         }
       }
 
@@ -404,7 +419,8 @@ export const useUploadFile = () => {
         
         // Handle authentication errors
         if (status === 401 || errorMessage.includes('Authentication required') || errorMessage.includes('Invalid or missing authorization header')) {
-          throw error;
+          // Session sync should be handled by the app layer
+          throw new Error('Authentication failed. Please sign in again.');
         }
         
         // TanStack Query will automatically retry on network errors
@@ -413,3 +429,4 @@ export const useUploadFile = () => {
     },
   });
 };
+

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

@@ -2,8 +2,7 @@ import { useQuery, useQueries } from '@tanstack/react-query';
 import type { User } from '../../../models/interfaces';
 import type { OxyServices } from '../../../core';
 import { queryKeys } from './queryKeys';
-import { useOxy } from '../../context/OxyContextBase';
-import { logger } from '../../../utils/loggerUtils';
+import { useOxy } from '../../context/OxyContext';
 
 /**
  * Get user profile by session ID
@@ -20,8 +19,8 @@ export const useUserProfile = (sessionId: string | null, options?: { enabled?: b
       return await oxyServices.getUserBySession(sessionId);
     },
     enabled: (options?.enabled !== false) && !!sessionId,
-    staleTime: 30000, // 30 seconds - reasonable freshness without constant refetching
-    gcTime: 5 * 60 * 1000, // 5 minutes - keep in cache for quick access
+    staleTime: 5 * 60 * 1000, // 5 minutes
+    gcTime: 30 * 60 * 1000, // 30 minutes
   });
 };
 
@@ -39,8 +38,8 @@ export const useUserProfiles = (sessionIds: string[], options?: { enabled?: bool
         return results[0]?.user || null;
       },
       enabled: (options?.enabled !== false) && !!sessionId,
-      staleTime: 30000, // 30 seconds
-      gcTime: 5 * 60 * 1000, // 5 minutes
+      staleTime: 5 * 60 * 1000,
+      gcTime: 30 * 60 * 1000,
     })),
   });
 };
@@ -54,25 +53,14 @@ export const useCurrentUser = (options?: { enabled?: boolean }) => {
   return useQuery({
     queryKey: queryKeys.accounts.current(),
     queryFn: async () => {
-      logger.debug('Fetching current user', {
-        component: 'useCurrentUser',
-        sessionId: activeSessionId ?? undefined
-      });
       if (!activeSessionId) {
         throw new Error('No active session');
       }
-      const userData = await oxyServices.getUserBySession(activeSessionId);
-      logger.debug('Current user fetched', {
-        component: 'useCurrentUser',
-        username: userData.username
-      });
-      return userData;
+      return await oxyServices.getUserBySession(activeSessionId);
     },
     enabled: (options?.enabled !== false) && isAuthenticated && !!activeSessionId,
-    staleTime: 30000, // 30 seconds - balances freshness with performance
-    gcTime: 5 * 60 * 1000, // 5 minutes
-    refetchOnMount: 'always', // Always refetch on mount
-    refetchOnWindowFocus: false,
+    staleTime: 1 * 60 * 1000, // 1 minute for current user
+    gcTime: 30 * 60 * 1000,
   });
 };
 
@@ -91,8 +79,8 @@ export const useUserById = (userId: string | null, options?: { enabled?: boolean
       return await oxyServices.getUserById(userId);
     },
     enabled: (options?.enabled !== false) && !!userId,
-    staleTime: 60000, // 1 minute - other users' profiles change less frequently
-    gcTime: 10 * 60 * 1000, // 10 minutes
+    staleTime: 5 * 60 * 1000,
+    gcTime: 30 * 60 * 1000,
   });
 };
 
@@ -111,8 +99,8 @@ export const useUserByUsername = (username: string | null, options?: { enabled?:
       return await oxyServices.getProfileByUsername(username);
     },
     enabled: (options?.enabled !== false) && !!username,
-    staleTime: 60000, // 1 minute
-    gcTime: 10 * 60 * 1000, // 10 minutes
+    staleTime: 5 * 60 * 1000,
+    gcTime: 30 * 60 * 1000,
   });
 };
 
@@ -131,8 +119,8 @@ export const useUsersBySessions = (sessionIds: string[], options?: { enabled?: b
       return await oxyServices.getUsersBySessions(sessionIds);
     },
     enabled: (options?.enabled !== false) && sessionIds.length > 0,
-    staleTime: 30000, // 30 seconds
-    gcTime: 5 * 60 * 1000, // 5 minutes
+    staleTime: 5 * 60 * 1000,
+    gcTime: 30 * 60 * 1000,
   });
 };
 
@@ -140,11 +128,8 @@ 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, 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;
-  const deviceId = activeSessionId ? sessions.find((s) => s.sessionId === activeSessionId)?.deviceId : undefined;
+  const { oxyServices, activeSessionId, user } = useOxy();
+  const targetUserId = userId || user?.id;
 
   return useQuery({
     queryKey: queryKeys.privacy.settings(targetUserId),
@@ -157,9 +142,16 @@ export const usePrivacySettings = (userId?: string, options?: { enabled?: boolea
       if (!oxyServices.hasValidToken() && activeSessionId) {
         try {
           // Try to get token for the session
-          await oxyServices.getTokenBySession(activeSessionId, deviceId);
+          await oxyServices.getTokenBySession(activeSessionId);
         } catch (tokenError) {
-          throw 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')) {
+            // Session sync should be handled by the app layer (e.g., accounts app's useIdentity hook)
+            throw new Error('Session needs to be synced. Please try again.');
+          } else {
+            throw tokenError;
+          }
         }
       }
 
@@ -171,7 +163,8 @@ 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')) {
-          throw error;
+          // Session sync should be handled by the app layer
+          throw new Error('Authentication failed. Please sign in again.');
         }
         
         // TanStack Query will automatically retry on network errors
@@ -179,7 +172,8 @@ export const usePrivacySettings = (userId?: string, options?: { enabled?: boolea
       }
     },
     enabled: (options?.enabled !== false) && !!targetUserId,
-    staleTime: 60000, // 1 minute - privacy settings don't change frequently
+    staleTime: 2 * 60 * 1000, // 2 minutes
     gcTime: 10 * 60 * 1000, // 10 minutes
   });
 };
+

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

@@ -1,6 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
 import { queryKeys } from './queryKeys';
-import { useOxy } from '../../context/OxyContextBase';
+import { useOxy } from '../../context/OxyContext';
 import type { SecurityActivity, SecurityEventType } from '../../../models/interfaces';
 
 /**

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

@@ -1,7 +1,7 @@
 import { useQuery } from '@tanstack/react-query';
 import type { ClientSession } from '../../../models/session';
 import { queryKeys } from './queryKeys';
-import { useOxy } from '../../context/OxyContextBase';
+import { useOxy } from '../../context/OxyContext';
 import { fetchSessionsWithFallback, mapSessionsToClient } from '../../utils/sessionHelpers';
 
 /**
@@ -89,8 +89,7 @@ export const useDeviceSessions = (options?: { enabled?: boolean }) => {
  * Get user devices
  */
 export const useUserDevices = (options?: { enabled?: boolean }) => {
-  const { oxyServices, isAuthenticated, activeSessionId, sessions } = useOxy();
-  const deviceId = activeSessionId ? sessions.find((s) => s.sessionId === activeSessionId)?.deviceId : undefined;
+  const { oxyServices, isAuthenticated, activeSessionId } = useOxy();
 
   return useQuery({
     queryKey: queryKeys.devices.list(),
@@ -99,9 +98,16 @@ export const useUserDevices = (options?: { enabled?: boolean }) => {
       if (!oxyServices.hasValidToken() && activeSessionId) {
         try {
           // Try to get token for the session
-          await oxyServices.getTokenBySession(activeSessionId, deviceId);
+          await oxyServices.getTokenBySession(activeSessionId);
         } catch (tokenError) {
-          throw 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')) {
+            // Session sync should be handled by the app layer
+            throw new Error('Session needs to be synced. Please try again.');
+          } else {
+            throw tokenError;
+          }
         }
       }
 
@@ -113,7 +119,8 @@ export const useUserDevices = (options?: { enabled?: boolean }) => {
         
         // Handle authentication errors
         if (status === 401 || errorMessage.includes('Authentication required') || errorMessage.includes('Invalid or missing authorization header')) {
-          throw error;
+          // Session sync should be handled by the app layer
+          throw new Error('Authentication failed. Please sign in again.');
         }
         
         // TanStack Query will automatically retry on network errors
@@ -142,3 +149,4 @@ export const useSecurityInfo = (options?: { enabled?: boolean }) => {
     gcTime: 30 * 60 * 1000,
   });
 };
+

package/src/ui/hooks/useProfileEditing.ts

@@ -1,7 +1,7 @@
 import { useCallback } from 'react';
 import { useI18n } from './useI18n';
 import { useUpdateProfile } from './mutations/useAccountMutations';
-import { useCurrentUser } from './queries/useAccountQueries';
+import { useAuthStore } from '../stores/authStore';
 
 export interface ProfileUpdateData {
     displayName?: string;
@@ -34,7 +34,6 @@ export interface ProfileUpdateData {
 export const useProfileEditing = () => {
     const { t } = useI18n();
     const updateProfileMutation = useUpdateProfile();
-    const { data: currentUser } = useCurrentUser();
 
     /**
      * Save profile updates to the server using TanStack Query
@@ -72,6 +71,7 @@ export const useProfileEditing = () => {
 
         // Handle name field
         if (updates.displayName !== undefined || updates.lastName !== undefined) {
+            const currentUser = useAuthStore.getState().user;
             const currentName = currentUser?.name;
             updateData.name = {
                 first: updates.displayName ?? (typeof currentName === 'object' ? currentName?.first : '') ?? '',
@@ -86,7 +86,7 @@ export const useProfileEditing = () => {
             // Error toast is handled by the mutation
             return false;
         }
-    }, [updateProfileMutation, t, currentUser]);
+    }, [updateProfileMutation, t]);
 
     /**
      * Update a single profile field

package/src/ui/hooks/useSessionManagement.ts

@@ -9,9 +9,6 @@ import type { OxyServices } from '../../core';
 import type { QueryClient } from '@tanstack/react-query';
 import { clearQueryCache } from './queryClient';
 
-const getDeviceIdForSession = (sessions: ClientSession[] = [], sessionId: string | null) =>
-  sessionId ? sessions.find((s) => s.sessionId === sessionId)?.deviceId : undefined;
-
 export interface UseSessionManagementOptions {
   oxyServices: OxyServices;
   storage: StorageInterface | null;
@@ -147,8 +144,7 @@ export const useSessionManagement = ({
     try {
       await storage.removeItem(storageKeys.activeSessionId);
       await storage.removeItem(storageKeys.sessionIds);
-      // Clear identity sync state
-      await storage.removeItem('oxy_identity_synced').catch(() => {});
+      // Note: Identity sync state ('oxy_identity_synced') is managed by accounts app
     } catch (error) {
       handleAuthError(error, {
         defaultMessage: CLEAR_STORAGE_ERROR,
@@ -164,7 +160,6 @@ export const useSessionManagement = ({
     setSessions([]);
     setActiveSessionId(null);
     logoutStore();
-    oxyServices.clearTokens();
     
     // Clear TanStack Query cache (in-memory)
     if (queryClient) {
@@ -184,12 +179,11 @@ export const useSessionManagement = ({
     
     await clearSessionStorage();
     onAuthStateChange?.(null);
-  }, [clearSessionStorage, logoutStore, onAuthStateChange, queryClient, storage, logger, oxyServices]);
+  }, [clearSessionStorage, logoutStore, onAuthStateChange, queryClient, storage, logger]);
 
   const activateSession = useCallback(
     async (sessionId: string, user: User): Promise<void> => {
-      const deviceId = getDeviceIdForSession(sessions, sessionId);
-      await oxyServices.getTokenBySession(sessionId, deviceId);
+      await oxyServices.getTokenBySession(sessionId);
       setTokenReady?.(true);
       setActiveSessionId(sessionId);
       loginSuccess(user);
@@ -199,7 +193,6 @@ export const useSessionManagement = ({
     },
     [
       applyLanguagePreference,
-      sessions,
       loginSuccess,
       onAuthStateChange,
       oxyServices,
@@ -403,3 +396,5 @@ export const useSessionManagement = ({
     isRefreshInFlight,
   };
 };
+
+