@oxyhq/services 5.17.16 → 5.17.18

package/lib/module/ui/hooks/mutations/useAccountMutations.js

@@ -4,9 +4,8 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';
 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 = [], sessionId) => 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
@@ -15,8 +14,7 @@ export const useUpdateProfile = () => {
   const {
     oxyServices,
     activeSessionId,
-    user,
-    sessions
+    user
   } = useOxy();
   const queryClient = useQueryClient();
   return useMutation({
@@ -25,9 +23,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;
+          }
         }
       }
       try {
@@ -38,7 +43,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
@@ -84,30 +90,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'
-      });
     }
   });
 };
@@ -118,8 +119,7 @@ export const useUpdateProfile = () => {
 export const useUploadAvatar = () => {
   const {
     oxyServices,
-    activeSessionId,
-    sessions
+    activeSessionId
   } = useOxy();
   const queryClient = useQueryClient();
   return useMutation({
@@ -127,9 +127,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;
+          }
         }
       }
       try {
@@ -150,7 +156,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
@@ -187,35 +194,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'
-      });
     }
   });
 };
@@ -261,6 +257,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');
     },
@@ -279,7 +278,7 @@ export const useUpdatePrivacySettings = () => {
   const {
     oxyServices,
     activeSessionId,
-    sessions
+    user
   } = useOxy();
   const queryClient = useQueryClient();
   return useMutation({
@@ -287,9 +286,7 @@ export const useUpdatePrivacySettings = () => {
       settings,
       userId
     }) => {
-      // 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');
       }
@@ -298,9 +295,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;
+          }
         }
       }
       try {
@@ -311,7 +315,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
@@ -323,7 +328,7 @@ export const useUpdatePrivacySettings = () => {
       settings,
       userId
     }) => {
-      const targetUserId = userId || oxyServices.getCurrentUserId();
+      const targetUserId = userId || user?.id;
       if (!targetUserId) return;
 
       // Cancel outgoing refetches
@@ -365,7 +370,7 @@ export const useUpdatePrivacySettings = () => {
     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);
       }
@@ -378,7 +383,7 @@ export const useUpdatePrivacySettings = () => {
     onSuccess: (data, {
       userId
     }) => {
-      const targetUserId = userId || oxyServices.getCurrentUserId();
+      const targetUserId = userId || user?.id;
       if (targetUserId) {
         queryClient.setQueryData(queryKeys.privacy.settings(targetUserId), data);
       }
@@ -390,6 +395,9 @@ export const useUpdatePrivacySettings = () => {
           privacySettings: data
         };
         queryClient.setQueryData(queryKeys.accounts.current(), updatedUser);
+
+        // Update authStore so frontend components see the changes immediately
+        useAuthStore.getState().setUser(updatedUser);
       }
       invalidateAccountQueries(queryClient);
     },
