@oxyhq/services 5.17.1 → 5.17.4

package/src/ui/context/hooks/useAuthOperations.ts

@@ -96,18 +96,18 @@ export const useAuthOperations = ({
       const USER_ID_STORAGE_KEY = 'oxy_user_id';
 
       // Online-only sign-in: require backend availability
-      // First, resolve userId (prefer locally stored value)
+      // First, look up the user by public key to get the correct userId
+      // This ensures we always use the userId that matches the current identity's public key
       let userId: string | null = null;
-      if (storage) {
-        userId = await storage.getItem(USER_ID_STORAGE_KEY);
-      }
-
-      if (!userId) {
-        const userLookup = await oxyServices.getUserByPublicKey(publicKey);
-        userId = userLookup.id;
-        if (storage && userId) {
-          await storage.setItem(USER_ID_STORAGE_KEY, userId).catch(() => {});
-        }
+      
+      // Always verify the userId matches the current public key
+      // This prevents auth failures when identity has changed
+      const userLookup = await oxyServices.getUserByPublicKey(publicKey);
+      userId = userLookup.id;
+      
+      // Update stored userId to match current identity
+      if (storage && userId) {
+        await storage.setItem(USER_ID_STORAGE_KEY, userId).catch(() => {});
       }
       
       const challengeResponse = await oxyServices.requestChallenge(userId);
@@ -126,14 +126,30 @@ export const useAuthOperations = ({
       }
       
       // Verify and create session using userId
-      const sessionResponse = await oxyServices.verifyChallenge(
-        userId,
-        challenge,
-        signature,
-        timestamp,
-        deviceName,
-        deviceFingerprint,
-      );
+      let sessionResponse;
+      try {
+        sessionResponse = await oxyServices.verifyChallenge(
+          userId,
+          challenge,
+          signature,
+          timestamp,
+          deviceName,
+          deviceFingerprint,
+        );
+      } catch (verifyError) {
+        // Add detailed logging for 401 errors to help diagnose auth failures
+        if (__DEV__) {
+          console.error('[useAuthOperations] verifyChallenge failed:', {
+            error: verifyError,
+            userId,
+            challengeLength: challenge?.length,
+            signatureLength: signature?.length,
+            timestamp,
+            timeSinceChallenge: Date.now() - timestamp,
+          });
+        }
+        throw verifyError;
+      }
 
       // Store tokens immediately (no extra round-trip)
       oxyServices.setTokens(sessionResponse.accessToken, sessionResponse.refreshToken);

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

@@ -2,7 +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/OxyContext';
+import { useOxy } from '../../context/OxyContextBase';
 
 /**
  * Get user profile by session ID

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/OxyContext';
+import { useOxy } from '../../context/OxyContextBase';
 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/OxyContext';
+import { useOxy } from '../../context/OxyContextBase';
 import { fetchSessionsWithFallback, mapSessionsToClient } from '../../utils/sessionHelpers';
 
 /**