@oxyhq/services 10.2.10 → 10.2.11

package/lib/module/ui/context/hooks/useAuthOperations.js

@@ -7,11 +7,6 @@ import { handleAuthError, isInvalidSessionError } from "../../utils/errorHandler
 import { SignatureService } from '@oxyhq/core';
 import { isWebBrowser } from "../../hooks/useWebSSO.js";
 import { clearActiveAuthuser, clearSsoBounceState } from "../../utils/activeAuthuser.js";
-
-/** Type guard for error objects with optional code and status properties */
-function isErrorWithCodeOrStatus(error) {
-  return typeof error === 'object' && error !== null;
-}
 const LOGIN_ERROR_CODE = 'LOGIN_ERROR';
 const LOGOUT_ERROR_CODE = 'LOGOUT_ERROR';
 const LOGOUT_ALL_ERROR_CODE = 'LOGOUT_ALL_ERROR';
@@ -22,7 +17,6 @@ const LOGOUT_ALL_ERROR_CODE = 'LOGOUT_ALL_ERROR';
  */
 export const useAuthOperations = ({
   oxyServices,
-  storage,
   sessions,
   activeSessionId,
   setActiveSessionId,
@@ -44,36 +38,15 @@ export const useAuthOperations = ({
   sessionsRef.current = sessions;
 
   /**
-   * Internal function to perform challenge-response sign in (works offline)
+   * Internal function to perform challenge-response sign in.
    */
   const performSignIn = useCallback(async publicKey => {
     const deviceFingerprintObj = DeviceManager.getDeviceFingerprint();
     const deviceFingerprint = JSON.stringify(deviceFingerprintObj);
     const deviceInfo = await DeviceManager.getDeviceInfo();
     const deviceName = deviceInfo.deviceName || DeviceManager.getDefaultDeviceName();
-    let challenge;
-    let isOffline = false;
-
-    // Try to request challenge from server (online)
-    try {
-      const challengeResponse = await oxyServices.requestChallenge(publicKey);
-      challenge = challengeResponse.challenge;
-    } catch (error) {
-      // Network error - generate challenge locally for offline sign-in
-      const errorMessage = error instanceof Error ? error.message : String(error);
-      const isNetworkError = errorMessage.includes('Network') || errorMessage.includes('network') || errorMessage.includes('Failed to fetch') || errorMessage.includes('fetch failed') || isErrorWithCodeOrStatus(error) && error.code === 'NETWORK_ERROR' || isErrorWithCodeOrStatus(error) && error.status === 0;
-      if (isNetworkError) {
-        if (__DEV__ && logger) {
-          logger('Network unavailable, performing offline sign-in');
-        }
-        // Generate challenge locally
-        challenge = await SignatureService.generateChallenge();
-        isOffline = true;
-      } else {
-        // Re-throw non-network errors
-        throw error;
-      }
-    }
+    const challengeResponse = await oxyServices.requestChallenge(publicKey);
+    const challenge = challengeResponse.challenge;
 
     // Note: Biometric authentication check should be handled by the app layer
     // (e.g., accounts app) before calling signIn. The biometric preference is stored
@@ -86,115 +59,58 @@ export const useAuthOperations = ({
     } = await SignatureService.signChallenge(challenge);
     let fullUser;
     let sessionResponse;
-    if (isOffline) {
-      // Offline sign-in: create local session and minimal user object
-      if (__DEV__ && logger) {
-        logger('Creating offline session');
-      }
 
-      // Generate a local session ID using cryptographically secure randomness
-      const Crypto = await import('expo-crypto');
-      const localSessionId = `offline_${Crypto.randomUUID()}`;
-      const localDeviceId = `device_${Crypto.randomUUID()}`;
-      const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString(); // 7 days
+    // `verifyChallenge` plants the first access token internally, mirroring
+    // `claimSessionByToken`, so the client is authenticated as soon as this
+    // resolves.
+    sessionResponse = await oxyServices.verifyChallenge(publicKey, challenge, signature, timestamp, deviceName, deviceFingerprint);
 
-      // Create minimal user object with publicKey as id
-      fullUser = {
-        id: publicKey,
-        // Use publicKey as id (per migration document)
-        publicKey,
-        username: '',
-        privacySettings: {}
-      };
-      sessionResponse = {
-        sessionId: localSessionId,
-        deviceId: localDeviceId,
-        expiresAt,
-        user: {
-          id: publicKey,
-          username: ''
-        }
-      };
+    // Get full user data
+    fullUser = await oxyServices.getUserBySession(sessionResponse.sessionId);
 
-      // Store offline session locally
-      const offlineSession = {
-        sessionId: localSessionId,
-        deviceId: localDeviceId,
-        expiresAt,
-        lastActive: new Date().toISOString(),
-        userId: publicKey,
-        isCurrent: true
-      };
-      setActiveSessionId(localSessionId);
-      await saveActiveSessionId(localSessionId);
-      updateSessions([offlineSession], {
-        merge: true
+    // Fetch device sessions
+    let allDeviceSessions = [];
+    try {
+      allDeviceSessions = await fetchSessionsWithFallback(oxyServices, sessionResponse.sessionId, {
+        fallbackDeviceId: sessionResponse.deviceId,
+        fallbackUserId: fullUser.id,
+        logger
       });
-
-      // Mark session as offline for later sync
-      if (storage) {
-        await storage.setItem(`oxy_session_${localSessionId}_offline`, 'true');
-      }
+    } catch (error) {
       if (__DEV__ && logger) {
-        logger('Offline sign-in successful');
+        logger('Failed to fetch device sessions after login', error);
       }
-    } else {
-      // Online sign-in: use normal flow.
-      // Verify and create session. `verifyChallenge` plants the first
-      // access token (and refresh token) from the `/auth/verify` response
-      // body internally — mirroring `claimSessionByToken` — so the client is
-      // authenticated as soon as this resolves. Session IDs are not public
-      // token-minting credentials; a token-less verify response simply leaves
-      // the client without a bearer here.
-      sessionResponse = await oxyServices.verifyChallenge(publicKey, challenge, signature, timestamp, deviceName, deviceFingerprint);
-
-      // Get full user data
-      fullUser = await oxyServices.getUserBySession(sessionResponse.sessionId);
+    }
 
-      // Fetch device sessions
-      let allDeviceSessions = [];
+    // Check for existing session for same user and switch to it to avoid duplicates
+    const existingSession = allDeviceSessions.find(session => session.userId?.toString() === fullUser.id?.toString() && session.sessionId !== sessionResponse.sessionId);
+    if (existingSession) {
+      // Switch to existing session instead of creating duplicate
       try {
-        allDeviceSessions = await fetchSessionsWithFallback(oxyServices, sessionResponse.sessionId, {
-          fallbackDeviceId: sessionResponse.deviceId,
-          fallbackUserId: fullUser.id,
-          logger
-        });
-      } catch (error) {
+        await oxyServices.logoutSession(sessionResponse.sessionId, sessionResponse.sessionId);
+      } catch (logoutError) {
+        // Non-critical - continue to switch session even if logout fails
         if (__DEV__ && logger) {
-          logger('Failed to fetch device sessions after login', error);
-        }
-      }
-
-      // Check for existing session for same user and switch to it to avoid duplicates
-      const existingSession = allDeviceSessions.find(session => session.userId?.toString() === fullUser.id?.toString() && session.sessionId !== sessionResponse.sessionId);
-      if (existingSession) {
-        // Switch to existing session instead of creating duplicate
-        try {
-          await oxyServices.logoutSession(sessionResponse.sessionId, sessionResponse.sessionId);
-        } catch (logoutError) {
-          // Non-critical - continue to switch session even if logout fails
-          if (__DEV__ && logger) {
-            logger('Failed to logout duplicate session, continuing with switch', logoutError);
-          }
+          logger('Failed to logout duplicate session, continuing with switch', logoutError);
         }
-        await switchSession(existingSession.sessionId);
-        updateSessions(allDeviceSessions.filter(session => session.sessionId !== sessionResponse.sessionId), {
-          merge: false
-        });
-        onAuthStateChange?.(fullUser);
-        return fullUser;
       }
-      setActiveSessionId(sessionResponse.sessionId);
-      await saveActiveSessionId(sessionResponse.sessionId);
-      updateSessions(allDeviceSessions, {
-        merge: true
+      await switchSession(existingSession.sessionId);
+      updateSessions(allDeviceSessions.filter(session => session.sessionId !== sessionResponse.sessionId), {
+        merge: false
       });
+      onAuthStateChange?.(fullUser);
+      return fullUser;
     }
+    setActiveSessionId(sessionResponse.sessionId);
+    await saveActiveSessionId(sessionResponse.sessionId);
+    updateSessions(allDeviceSessions, {
+      merge: true
+    });
     await applyLanguagePreference(fullUser);
     loginSuccess(fullUser);
     onAuthStateChange?.(fullUser);
     return fullUser;
-  }, [applyLanguagePreference, logger, loginSuccess, onAuthStateChange, oxyServices, saveActiveSessionId, setActiveSessionId, switchSession, updateSessions, storage]);
+  }, [applyLanguagePreference, logger, loginSuccess, onAuthStateChange, oxyServices, saveActiveSessionId, setActiveSessionId, switchSession, updateSessions]);
 
   /**
    * Sign in with existing public key

package/lib/module/ui/context/hooks/useAuthOperations.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useRef","DeviceManager","fetchSessionsWithFallback","handleAuthError","isInvalidSessionError","SignatureService","isWebBrowser","clearActiveAuthuser","clearSsoBounceState","isErrorWithCodeOrStatus","error","LOGIN_ERROR_CODE","LOGOUT_ERROR_CODE","LOGOUT_ALL_ERROR_CODE","useAuthOperations","oxyServices","storage","sessions","activeSessionId","setActiveSessionId","updateSessions","saveActiveSessionId","clearSessionState","switchSession","applyLanguagePreference","onAuthStateChange","onError","loginSuccess","loginFailure","logoutStore","setAuthState","logger","sessionsRef","current","performSignIn","publicKey","deviceFingerprintObj","getDeviceFingerprint","deviceFingerprint","JSON","stringify","deviceInfo","getDeviceInfo","deviceName","getDefaultDeviceName","challenge","isOffline","challengeResponse","requestChallenge","errorMessage","Error","message","String","isNetworkError","includes","code","status","__DEV__","generateChallenge","signature","timestamp","signChallenge","fullUser","sessionResponse","Crypto","localSessionId","randomUUID","localDeviceId","expiresAt","Date","now","toISOString","id","username","privacySettings","sessionId","deviceId","user","offlineSession","lastActive","userId","isCurrent","merge","setItem","verifyChallenge","getUserBySession","allDeviceSessions","fallbackDeviceId","fallbackUserId","existingSession","find","session","toString","logoutSession","logoutError","filter","signIn","isLoading","defaultMessage","setAuthError","msg","logout","targetSessionId","sessionToLogout","targetSession","s","targetAuthuser","authuser","logoutSessionByAuthuser","filteredSessions","length","isInvalid","undefined","logoutAll","logoutAllSessionsViaCookie","logoutAllSessions"],"sourceRoot":"../../../../../src","sources":["ui/context/hooks/useAuthOperations.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useRef","DeviceManager","fetchSessionsWithFallback","handleAuthError","isInvalidSessionError","SignatureService","isWebBrowser","clearActiveAuthuser","clearSsoBounceState","LOGIN_ERROR_CODE","LOGOUT_ERROR_CODE","LOGOUT_ALL_ERROR_CODE","useAuthOperations","oxyServices","sessions","activeSessionId","setActiveSessionId","updateSessions","saveActiveSessionId","clearSessionState","switchSession","applyLanguagePreference","onAuthStateChange","onError","loginSuccess","loginFailure","logoutStore","setAuthState","logger","sessionsRef","current","performSignIn","publicKey","deviceFingerprintObj","getDeviceFingerprint","deviceFingerprint","JSON","stringify","deviceInfo","getDeviceInfo","deviceName","getDefaultDeviceName","challengeResponse","requestChallenge","challenge","signature","timestamp","signChallenge","fullUser","sessionResponse","verifyChallenge","getUserBySession","sessionId","allDeviceSessions","fallbackDeviceId","deviceId","fallbackUserId","id","error","__DEV__","existingSession","find","session","userId","toString","logoutSession","logoutError","filter","merge","signIn","isLoading","message","defaultMessage","code","setAuthError","msg","logout","targetSessionId","sessionToLogout","targetSession","s","targetAuthuser","authuser","logoutSessionByAuthuser","filteredSessions","length","isInvalid","status","undefined","logoutAll","Error","logoutAllSessionsViaCookie","logoutAllSessions"],"sourceRoot":"../../../../../src","sources":["ui/context/hooks/useAuthOperations.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,MAAM,QAAQ,OAAO;AAI3C,SAASC,aAAa,QAAQ,aAAa;AAC3C,SAASC,yBAAyB,QAAQ,+BAA4B;AACtE,SAASC,eAAe,EAAEC,qBAAqB,QAAQ,8BAA2B;AAGlF,SAASC,gBAAgB,QAAQ,aAAa;AAC9C,SAASC,YAAY,QAAQ,0BAAuB;AACpD,SAASC,mBAAmB,EAAEC,mBAAmB,QAAQ,+BAA4B;AA+BrF,MAAMC,gBAAgB,GAAG,aAAa;AACtC,MAAMC,iBAAiB,GAAG,cAAc;AACxC,MAAMC,qBAAqB,GAAG,kBAAkB;;AAEhD;AACA;AACA;AACA;AACA,OAAO,MAAMC,iBAAiB,GAAGA,CAAC;EAChCC,WAAW;EACXC,QAAQ;EACRC,eAAe;EACfC,kBAAkB;EAClBC,cAAc;EACdC,mBAAmB;EACnBC,iBAAiB;EACjBC,aAAa;EACbC,uBAAuB;EACvBC,iBAAiB;EACjBC,OAAO;EACPC,YAAY;EACZC,YAAY;EACZC,WAAW;EACXC,YAAY;EACZC;AACwB,CAAC,KAA8B;EACvD;EACA,MAAMC,WAAW,GAAG7B,MAAM,CAACc,QAAQ,CAAC;EACpCe,WAAW,CAACC,OAAO,GAAGhB,QAAQ;;EAE9B;AACF;AACA;EACE,MAAMiB,aAAa,GAAGhC,WAAW,CAC/B,MAAOiC,SAAiB,IAAoB;IAC1C,MAAMC,oBAAoB,GAAGhC,aAAa,CAACiC,oBAAoB,CAAC,CAAC;IACjE,MAAMC,iBAAiB,GAAGC,IAAI,CAACC,SAAS,CAACJ,oBAAoB,CAAC;IAC9D,MAAMK,UAAU,GAAG,MAAMrC,aAAa,CAACsC,aAAa,CAAC,CAAC;IACtD,MAAMC,UAAU,GAAGF,UAAU,CAACE,UAAU,IAAIvC,aAAa,CAACwC,oBAAoB,CAAC,CAAC;IAEhF,MAAMC,iBAAiB,GAAG,MAAM7B,WAAW,CAAC8B,gBAAgB,CAACX,SAAS,CAAC;IACvE,MAAMY,SAAS,GAAGF,iBAAiB,CAACE,SAAS;;IAE7C;IACA;IACA;;IAEA;IACA,MAAM;MAAEA,SAAS,EAAEC,SAAS;MAAEC;IAAU,CAAC,GAAG,MAAMzC,gBAAgB,CAAC0C,aAAa,CAACH,SAAS,CAAC;IAE3F,IAAII,QAAc;IAClB,IAAIC,eAAqC;;IAEzC;IACA;IACA;IACAA,eAAe,GAAG,MAAMpC,WAAW,CAACqC,eAAe,CACjDlB,SAAS,EACTY,SAAS,EACTC,SAAS,EACTC,SAAS,EACTN,UAAU,EACVL,iBACF,CAAC;;IAED;IACAa,QAAQ,GAAG,MAAMnC,WAAW,CAACsC,gBAAgB,CAACF,eAAe,CAACG,SAAS,CAAC;;IAExE;IACA,IAAIC,iBAAkC,GAAG,EAAE;IAC3C,IAAI;MACFA,iBAAiB,GAAG,MAAMnD,yBAAyB,CAACW,WAAW,EAAEoC,eAAe,CAACG,SAAS,EAAE;QAC1FE,gBAAgB,EAAEL,eAAe,CAACM,QAAQ;QAC1CC,cAAc,EAAER,QAAQ,CAACS,EAAE;QAC3B7B;MACF,CAAC,CAAC;IACJ,CAAC,CAAC,OAAO8B,KAAK,EAAE;MACd,IAAIC,OAAO,IAAI/B,MAAM,EAAE;QACrBA,MAAM,CAAC,6CAA6C,EAAE8B,KAAK,CAAC;MAC9D;IACF;;IAEA;IACA,MAAME,eAAe,GAAGP,iBAAiB,CAACQ,IAAI,CAC3CC,OAAO,IACNA,OAAO,CAACC,MAAM,EAAEC,QAAQ,CAAC,CAAC,KAAKhB,QAAQ,CAACS,EAAE,EAAEO,QAAQ,CAAC,CAAC,IACtDF,OAAO,CAACV,SAAS,KAAKH,eAAe,CAACG,SAC1C,CAAC;IAED,IAAIQ,eAAe,EAAE;MACnB;MACA,IAAI;QACF,MAAM/C,WAAW,CAACoD,aAAa,CAAChB,eAAe,CAACG,SAAS,EAAEH,eAAe,CAACG,SAAS,CAAC;MACvF,CAAC,CAAC,OAAOc,WAAW,EAAE;QACpB;QACA,IAAIP,OAAO,IAAI/B,MAAM,EAAE;UACrBA,MAAM,CAAC,4DAA4D,EAAEsC,WAAW,CAAC;QACnF;MACF;MACA,MAAM9C,aAAa,CAACwC,eAAe,CAACR,SAAS,CAAC;MAC9CnC,cAAc,CACZoC,iBAAiB,CAACc,MAAM,CAAEL,OAAO,IAAKA,OAAO,CAACV,SAAS,KAAKH,eAAe,CAACG,SAAS,CAAC,EACtF;QAAEgB,KAAK,EAAE;MAAM,CACjB,CAAC;MACD9C,iBAAiB,GAAG0B,QAAQ,CAAC;MAC7B,OAAOA,QAAQ;IACjB;IAEAhC,kBAAkB,CAACiC,eAAe,CAACG,SAAS,CAAC;IAC7C,MAAMlC,mBAAmB,CAAC+B,eAAe,CAACG,SAAS,CAAC;IACpDnC,cAAc,CAACoC,iBAAiB,EAAE;MAAEe,KAAK,EAAE;IAAK,CAAC,CAAC;IAElD,MAAM/C,uBAAuB,CAAC2B,QAAQ,CAAC;IACvCxB,YAAY,CAACwB,QAAQ,CAAC;IACtB1B,iBAAiB,GAAG0B,QAAQ,CAAC;IAE7B,OAAOA,QAAQ;EACjB,CAAC,EACD,CACE3B,uBAAuB,EACvBO,MAAM,EACNJ,YAAY,EACZF,iBAAiB,EACjBT,WAAW,EACXK,mBAAmB,EACnBF,kBAAkB,EAClBI,aAAa,EACbH,cAAc,CAElB,CAAC;;EAED;AACF;AACA;EACE,MAAMoD,MAAM,GAAGtE,WAAW,CACxB,OAAOiC,SAAiB,EAAEQ,UAAmB,KAAoB;IAC/Db,YAAY,CAAC;MAAE2C,SAAS,EAAE,IAAI;MAAEZ,KAAK,EAAE;IAAK,CAAC,CAAC;IAE9C,IAAI;MACF,OAAO,MAAM3B,aAAa,CAACC,SAAS,CAAC;IACvC,CAAC,CAAC,OAAO0B,KAAK,EAAE;MACd,MAAMa,OAAO,GAAGpE,eAAe,CAACuD,KAAK,EAAE;QACrCc,cAAc,EAAE,gBAAgB;QAChCC,IAAI,EAAEhE,gBAAgB;QACtBc,OAAO;QACPmD,YAAY,EAAGC,GAAW,IAAKhD,YAAY,CAAC;UAAE+B,KAAK,EAAEiB;QAAI,CAAC,CAAC;QAC3D/C;MACF,CAAC,CAAC;MACFH,YAAY,CAAC8C,OAAO,CAAC;MACrB,MAAMb,KAAK;IACb,CAAC,SAAS;MACR/B,YAAY,CAAC;QAAE2C,SAAS,EAAE;MAAM,CAAC,CAAC;IACpC;EACF,CAAC,EACD,CAAC3C,YAAY,EAAEI,aAAa,EAAEN,YAAY,EAAEF,OAAO,EAAEK,MAAM,CAC7D,CAAC;;EAED;AACF;AACA;EACE,MAAMgD,MAAM,GAAG7E,WAAW,CACxB,MAAO8E,eAAwB,IAAoB;IACjD,IAAI,CAAC9D,eAAe,EAAE;IAEtB,IAAI;MACF,MAAM+D,eAAe,GAAGD,eAAe,IAAI9D,eAAe;MAC1D;MACA;MACA;MACA,MAAMgE,aAAa,GAAGlD,WAAW,CAACC,OAAO,CAAC+B,IAAI,CAAEmB,CAAC,IAAKA,CAAC,CAAC5B,SAAS,KAAK0B,eAAe,CAAC;MACtF,MAAMG,cAAc,GAAGF,aAAa,EAAEG,QAAQ;MAC9C,IAAI5E,YAAY,CAAC,CAAC,IAAI,OAAO2E,cAAc,KAAK,QAAQ,EAAE;QACxD,MAAMpE,WAAW,CAACsE,uBAAuB,CAACF,cAAc,CAAC;MAC3D,CAAC,MAAM;QACL,MAAMpE,WAAW,CAACoD,aAAa,CAAClD,eAAe,EAAE+D,eAAe,CAAC;MACnE;MAEA,MAAMM,gBAAgB,GAAGvD,WAAW,CAACC,OAAO,CAACqC,MAAM,CAAEL,OAAO,IAAKA,OAAO,CAACV,SAAS,KAAK0B,eAAe,CAAC;MACvG7D,cAAc,CAACmE,gBAAgB,EAAE;QAAEhB,KAAK,EAAE;MAAM,CAAC,CAAC;MAElD,IAAIU,eAAe,KAAK/D,eAAe,EAAE;QACvC,IAAIqE,gBAAgB,CAACC,MAAM,GAAG,CAAC,EAAE;UAC/B,MAAMjE,aAAa,CAACgE,gBAAgB,CAAC,CAAC,CAAC,CAAChC,SAAS,CAAC;QACpD,CAAC,MAAM;UACL;UACA;UACA5C,mBAAmB,CAAC,CAAC;UACrB,MAAMW,iBAAiB,CAAC,CAAC;UACzB;QACF;MACF;IACF,CAAC,CAAC,OAAOuC,KAAK,EAAE;MACd,MAAM4B,SAAS,GAAGlF,qBAAqB,CAACsD,KAAK,CAAC;MAE9C,IAAI4B,SAAS,IAAIT,eAAe,KAAK9D,eAAe,EAAE;QACpD;QACAP,mBAAmB,CAAC,CAAC;QACrB,MAAMW,iBAAiB,CAAC,CAAC;QACzB;MACF;MAEAhB,eAAe,CAACuD,KAAK,EAAE;QACrBc,cAAc,EAAE,eAAe;QAC/BC,IAAI,EAAE/D,iBAAiB;QACvBa,OAAO;QACPmD,YAAY,EAAGC,GAAW,IAAKhD,YAAY,CAAC;UAAE+B,KAAK,EAAEiB;QAAI,CAAC,CAAC;QAC3D/C,MAAM;QACN2D,MAAM,EAAED,SAAS,GAAG,GAAG,GAAGE;MAC5B,CAAC,CAAC;IACJ;EACF,CAAC,EACD,CACEzE,eAAe,EACfI,iBAAiB,EACjBS,MAAM,EACNL,OAAO,EACPV,WAAW,EACXc,YAAY,EACZP,aAAa,EACbH,cAAc,CAElB,CAAC;;EAED;AACF;AACA;EACE,MAAMwE,SAAS,GAAG1F,WAAW,CAAC,YAA2B;IACvD,IAAI,CAACgB,eAAe,EAAE;MACpB,MAAM2C,KAAK,GAAG,IAAIgC,KAAK,CAAC,yBAAyB,CAAC;MAClD/D,YAAY,CAAC;QAAE+B,KAAK,EAAEA,KAAK,CAACa;MAAQ,CAAC,CAAC;MACtChD,OAAO,GAAG;QAAEgD,OAAO,EAAEb,KAAK,CAACa,OAAO;QAAEE,IAAI,EAAE9D,qBAAqB;QAAE4E,MAAM,EAAE;MAAI,CAAC,CAAC;MAC/E,MAAM7B,KAAK;IACb;IAEA,IAAI;MACF;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA;MACA,IAAIpD,YAAY,CAAC,CAAC,EAAE;QAClB,MAAMO,WAAW,CAAC8E,0BAA0B,CAAC,CAAC;QAC9CpF,mBAAmB,CAAC,CAAC;MACvB,CAAC,MAAM;QACL,MAAMM,WAAW,CAAC+E,iBAAiB,CAAC7E,eAAe,CAAC;MACtD;MACA;MACA;MACAP,mBAAmB,CAAC,CAAC;MACrB,MAAMW,iBAAiB,CAAC,CAAC;IAC3B,CAAC,CAAC,OAAOuC,KAAK,EAAE;MACdvD,eAAe,CAACuD,KAAK,EAAE;QACrBc,cAAc,EAAE,mBAAmB;QACnCC,IAAI,EAAE9D,qBAAqB;QAC3BY,OAAO;QACPmD,YAAY,EAAGC,GAAW,IAAKhD,YAAY,CAAC;UAAE+B,KAAK,EAAEiB;QAAI,CAAC,CAAC;QAC3D/C;MACF,CAAC,CAAC;MACF,MAAM8B,KAAK,YAAYgC,KAAK,GAAGhC,KAAK,GAAG,IAAIgC,KAAK,CAAC,mBAAmB,CAAC;IACvE;EACF,CAAC,EAAE,CAAC3E,eAAe,EAAEI,iBAAiB,EAAES,MAAM,EAAEL,OAAO,EAAEV,WAAW,EAAEc,YAAY,CAAC,CAAC;EAEpF,OAAO;IACL0C,MAAM;IACNO,MAAM;IACNa;EACF,CAAC;AACH,CAAC","ignoreList":[]}

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

@@ -36,17 +36,19 @@ export const useUpdateProfile = () => {
 
       // Optimistically update
       if (previousUser) {
-        queryClient.setQueryData(queryKeys.accounts.current(), {
+        const optimisticUser = {
           ...previousUser,
-          ...updates
-        });
+          ...updates,
+          name: updates.name ? {
+            ...previousUser.name,
+            ...updates.name
+          } : previousUser.name
+        };
+        queryClient.setQueryData(queryKeys.accounts.current(), optimisticUser);
 
         // Also update profile query if sessionId is available
         if (activeSessionId) {
-          queryClient.setQueryData(queryKeys.users.profile(activeSessionId), {
-            ...previousUser,
-            ...updates
-          });
+          queryClient.setQueryData(queryKeys.users.profile(activeSessionId), optimisticUser);
         }
       }
       return {

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

@@ -1 +1 @@
-{"version":3,"names":["useMutation","useQueryClient","authenticatedApiCall","queryKeys","invalidateAccountQueries","invalidateConnectedAppsQueries","invalidateUserQueries","invalidateSessionQueries","mutationKeys","useOxy","toast","refreshAvatarInStore","useAuthStore","useUpdateProfile","oxyServices","activeSessionId","user","queryClient","mutationKey","account","updateProfile","mutationFn","updates","onMutate","cancelQueries","queryKey","accounts","current","previousUser","getQueryData","setQueryData","users","profile","onError","error","context","changedKeys","Object","keys","partialRollback","reduce","acc","key","currentProfile","Error","message","onSuccess","data","getState","setUser","avatar","useUploadAvatar","uploadAvatar","file","uploadResult","assetUpload","fileId","id","optimisticUser","uri","_file","previousAvatar","success","useUpdateAccountSettings","mutation","updateSettings","currentUser","userId","updatedPrivacy","updatePrivacySettings","privacySettings","settings","previousPrivacy","partialPrivacyRollback","onSettled","invalidateQueries","mutate","mutateAsync","useUpdatePrivacySettings","targetUserId","privacy","previousPrivacySettings","length","currentPrivacy","incoming","requested","previous","updatedUser","useUpdateNotificationPreferences","updateNotificationPreferences","preferences","notificationPreferences","_preferences","useUpdateUserPreferences","updateUserPreferences","userPreferences","useRevokeAuthorizedApp","connectedApps","revoke","origin","revokeAuthorizedApp","useUploadFile","uploadFile","visibility","metadata","onProgress"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/useAccountMutations.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useMutation","useQueryClient","authenticatedApiCall","queryKeys","invalidateAccountQueries","invalidateConnectedAppsQueries","invalidateUserQueries","invalidateSessionQueries","mutationKeys","useOxy","toast","refreshAvatarInStore","useAuthStore","useUpdateProfile","oxyServices","activeSessionId","user","queryClient","mutationKey","account","updateProfile","mutationFn","updates","onMutate","cancelQueries","queryKey","accounts","current","previousUser","getQueryData","optimisticUser","name","setQueryData","users","profile","onError","error","context","changedKeys","Object","keys","partialRollback","reduce","acc","key","currentProfile","Error","message","onSuccess","data","getState","setUser","avatar","useUploadAvatar","uploadAvatar","file","uploadResult","assetUpload","fileId","id","uri","_file","previousAvatar","success","useUpdateAccountSettings","mutation","updateSettings","currentUser","userId","updatedPrivacy","updatePrivacySettings","privacySettings","settings","previousPrivacy","partialPrivacyRollback","onSettled","invalidateQueries","mutate","mutateAsync","useUpdatePrivacySettings","targetUserId","privacy","previousPrivacySettings","length","currentPrivacy","incoming","requested","previous","updatedUser","useUpdateNotificationPreferences","updateNotificationPreferences","preferences","notificationPreferences","_preferences","useUpdateUserPreferences","updateUserPreferences","userPreferences","useRevokeAuthorizedApp","connectedApps","revoke","origin","revokeAuthorizedApp","useUploadFile","uploadFile","visibility","metadata","onProgress"],"sourceRoot":"../../../../../src","sources":["ui/hooks/mutations/useAccountMutations.ts"],"mappings":"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","ignoreList":[]}

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

@@ -198,19 +198,16 @@ export function useDeviceAccounts() {
     let built;
     if (fromSharedApex) {
       // Shared apex path: every entry carries a real per-account user.
-      built = sharedAccounts.map(entry => {
-        // `entry.user` is non-null on the refresh-all path; the core
-        // mixin skips entries without a valid user. The fallback below
-        // keeps rendering defensive if a server response is incomplete.
-        const accountUser = entry.user ?? {
-          id: '',
-          username: ''
-        };
+      built = sharedAccounts.flatMap(entry => {
+        if (!entry.user) {
+          return [];
+        }
+        const accountUser = entry.user;
         const displayName = getAccountDisplayName(accountUser, locale);
         const handle = getAccountFallbackHandle(accountUser);
-        const email = entry.user?.email ?? null;
+        const email = entry.user.email ?? null;
         const secondaryHandle = handle ? `@${handle}` : null;
-        return {
+        return [{
           sessionId: entry.sessionId,
           authuser: entry.authuser,
           // Provisional; finalised by `markCurrentAccount` below so the
@@ -220,38 +217,36 @@ export function useDeviceAccounts() {
           // Real email, or null (NEVER synthesized). The UI uses the
           // `@handle` line only when email is genuinely absent.
           email: email ?? secondaryHandle,
-          avatarUrl: resolveAvatarUrl(entry.user?.avatar),
-          color: entry.user?.color ?? null,
+          avatarUrl: resolveAvatarUrl(entry.user.avatar),
+          color: entry.user.color ?? null,
           user: accountUser
-        };
+        }];
       });
     } else {
       // Local fallback path: build from the SDK's multi-session store. The
       // active session row gets the full loaded `user`; inactive fallback
       // rows carry only what the `ClientSession` exposes (no synthesized
       // identity — they show the active user's data only when active).
-      built = (sessions ?? []).map(session => {
+      built = (sessions ?? []).flatMap(session => {
         const isCurrent = session.sessionId === activeSessionId;
-        const accountUser = isCurrent && user ? user : {
-          id: session.userId ?? '',
-          username: ''
-        };
+        if (!isCurrent || !user) {
+          return [];
+        }
+        const accountUser = user;
         const displayName = getAccountDisplayName(accountUser, locale);
         const handle = getAccountFallbackHandle(accountUser);
-        const email = isCurrent && user?.email ? user.email : null;
+        const email = user.email ?? null;
         const secondaryHandle = handle ? `@${handle}` : null;
-        const avatar = isCurrent && user ? user.avatar : undefined;
-        const color = isCurrent && user?.color ? user.color : null;
-        return {
+        return [{
           sessionId: session.sessionId,
           authuser: session.authuser,
           isCurrent,
           displayName,
           email: email ?? secondaryHandle,
-          avatarUrl: resolveAvatarUrl(avatar),
-          color,
+          avatarUrl: resolveAvatarUrl(user.avatar),
+          color: user.color ?? null,
           user: accountUser
-        };
+        }];
       });
     }
 

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

@@ -1 +1 @@
-{"version":3,"names":["useMemo","useQuery","getAccountDisplayName","getAccountFallbackHandle","useOxy","useI18n","queryKeys","markCurrentAccount","accounts","activeSessionId","liveUserId","isAuthenticated","bySession","map","account","isCurrent","Boolean","sessionId","some","matched","byUser","user","id","length","useDeviceAccounts","oxyServices","sessions","locale","baseURL","getBaseURL","query","queryKey","all","queryFn","refreshAllSessions","enabled","staleTime","Number","POSITIVE_INFINITY","gcTime","refetchOnWindowFocus","refetchOnReconnect","refetchOnMount","retry","sharedAccounts","data","fromSharedApex","resolveAvatarUrl","avatar","getFileDownloadUrl","undefined","liveUserRow","displayName","handle","secondaryHandle","authuser","email","avatarUrl","color","built","entry","accountUser","username","session","userId","flagged","isLoading","currentSessionId"],"sourceRoot":"../../../../src","sources":["ui/hooks/useDeviceAccounts.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useMemo","useQuery","getAccountDisplayName","getAccountFallbackHandle","useOxy","useI18n","queryKeys","markCurrentAccount","accounts","activeSessionId","liveUserId","isAuthenticated","bySession","map","account","isCurrent","Boolean","sessionId","some","matched","byUser","user","id","length","useDeviceAccounts","oxyServices","sessions","locale","baseURL","getBaseURL","query","queryKey","all","queryFn","refreshAllSessions","enabled","staleTime","Number","POSITIVE_INFINITY","gcTime","refetchOnWindowFocus","refetchOnReconnect","refetchOnMount","retry","sharedAccounts","data","fromSharedApex","resolveAvatarUrl","avatar","getFileDownloadUrl","undefined","liveUserRow","displayName","handle","secondaryHandle","authuser","email","avatarUrl","color","built","flatMap","entry","accountUser","session","flagged","isLoading","currentSessionId"],"sourceRoot":"../../../../src","sources":["ui/hooks/useDeviceAccounts.ts"],"mappings":"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","ignoreList":[]}

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

@@ -1,17 +1,20 @@
 "use strict";
 
 import { useCallback } from 'react';
-import { useI18n } from "./useI18n.js";
 import { useUpdateProfile } from "./mutations/useAccountMutations.js";
 import { useAuthStore } from "../stores/authStore.js";
+function isProfileLocationArray(value) {
+  return Array.isArray(value) && value.every(item => typeof item === 'object' && item !== null && 'name' in item);
+}
+function isProfileLinkMetadataArray(value) {
+  return Array.isArray(value) && value.every(item => typeof item === 'object' && item !== null && 'url' in item);
+}
+
 /**
  * Hook for managing profile editing operations
  * Provides functions to update profile fields and handle saving
  */
 export const useProfileEditing = () => {
-  const {
-    t
-  } = useI18n();
   const updateProfileMutation = useUpdateProfile();
 
   /**
@@ -46,11 +49,11 @@ export const useProfileEditing = () => {
     }
 
     // Handle name field
-    if (updates.displayName !== undefined || updates.lastName !== undefined) {
+    if (updates.firstName !== undefined || updates.lastName !== undefined) {
       const currentUser = useAuthStore.getState().user;
       const currentName = currentUser?.name;
       updateData.name = {
-        first: updates.displayName ?? (typeof currentName === 'object' ? currentName?.first : '') ?? '',
+        first: updates.firstName ?? (typeof currentName === 'object' ? currentName?.first : '') ?? '',
         last: updates.lastName ?? (typeof currentName === 'object' ? currentName?.last : '') ?? ''
       };
     }
@@ -61,7 +64,7 @@ export const useProfileEditing = () => {
       // Error toast is handled by the mutation
       return false;
     }
-  }, [updateProfileMutation, t]);
+  }, [updateProfileMutation]);
 
   /**
    * Update a single profile field
@@ -69,24 +72,30 @@ export const useProfileEditing = () => {
   const updateField = useCallback(async (field, value) => {
     const updates = {};
     switch (field) {
-      case 'displayName':
-        updates.displayName = value;
+      case 'firstName':
+        if (typeof value !== 'string') return false;
+        updates.firstName = value;
         break;
       case 'username':
+        if (typeof value !== 'string') return false;
         updates.username = value;
         break;
       case 'email':
+        if (typeof value !== 'string') return false;
         updates.email = value;
         break;
       case 'bio':
+        if (typeof value !== 'string') return false;
         updates.bio = value;
         break;
       case 'location':
+        if (!isProfileLocationArray(value)) return false;
         updates.locations = value;
         break;
       case 'links':
+        if (!isProfileLinkMetadataArray(value)) return false;
         updates.linksMetadata = value;
-        updates.links = value.map(link => link.url || link);
+        updates.links = value.map(link => link.url);
         break;
       default:
         return false;

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

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useI18n","useUpdateProfile","useAuthStore","useProfileEditing","t","updateProfileMutation","saveProfile","updates","updateData","username","undefined","email","bio","location","locations","length","name","links","linksMetadata","avatar","displayName","lastName","currentUser","getState","user","currentName","first","last","mutateAsync","error","updateField","field","value","map","link","url","isSaving","isPending"],"sourceRoot":"../../../../src","sources":["ui/hooks/useProfileEditing.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useUpdateProfile","useAuthStore","isProfileLocationArray","value","Array","isArray","every","item","isProfileLinkMetadataArray","useProfileEditing","updateProfileMutation","saveProfile","updates","updateData","username","undefined","email","bio","location","locations","length","name","links","linksMetadata","avatar","firstName","lastName","currentUser","getState","user","currentName","first","last","mutateAsync","error","updateField","field","map","link","url","isSaving","isPending"],"sourceRoot":"../../../../src","sources":["ui/hooks/useProfileEditing.ts"],"mappings":"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","ignoreList":[]}

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

@@ -10,7 +10,7 @@ import { SettingsIcon } from "../components/SettingsIcon.js";
 import { useTheme } from '@oxyhq/bloom/theme';
 import { useColorScheme } from "../hooks/useColorScheme.js";
 import { Colors } from "../constants/theme.js";
-import { normalizeColorScheme } from "../utils/themeUtils.js";
+import { normalizeColorScheme } from '@oxyhq/core';
 import { useOxy } from "../context/OxyContext.js";
 import { useI18n } from "../hooks/useI18n.js";
 import { SettingsListGroup, SettingsListItem } from '@oxyhq/bloom/settings-list';