@oxyhq/services 5.16.29 → 5.16.31

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

@@ -1 +1 @@
-{"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","syncIdentity","targetUserId","getCurrentUserId","undefined","privacy","settings","hasValidToken","getTokenBySession","tokenError","errorMessage","message","String","includes","syncError","getPrivacySettings","error","status","response","retryError"],"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","syncIdentity","targetUserId","getCurrentUserId","undefined","privacy","settings","hasValidToken","getTokenBySession","tokenError","errorMessage","message","String","includes","syncError","getPrivacySettings","error","status","response","retryError","useBlockedUsers","blocked","getBlockedUsers","useRestrictedUsers","restricted","getRestrictedUsers"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useAccountQueries.ts"],"mappings":"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","ignoreList":[]}

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

@@ -3,7 +3,7 @@
 import { useQuery } from '@tanstack/react-query';
 import { queryKeys } from './queryKeys';
 import { useOxy } from '../../context/OxyContext';
-import { fetchSessionsWithFallback, mapSessionsToClient } from '../../utils/sessionHelpers';
+import { fetchSessionsWithFallback } from '../../utils/sessionHelpers';
 
 /**
  * Get all active sessions for the current user
@@ -11,7 +11,8 @@ import { fetchSessionsWithFallback, mapSessionsToClient } from '../../utils/sess
 export const useSessions = (userId, options) => {
   const {
     oxyServices,
-    activeSessionId
+    activeSessionId,
+    user
   } = useOxy();
   return useQuery({
     queryKey: queryKeys.sessions.list(userId),
@@ -19,11 +20,13 @@ export const useSessions = (userId, options) => {
       if (!activeSessionId) {
         throw new Error('No active session');
       }
+      const publicKey = user?.publicKey || user?.id || ''; // user.id is now publicKey
       const sessions = await fetchSessionsWithFallback(oxyServices, activeSessionId, {
         fallbackDeviceId: undefined,
-        fallbackUserId: userId
+        fallbackUserId: userId,
+        fallbackPublicKey: publicKey
       });
-      return mapSessionsToClient(sessions, activeSessionId);
+      return sessions; // Already mapped by fetchSessionsWithFallback
     },
     enabled: options?.enabled !== false && !!activeSessionId,
     staleTime: 2 * 60 * 1000,
@@ -52,13 +55,18 @@ export const useSession = (sessionId, options) => {
         throw new Error('Session not found or invalid');
       }
       const now = new Date();
+      // user.id is now publicKey (canonical identity)
+      const publicKey = validation.user.publicKey || validation.user.id || '';
       return {
         sessionId,
         deviceId: '',
         // Device ID not available from validation response
         expiresAt: validation.expiresAt || new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000).toISOString(),
         lastActive: validation.lastActivity || now.toISOString(),
-        userId: validation.user.id?.toString() ?? '',
+        publicKey,
+        // Canonical user identity
+        userId: validation.user.id?.toString(),
+        // Optional MongoDB ObjectId
         isCurrent: false
       };
     },

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

@@ -1 +1 @@
-{"version":3,"names":["useQuery","queryKeys","useOxy","fetchSessionsWithFallback","mapSessionsToClient","useSessions","userId","options","oxyServices","activeSessionId","queryKey","sessions","list","queryFn","Error","fallbackDeviceId","undefined","fallbackUserId","enabled","staleTime","gcTime","useSession","sessionId","detail","validation","validateSession","useHeaderValidation","valid","user","now","Date","deviceId","expiresAt","getTime","toISOString","lastActive","lastActivity","id","toString","isCurrent","useDeviceSessions","active","getDeviceSessions","useUserDevices","isAuthenticated","syncIdentity","devices","hasValidToken","getTokenBySession","tokenError","errorMessage","message","String","includes","syncError","getUserDevices","error","status","response","retryError","useSecurityInfo","all","getSecurityInfo"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useServicesQueries.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useQuery","queryKeys","useOxy","fetchSessionsWithFallback","useSessions","userId","options","oxyServices","activeSessionId","user","queryKey","sessions","list","queryFn","Error","publicKey","id","fallbackDeviceId","undefined","fallbackUserId","fallbackPublicKey","enabled","staleTime","gcTime","useSession","sessionId","detail","validation","validateSession","useHeaderValidation","valid","now","Date","deviceId","expiresAt","getTime","toISOString","lastActive","lastActivity","toString","isCurrent","useDeviceSessions","active","getDeviceSessions","useUserDevices","isAuthenticated","syncIdentity","devices","hasValidToken","getTokenBySession","tokenError","errorMessage","message","String","includes","syncError","getUserDevices","error","status","response","retryError","useSecurityInfo","all","getSecurityInfo"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/useServicesQueries.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/hooks/useSessionManagement.js

@@ -177,8 +177,11 @@ export const useSessionManagement = ({
       const user = validation.user;
       await activateSession(sessionId, user);
       try {
+        const publicKey = user.publicKey || user.id || ''; // user.id is now publicKey
         const deviceSessions = await fetchSessionsWithFallback(oxyServices, sessionId, {
           fallbackUserId: user.id,
+          // Still pass for backward compatibility
+          fallbackPublicKey: publicKey,
           logger
         });
         updateSessions(deviceSessions, {
@@ -227,8 +230,13 @@ export const useSessionManagement = ({
     lastRefreshRef.current = now;
     const refreshPromise = (async () => {
       try {
+        // Get publicKey from active session or current user
+        const activeSession = sessions.find(s => s.sessionId === activeSessionId);
+        const publicKey = activeSession?.publicKey || activeUserId || ''; // Fallback to userId if publicKey not available
+
         const deviceSessions = await fetchSessionsWithFallback(oxyServices, activeSessionId, {
           fallbackUserId: activeUserId,
+          fallbackPublicKey: publicKey,
           logger
         });
         updateSessions(deviceSessions, {

package/lib/module/ui/hooks/useSessionManagement.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useMemo","useRef","useState","mergeSessions","normalizeAndSortSessions","sessionsArraysEqual","fetchSessionsWithFallback","validateSessionBatch","getStorageKeys","handleAuthError","isInvalidSessionError","clearQueryCache","DEFAULT_SAVE_ERROR_MESSAGE","CLEAR_STORAGE_ERROR","useSessionManagement","oxyServices","storage","storageKeyPrefix","loginSuccess","logoutStore","applyLanguagePreference","onAuthStateChange","onError","setAuthError","logger","setTokenReady","queryClient","sessions","setSessions","activeSessionId","setActiveSessionId","refreshInFlightRef","removedSessionsRef","Set","lastRefreshRef","storageKeys","saveSessionIds","sessionIds","uniqueIds","Array","from","setItem","JSON","stringify","error","__DEV__","console","warn","updateSessions","incoming","options","prevSessions","processed","merge","map","session","sessionId","saveActiveSessionId","defaultMessage","code","removeActiveSessionId","removeItem","clearSessionStorage","catch","clearSessionState","clear","activateSession","user","getTokenBySession","trackRemovedSession","current","add","setTimeout","delete","findReplacementSession","length","validationResults","maxConcurrency","validSession","find","result","valid","validation","validateSession","useHeaderValidation","switchSession","Error","deviceSessions","fallbackUserId","id","invalidSession","filter","otherSessionIds","has","replacementUser","refreshSessions","activeUserId","now","Date","refreshPromise","otherSessions","isRefreshInFlight","Boolean"],"sourceRoot":"../../../../src","sources":["ui/hooks/useSessionManagement.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useMemo","useRef","useState","mergeSessions","normalizeAndSortSessions","sessionsArraysEqual","fetchSessionsWithFallback","validateSessionBatch","getStorageKeys","handleAuthError","isInvalidSessionError","clearQueryCache","DEFAULT_SAVE_ERROR_MESSAGE","CLEAR_STORAGE_ERROR","useSessionManagement","oxyServices","storage","storageKeyPrefix","loginSuccess","logoutStore","applyLanguagePreference","onAuthStateChange","onError","setAuthError","logger","setTokenReady","queryClient","sessions","setSessions","activeSessionId","setActiveSessionId","refreshInFlightRef","removedSessionsRef","Set","lastRefreshRef","storageKeys","saveSessionIds","sessionIds","uniqueIds","Array","from","setItem","JSON","stringify","error","__DEV__","console","warn","updateSessions","incoming","options","prevSessions","processed","merge","map","session","sessionId","saveActiveSessionId","defaultMessage","code","removeActiveSessionId","removeItem","clearSessionStorage","catch","clearSessionState","clear","activateSession","user","getTokenBySession","trackRemovedSession","current","add","setTimeout","delete","findReplacementSession","length","validationResults","maxConcurrency","validSession","find","result","valid","validation","validateSession","useHeaderValidation","switchSession","Error","publicKey","id","deviceSessions","fallbackUserId","fallbackPublicKey","invalidSession","filter","otherSessionIds","has","replacementUser","refreshSessions","activeUserId","now","Date","refreshPromise","activeSession","s","otherSessions","isRefreshInFlight","Boolean"],"sourceRoot":"../../../../src","sources":["ui/hooks/useSessionManagement.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/screens/PrivacySettingsScreen.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import React, { useState, useCallback, useEffect, useMemo } from 'react';
+import React, { useState, useCallback, useMemo } from 'react';
 import { View, Text, StyleSheet, ScrollView, TouchableOpacity } from 'react-native';
 import { toast } from '../../lib/sonner';
 import { Header, Section, Avatar, SettingRow, LoadingState, EmptyState, GroupedSection } from '../components';
@@ -8,6 +8,8 @@ import { useI18n } from '../hooks/useI18n';
 import { useThemeStyles } from '../hooks/useThemeStyles';
 import { normalizeTheme } from '../utils/themeUtils';
 import { useOxy } from '../context/OxyContext';
+import { usePrivacySettings, useBlockedUsers, useRestrictedUsers } from '../hooks/queries';
+import { useUpdatePrivacySettings, useUnblockUser, useUnrestrictUser } from '../hooks/mutations';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const PrivacySettingsScreen = ({
   onClose,
@@ -16,12 +18,33 @@ const PrivacySettingsScreen = ({
 }) => {
   // Use useOxy() hook for OxyContext values
   const {
-    oxyServices,
-    user
+    oxyServices
   } = useOxy();
   const {
     t
   } = useI18n();
+
+  // TanStack Query hooks for server state
+  const {
+    data: privacySettingsData,
+    isLoading: isLoadingSettings,
+    error: settingsError
+  } = usePrivacySettings();
+  const {
+    data: blockedUsers = [],
+    isLoading: isLoadingBlocked
+  } = useBlockedUsers();
+  const {
+    data: restrictedUsers = [],
+    isLoading: isLoadingRestricted
+  } = useRestrictedUsers();
+
+  // Mutations
+  const updatePrivacySettingsMutation = useUpdatePrivacySettings();
+  const unblockUserMutation = useUnblockUser();
+  const unrestrictUserMutation = useUnrestrictUser();
+
+  // Client state for optimistic UI updates
   const [settings, setSettings] = useState({
     isPrivateAccount: false,
     hideOnlineStatus: false,
@@ -43,108 +66,64 @@ const PrivacySettingsScreen = ({
     autoFilter: true,
     muteKeywords: false
   });
-  const [isLoading, setIsLoading] = useState(true);
-  const [isSaving, setIsSaving] = useState(false);
-  const [blockedUsers, setBlockedUsers] = useState([]);
-  const [restrictedUsers, setRestrictedUsers] = useState([]);
-  const [isLoadingUsers, setIsLoadingUsers] = useState(false);
 
-  // Load settings and users
-  useEffect(() => {
-    const loadSettings = async () => {
-      try {
-        setIsLoading(true);
-        // Use getCurrentUserId() which returns MongoDB ObjectId from JWT token
-        // Never use user?.id as it may be set to publicKey
-        const userId = oxyServices?.getCurrentUserId();
-        if (userId && oxyServices) {
-          const privacySettings = await oxyServices.getPrivacySettings(userId);
-          if (privacySettings) {
-            setSettings(privacySettings);
-          }
-        }
-      } catch (error) {
-        console.error('Failed to load privacy settings:', error);
-        toast.error(t('privacySettings.loadError') || 'Failed to load privacy settings');
-      } finally {
-        setIsLoading(false);
-      }
-    };
-    loadSettings();
-  }, [oxyServices, t]);
+  // Update local state when server data changes
+  React.useEffect(() => {
+    if (privacySettingsData) {
+      setSettings(privacySettingsData);
+    }
+  }, [privacySettingsData]);
 
-  // Load blocked and restricted users
-  useEffect(() => {
-    const loadUsers = async () => {
-      if (!oxyServices) return;
-      try {
-        setIsLoadingUsers(true);
-        const [blocked, restricted] = await Promise.all([oxyServices.getBlockedUsers(), oxyServices.getRestrictedUsers()]);
-        setBlockedUsers(blocked);
-        setRestrictedUsers(restricted);
-      } catch (error) {
-        console.error('Failed to load blocked/restricted users:', error);
-      } finally {
-        setIsLoadingUsers(false);
-      }
-    };
-    loadUsers();
-  }, [oxyServices]);
+  // Show error toast if settings failed to load
+  React.useEffect(() => {
+    if (settingsError) {
+      toast.error(t('privacySettings.loadError') || 'Failed to load privacy settings');
+    }
+  }, [settingsError, t]);
+  const isLoading = isLoadingSettings;
+  const isSaving = updatePrivacySettingsMutation.isPending;
+  const isLoadingUsers = isLoadingBlocked || isLoadingRestricted;
   const updateSetting = useCallback(async (key, value) => {
-    try {
-      setIsSaving(true);
-      const newSettings = {
-        ...settings,
-        [key]: value
-      };
-      setSettings(newSettings);
+    // Optimistic update
+    const newSettings = {
+      ...settings,
+      [key]: value
+    };
+    setSettings(newSettings);
 
-      // Use getCurrentUserId() which returns MongoDB ObjectId from JWT token
-      // Never use user?.id as it may be set to publicKey
-      const userId = oxyServices?.getCurrentUserId();
-      if (userId && oxyServices) {
-        await oxyServices.updatePrivacySettings({
-          [key]: value
-        }, userId);
-        toast.success(t('privacySettings.updated') || 'Privacy settings updated');
+    // Use mutation hook
+    updatePrivacySettingsMutation.mutate({
+      settings: {
+        [key]: value
       }
-    } catch (error) {
-      console.error(`Failed to update ${key}:`, error);
-      toast.error(t('privacySettings.updateError') || 'Failed to update privacy setting');
-      // Revert on error
-      setSettings(settings);
-    } finally {
-      setIsSaving(false);
-    }
-  }, [settings, oxyServices, t]);
+    }, {
+      onError: () => {
+        // Revert on error
+        setSettings(settings);
+        toast.error(t('privacySettings.updateError') || 'Failed to update privacy setting');
+      }
+    });
+  }, [settings, updatePrivacySettingsMutation, t]);
   const handleUnblock = useCallback(async userId => {
-    if (!oxyServices) return;
-    try {
-      await oxyServices.unblockUser(userId);
-      setBlockedUsers(prev => prev.filter(u => {
-        const id = typeof u.blockedId === 'string' ? u.blockedId : u.blockedId._id;
-        return id !== userId;
-      }));
-      toast.success(t('privacySettings.userUnblocked') || 'User unblocked');
-    } catch (error) {
-      console.error('Failed to unblock user:', error);
-      toast.error(t('privacySettings.unblockError') || 'Failed to unblock user');
-    }
-  }, [oxyServices, t]);
+    unblockUserMutation.mutate(userId, {
+      onSuccess: () => {
+        toast.success(t('privacySettings.userUnblocked') || 'User unblocked');
+      },
+      onError: () => {
+        toast.error(t('privacySettings.unblockError') || 'Failed to unblock user');
+      }
+    });
+  }, [unblockUserMutation, t]);
   const handleUnrestrict = useCallback(async userId => {
-    if (!oxyServices) return;
-    try {
-      await oxyServices.unrestrictUser(userId);
-      setRestrictedUsers(prev => prev.filter(u => {
-        const id = typeof u.restrictedId === 'string' ? u.restrictedId : u.restrictedId._id;
-        return id !== userId;
-      }));
-      toast.success(t('privacySettings.userUnrestricted') || 'User unrestricted');
-    } catch (error) {
-      console.error('Failed to unrestrict user:', error);
-      toast.error(t('privacySettings.unrestrictError') || 'Failed to unrestrict user');
-    }
-  }, [oxyServices, t]);
+    unrestrictUserMutation.mutate(userId, {
+      onSuccess: () => {
+        toast.success(t('privacySettings.userUnrestricted') || 'User unrestricted');
+      },
+      onError: () => {
+        toast.error(t('privacySettings.unrestrictError') || 'Failed to unrestrict user');
+      }
+    });
+  }, [unrestrictUserMutation, t]);
 
   // Helper to extract user info from blocked/restricted objects
   const extractUserInfo = useCallback((item, idField) => {

package/lib/module/ui/screens/PrivacySettingsScreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useState","useCallback","useEffect","useMemo","View","Text","StyleSheet","ScrollView","TouchableOpacity","toast","Header","Section","Avatar","SettingRow","LoadingState","EmptyState","GroupedSection","useI18n","useThemeStyles","normalizeTheme","useOxy","jsx","_jsx","jsxs","_jsxs","PrivacySettingsScreen","onClose","theme","goBack","oxyServices","user","t","settings","setSettings","isPrivateAccount","hideOnlineStatus","hideLastSeen","profileVisibility","loginAlerts","blockScreenshots","login","biometricLogin","showActivity","allowTagging","allowMentions","hideReadReceipts","allowDirectMessages","dataSharing","locationSharing","analyticsSharing","sensitiveContent","autoFilter","muteKeywords","isLoading","setIsLoading","isSaving","setIsSaving","blockedUsers","setBlockedUsers","restrictedUsers","setRestrictedUsers","isLoadingUsers","setIsLoadingUsers","loadSettings","userId","getCurrentUserId","privacySettings","getPrivacySettings","error","console","loadUsers","blocked","restricted","Promise","all","getBlockedUsers","getRestrictedUsers","updateSetting","key","value","newSettings","updatePrivacySettings","success","handleUnblock","unblockUser","prev","filter","u","id","blockedId","_id","handleUnrestrict","unrestrictUser","restrictedId","extractUserInfo","item","idField","userIdField","username","avatar","undefined","normalizedTheme","themeStyles","blockedUserItems","map","avatarUri","getFileDownloadUrl","title","customIcon","uri","name","size","customContent","onPress","style","styles","actionButton","backgroundColor","secondaryBackgroundColor","children","actionButtonText","color","dangerColor","restrictedUserItems","subtitle","primaryColor","container","onBack","variant","elevation","textColor","content","isFirst","description","onValueChange","disabled","mutedTextColor","borderColor","length","message","items","create","flex","padding","paddingHorizontal","paddingVertical","borderRadius","fontSize","fontWeight","memo"],"sourceRoot":"../../../../src","sources":["ui/screens/PrivacySettingsScreen.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useState","useCallback","useMemo","View","Text","StyleSheet","ScrollView","TouchableOpacity","toast","Header","Section","Avatar","SettingRow","LoadingState","EmptyState","GroupedSection","useI18n","useThemeStyles","normalizeTheme","useOxy","usePrivacySettings","useBlockedUsers","useRestrictedUsers","useUpdatePrivacySettings","useUnblockUser","useUnrestrictUser","jsx","_jsx","jsxs","_jsxs","PrivacySettingsScreen","onClose","theme","goBack","oxyServices","t","data","privacySettingsData","isLoading","isLoadingSettings","error","settingsError","blockedUsers","isLoadingBlocked","restrictedUsers","isLoadingRestricted","updatePrivacySettingsMutation","unblockUserMutation","unrestrictUserMutation","settings","setSettings","isPrivateAccount","hideOnlineStatus","hideLastSeen","profileVisibility","loginAlerts","blockScreenshots","login","biometricLogin","showActivity","allowTagging","allowMentions","hideReadReceipts","allowDirectMessages","dataSharing","locationSharing","analyticsSharing","sensitiveContent","autoFilter","muteKeywords","useEffect","isSaving","isPending","isLoadingUsers","updateSetting","key","value","newSettings","mutate","onError","handleUnblock","userId","onSuccess","success","handleUnrestrict","extractUserInfo","item","idField","userIdField","username","avatar","blockedId","restrictedId","undefined","_id","normalizedTheme","themeStyles","blockedUserItems","map","blocked","avatarUri","getFileDownloadUrl","id","title","customIcon","uri","name","size","customContent","onPress","style","styles","actionButton","backgroundColor","secondaryBackgroundColor","children","actionButtonText","color","dangerColor","restrictedUserItems","restricted","subtitle","primaryColor","container","onBack","variant","elevation","textColor","content","isFirst","description","onValueChange","disabled","mutedTextColor","borderColor","length","message","items","create","flex","padding","paddingHorizontal","paddingVertical","borderRadius","fontSize","fontWeight","memo"],"sourceRoot":"../../../../src","sources":["ui/screens/PrivacySettingsScreen.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/utils/sessionHelpers.js

@@ -6,17 +6,31 @@
  * @param sessions - Raw session array returned from the API
  * @param fallbackDeviceId - Device identifier to use when missing from payload
  * @param fallbackUserId - User identifier to use when missing from payload
+ * @param fallbackPublicKey - Public key to use when missing from payload (canonical identity)
  */