@@ -397,7 +405,7 @@ export const useUpdatePrivacySettings = () => {
     onSettled: (data, error, {
       userId
     }) => {
-      const targetUserId = userId || oxyServices.getCurrentUserId();
+      const targetUserId = userId || user?.id;
       if (targetUserId) {
         queryClient.invalidateQueries({
           queryKey: queryKeys.privacy.settings(targetUserId)
@@ -416,8 +424,7 @@ export const useUpdatePrivacySettings = () => {
 export const useUploadFile = () => {
   const {
     oxyServices,
-    activeSessionId,
-    sessions
+    activeSessionId
   } = useOxy();
   return useMutation({
     mutationFn: async ({
@@ -430,9 +437,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;
+          }
         }
       }
       try {
@@ -443,7 +457,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

package/lib/module/ui/hooks/mutations/useAccountMutations.js.map

@@ -1 +1 @@
-{"version":3,"names":["useMutation","useQueryClient","queryKeys","invalidateAccountQueries","invalidateUserQueries","useOxy","toast","refreshAccountInStore","logger","getDeviceIdForSession","sessions","sessionId","find","s","deviceId","undefined","useUpdateProfile","oxyServices","activeSessionId","user","queryClient","mutationFn","updates","hasValidToken","getTokenBySession","tokenError","updateProfile","error","errorMessage","message","status","response","includes","onMutate","cancelQueries","queryKey","accounts","current","previousUser","getQueryData","setQueryData","users","profile","onError","context","Error","onSuccess","data","debug","component","username","updatedFields","Object","keys","useUploadAvatar","file","uploadResult","assetUpload","fileId","id","avatar","optimisticUser","uri","method","refetchQueries","success","useUpdateAccountSettings","settings","privacySettings","onSettled","invalidateQueries","useUpdatePrivacySettings","userId","targetUserId","getCurrentUserId","updatePrivacySettings","privacy","previousPrivacySettings","currentUser","updatedUser","useUploadFile","visibility","metadata","onProgress"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/useAccountMutations.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useMutation","useQueryClient","queryKeys","invalidateAccountQueries","invalidateUserQueries","useOxy","toast","refreshAvatarInStore","useAuthStore","useUpdateProfile","oxyServices","activeSessionId","user","queryClient","mutationFn","updates","hasValidToken","getTokenBySession","tokenError","errorMessage","Error","message","String","includes","updateProfile","error","status","response","onMutate","cancelQueries","queryKey","accounts","current","previousUser","getQueryData","setQueryData","users","profile","onError","context","onSuccess","data","getState","setUser","avatar","useUploadAvatar","file","uploadResult","assetUpload","fileId","id","optimisticUser","uri","success","useUpdateAccountSettings","settings","privacySettings","onSettled","invalidateQueries","useUpdatePrivacySettings","userId","targetUserId","updatePrivacySettings","privacy","previousPrivacySettings","currentUser","updatedUser","useUploadFile","visibility","metadata","onProgress"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/useAccountMutations.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/hooks/queries/useAccountQueries.js

@@ -2,8 +2,7 @@
 
 import { useQuery, useQueries } from '@tanstack/react-query';
 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
@@ -21,9 +20,9 @@ export const useUserProfile = (sessionId, options) => {
       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
   });
 };
 
@@ -42,9 +41,8 @@ export const useUserProfiles = (sessionIds, options) => {
         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
     }))
   });
 };
@@ -61,28 +59,15 @@ export const useCurrentUser = options => {
   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
   });
 };
 
@@ -102,9 +87,8 @@ export const useUserById = (userId, options) => {
       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
   });
 };
 
@@ -124,9 +108,8 @@ export const useUserByUsername = (username, options) => {
       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
   });
 };
 
@@ -146,9 +129,8 @@ export const useUsersBySessions = (sessionIds, options) => {
       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
   });
 };
 