-export const mapSessionsToClient = (sessions, fallbackDeviceId, fallbackUserId) => {
+export const mapSessionsToClient = (sessions, fallbackDeviceId, fallbackUserId, fallbackPublicKey) => {
   const now = new Date();
-  return sessions.map(session => ({
-    sessionId: session.sessionId,
-    deviceId: session.deviceId || fallbackDeviceId || '',
-    expiresAt: session.expiresAt || new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000).toISOString(),
-    lastActive: session.lastActive || now.toISOString(),
-    userId: session.user?.id || session.userId || (session.user?._id ? session.user._id.toString() : undefined) || fallbackUserId || '',
-    isCurrent: Boolean(session.isCurrent)
-  }));
+  return sessions.map(session => {
+    // publicKey is the canonical user identity (user.id now equals publicKey)
+    // Extract from user.id (which is now publicKey), user.publicKey, or session.publicKey
+    const publicKey = session.user?.id ||
+    // user.id is now publicKey (canonical identifier)
+    session.user?.publicKey || session.publicKey || fallbackPublicKey || '';
+
+    // userId is MongoDB ObjectId (internal backend reference, optional)
+    const userId = session.userId || (session.user?._id ? session.user._id.toString() : undefined);
+    return {
+      sessionId: session.sessionId,
+      deviceId: session.deviceId || fallbackDeviceId || '',
+      expiresAt: session.expiresAt || new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000).toISOString(),
+      lastActive: session.lastActive || now.toISOString(),
+      publicKey,
+      // Canonical user identity - REQUIRED
+      userId,
+      // MongoDB ObjectId (optional, for backward compatibility)
+      isCurrent: Boolean(session.isCurrent)
+    };
+  });
 };
 
 /**
@@ -29,17 +43,18 @@ export const mapSessionsToClient = (sessions, fallbackDeviceId, fallbackUserId)
 export const fetchSessionsWithFallback = async (oxyServices, sessionId, {
   fallbackDeviceId,
   fallbackUserId,
+  fallbackPublicKey,
   logger
 } = {}) => {
   try {
     const deviceSessions = await oxyServices.getDeviceSessions(sessionId);
-    return mapSessionsToClient(deviceSessions, fallbackDeviceId, fallbackUserId);
+    return mapSessionsToClient(deviceSessions, fallbackDeviceId, fallbackUserId, fallbackPublicKey);
   } catch (error) {
     if (__DEV__ && logger) {
       logger('Failed to get device sessions, falling back to user sessions', error);
     }
     const userSessions = await oxyServices.getSessionsBySessionId(sessionId);
-    return mapSessionsToClient(userSessions, fallbackDeviceId, fallbackUserId);
+    return mapSessionsToClient(userSessions, fallbackDeviceId, fallbackUserId, fallbackPublicKey);
   }
 };
 

package/lib/module/ui/utils/sessionHelpers.js.map

@@ -1 +1 @@
-{"version":3,"names":["mapSessionsToClient","sessions","fallbackDeviceId","fallbackUserId","now","Date","map","session","sessionId","deviceId","expiresAt","getTime","toISOString","lastActive","userId","user","id","_id","toString","undefined","isCurrent","Boolean","fetchSessionsWithFallback","oxyServices","logger","deviceSessions","getDeviceSessions","error","__DEV__","userSessions","getSessionsBySessionId","validateSessionBatch","sessionIds","useHeaderValidation","maxConcurrency","length","uniqueSessionIds","Array","from","Set","safeConcurrency","Math","max","min","results","index","worker","currentIndex","validation","validateSession","valid","push","raw","Promise","all"],"sourceRoot":"../../../../src","sources":["ui/utils/sessionHelpers.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["mapSessionsToClient","sessions","fallbackDeviceId","fallbackUserId","fallbackPublicKey","now","Date","map","session","publicKey","user","id","userId","_id","toString","undefined","sessionId","deviceId","expiresAt","getTime","toISOString","lastActive","isCurrent","Boolean","fetchSessionsWithFallback","oxyServices","logger","deviceSessions","getDeviceSessions","error","__DEV__","userSessions","getSessionsBySessionId","validateSessionBatch","sessionIds","useHeaderValidation","maxConcurrency","length","uniqueSessionIds","Array","from","Set","safeConcurrency","Math","max","min","results","index","worker","currentIndex","validation","validateSession","valid","push","raw","Promise","all"],"sourceRoot":"../../../../src","sources":["ui/utils/sessionHelpers.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/utils/sessionUtils.js

@@ -12,12 +12,19 @@
  */
 export function normalizeSession(session) {
   const now = new Date().toISOString();
+
+  // publicKey is required (canonical user identity)
+  if (!session.publicKey) {
+    throw new Error(`Session ${session.sessionId} is missing required publicKey field`);
+  }
   return {
     sessionId: session.sessionId,
     deviceId: session.deviceId || '',
     expiresAt: session.expiresAt || now,
     lastActive: session.lastActive || now,
-    userId: session.userId || ''
+    publicKey: session.publicKey,
+    // Canonical user identity - required
+    userId: session.userId // Optional MongoDB ObjectId for backward compatibility
   };
 }