@@ -159,12 +141,9 @@ export const usePrivacySettings = (userId, options) => {
   const {
     oxyServices,
     activeSessionId,
-    sessions
+    user
   } = 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 targetUserId = userId || user?.id;
   return useQuery({
     queryKey: queryKeys.privacy.settings(targetUserId),
     queryFn: async () => {
@@ -176,9 +155,16 @@ export const usePrivacySettings = (userId, options) => {
       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;
+          }
         }
       }
       try {
@@ -189,7 +175,8 @@ export const usePrivacySettings = (userId, options) => {
 
         // 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
@@ -197,8 +184,8 @@ export const usePrivacySettings = (userId, options) => {
       }
     },
     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/lib/module/ui/hooks/queries/useAccountQueries.js.map

@@ -1 +1 @@
-{"version":3,"names":["useQuery","useQueries","queryKeys","useOxy","logger","useUserProfile","sessionId","options","oxyServices","queryKey","users","profile","queryFn","Error","getUserBySession","enabled","staleTime","gcTime","useUserProfiles","sessionIds","queries","map","results","getUsersBySessions","user","useCurrentUser","activeSessionId","isAuthenticated","accounts","current","debug","component","undefined","userData","username","refetchOnMount","refetchOnWindowFocus","useUserById","userId","detail","getUserById","useUserByUsername","details","getProfileByUsername","useUsersBySessions","list","length","usePrivacySettings","sessions","targetUserId","getCurrentUserId","deviceId","find","s","privacy","settings","hasValidToken","getTokenBySession","tokenError","getPrivacySettings","error","errorMessage","message","status","response","includes"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useAccountQueries.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useQuery","useQueries","queryKeys","useOxy","useUserProfile","sessionId","options","oxyServices","queryKey","users","profile","queryFn","Error","getUserBySession","enabled","staleTime","gcTime","useUserProfiles","sessionIds","queries","map","results","getUsersBySessions","user","useCurrentUser","activeSessionId","isAuthenticated","accounts","current","useUserById","userId","detail","getUserById","useUserByUsername","username","details","getProfileByUsername","useUsersBySessions","list","length","usePrivacySettings","targetUserId","id","privacy","settings","hasValidToken","getTokenBySession","tokenError","errorMessage","message","String","includes","getPrivacySettings","error","status","response"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useAccountQueries.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/hooks/queries/useSecurityQueries.js

@@ -2,7 +2,7 @@
 
 import { useQuery } from '@tanstack/react-query';
 import { queryKeys } from './queryKeys';
-import { useOxy } from '../../context/OxyContextBase';
+import { useOxy } from '../../context/OxyContext';
 /**
  * Get user's security activity with pagination
  */

package/lib/module/ui/hooks/queries/useSecurityQueries.js.map

@@ -1 +1 @@
-{"version":3,"names":["useQuery","queryKeys","useOxy","useSecurityActivity","options","oxyServices","activeSessionId","queryKey","security","activity","limit","offset","eventType","queryFn","Error","response","getSecurityActivity","enabled","staleTime","gcTime","useRecentSecurityActivity","recent","getRecentSecurityActivity"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useSecurityQueries.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,uBAAuB;AAChD,SAASC,SAAS,QAAQ,aAAa;AACvC,SAASC,MAAM,QAAQ,8BAA8B;AAGrD;AACA;AACA;AACA,OAAO,MAAMC,mBAAmB,GAC9BC,OAKC,IACE;EACH,MAAM;IAAEC,WAAW;IAAEC;EAAgB,CAAC,GAAGJ,MAAM,CAAC,CAAC;EAEjD,OAAOF,QAAQ,CAAC;IACdO,QAAQ,EAAEN,SAAS,CAACO,QAAQ,CAACC,QAAQ,CACnCL,OAAO,EAAEM,KAAK,EACdN,OAAO,EAAEO,MAAM,EACfP,OAAO,EAAEQ,SACX,CAAC;IACDC,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAI,CAACP,eAAe,EAAE;QACpB,MAAM,IAAIQ,KAAK,CAAC,mBAAmB,CAAC;MACtC;MAEA,MAAMC,QAAQ,GAAG,MAAMV,WAAW,CAACW,mBAAmB,CACpDZ,OAAO,EAAEM,KAAK,EACdN,OAAO,EAAEO,MAAM,EACfP,OAAO,EAAEQ,SACX,CAAC;MAED,OAAOG,QAAQ;IACjB,CAAC;IACDE,OAAO,EAAGb,OAAO,EAAEa,OAAO,KAAK,KAAK,IAAK,CAAC,CAACX,eAAe;IAC1DY,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IAC1BC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMC,yBAAyB,GAAGA,CAACV,KAAa,GAAG,EAAE,KAAK;EAC/D,MAAM;IAAEL,WAAW;IAAEC;EAAgB,CAAC,GAAGJ,MAAM,CAAC,CAAC;EAEjD,OAAOF,QAAQ,CAAqB;IAClCO,QAAQ,EAAEN,SAAS,CAACO,QAAQ,CAACa,MAAM,CAACX,KAAK,CAAC;IAC1CG,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAI,CAACP,eAAe,EAAE;QACpB,MAAM,IAAIQ,KAAK,CAAC,mBAAmB,CAAC;MACtC;MAEA,OAAO,MAAMT,WAAW,CAACiB,yBAAyB,CAACZ,KAAK,CAAC;IAC3D,CAAC;IACDO,OAAO,EAAE,CAAC,CAACX,eAAe;IAC1BY,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IAC1BC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}
+{"version":3,"names":["useQuery","queryKeys","useOxy","useSecurityActivity","options","oxyServices","activeSessionId","queryKey","security","activity","limit","offset","eventType","queryFn","Error","response","getSecurityActivity","enabled","staleTime","gcTime","useRecentSecurityActivity","recent","getRecentSecurityActivity"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useSecurityQueries.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,uBAAuB;AAChD,SAASC,SAAS,QAAQ,aAAa;AACvC,SAASC,MAAM,QAAQ,0BAA0B;AAGjD;AACA;AACA;AACA,OAAO,MAAMC,mBAAmB,GAC9BC,OAKC,IACE;EACH,MAAM;IAAEC,WAAW;IAAEC;EAAgB,CAAC,GAAGJ,MAAM,CAAC,CAAC;EAEjD,OAAOF,QAAQ,CAAC;IACdO,QAAQ,EAAEN,SAAS,CAACO,QAAQ,CAACC,QAAQ,CACnCL,OAAO,EAAEM,KAAK,EACdN,OAAO,EAAEO,MAAM,EACfP,OAAO,EAAEQ,SACX,CAAC;IACDC,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAI,CAACP,eAAe,EAAE;QACpB,MAAM,IAAIQ,KAAK,CAAC,mBAAmB,CAAC;MACtC;MAEA,MAAMC,QAAQ,GAAG,MAAMV,WAAW,CAACW,mBAAmB,CACpDZ,OAAO,EAAEM,KAAK,EACdN,OAAO,EAAEO,MAAM,EACfP,OAAO,EAAEQ,SACX,CAAC;MAED,OAAOG,QAAQ;IACjB,CAAC;IACDE,OAAO,EAAGb,OAAO,EAAEa,OAAO,KAAK,KAAK,IAAK,CAAC,CAACX,eAAe;IAC1DY,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IAC1BC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;AACJ,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMC,yBAAyB,GAAGA,CAACV,KAAa,GAAG,EAAE,KAAK;EAC/D,MAAM;IAAEL,WAAW;IAAEC;EAAgB,CAAC,GAAGJ,MAAM,CAAC,CAAC;EAEjD,OAAOF,QAAQ,CAAqB;IAClCO,QAAQ,EAAEN,SAAS,CAACO,QAAQ,CAACa,MAAM,CAACX,KAAK,CAAC;IAC1CG,OAAO,EAAE,MAAAA,CAAA,KAAY;MACnB,IAAI,CAACP,eAAe,EAAE;QACpB,MAAM,IAAIQ,KAAK,CAAC,mBAAmB,CAAC;MACtC;MAEA,OAAO,MAAMT,WAAW,CAACiB,yBAAyB,CAACZ,KAAK,CAAC;IAC3D,CAAC;IACDO,OAAO,EAAE,CAAC,CAACX,eAAe;IAC1BY,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAAE;IAC1BC,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,CAAE;EAC1B,CAAC,CAAC;AACJ,CAAC","ignoreList":[]}

package/lib/module/ui/hooks/queries/useServicesQueries.js

@@ -2,7 +2,7 @@
 
 import { useQuery } from '@tanstack/react-query';
 import { queryKeys } from './queryKeys';
-import { useOxy } from '../../context/OxyContextBase';
+import { useOxy } from '../../context/OxyContext';
 import { fetchSessionsWithFallback, mapSessionsToClient } from '../../utils/sessionHelpers';
 
 /**
@@ -97,10 +97,8 @@ export const useUserDevices = options => {
   const {
     oxyServices,
     isAuthenticated,
-    activeSessionId,
-    sessions
+    activeSessionId
   } = useOxy();
-  const deviceId = activeSessionId ? sessions.find(s => s.sessionId === activeSessionId)?.deviceId : undefined;
   return useQuery({
     queryKey: queryKeys.devices.list(),
     queryFn: async () => {
@@ -108,9 +106,16 @@ export const useUserDevices = options => {
       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;
+          }
         }
       }
       try {
@@ -121,7 +126,8 @@ export const useUserDevices = options => {
 
         // 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