@oxyhq/services 13.2.0 → 14.0.0

package/lib/module/ui/session/projectSessionState.js

@@ -0,0 +1,79 @@
+"use strict";
+
+/**
+ * Pure projection helpers: `DeviceSessionState` (the device-scoped
+ * multi-account session-sync state produced by `@oxyhq/core`'s
+ * `SessionClient`) -> the shapes `OxyContext` renders today
+ * (`ClientSession[]`, an active session id, an active `User`).
+ *
+ * No I/O. The caller fetches profiles via
+ * `oxyServices.getUsersByIds(accountIdsOf(state))` and builds `usersById`
+ * from the result before calling `deviceStateToClientSessions` /
+ * `activeUserOf`.
+ */
+
+/**
+ * Maps every `SessionAccount` in `state.accounts` to a `ClientSession`.
+ *
+ * `DeviceSessionState` carries no per-account `expiresAt` / `lastActive` —
+ * both are set to `state.updatedAt` (converted to an ISO-8601 string; the
+ * wire value is an epoch-ms number) as a provisional value. Fase 3-B
+ * rewrites `ClientSession` to make `expiresAt`/`lastActive` optional (they
+ * are not derivable from `DeviceSessionState`).
+ *
+ * `usersById` is accepted for signature symmetry with `activeUserOf` even
+ * though `ClientSession` only stores `userId` — a session is still
+ * projected for an account whose id is absent from `usersById` (no
+ * placeholder user is fabricated).
+ */
+export function deviceStateToClientSessions(state, usersById) {
+  const provisionalTimestamp = new Date(state.updatedAt).toISOString();
+  return state.accounts.map(account => ({
+    sessionId: account.sessionId,
+    deviceId: state.deviceId,
+    // provisional: Fase 3-B rewrites ClientSession to make expiresAt/lastActive
+    // optional (they are not in DeviceSessionState)
+    expiresAt: provisionalTimestamp,
+    lastActive: provisionalTimestamp,
+    userId: account.accountId,
+    isCurrent: account.accountId === state.activeAccountId,
+    authuser: account.authuser
+  }));
+}
+
+/**
+ * The active account's `sessionId`, or `null` when there is no state or no
+ * active account is set.
+ */
+export function activeSessionIdOf(state) {
+  if (state === null || state.activeAccountId === null) {
+    return null;
+  }
+  const activeAccountId = state.activeAccountId;
+  const activeAccount = state.accounts.find(account => account.accountId === activeAccountId);
+  return activeAccount?.sessionId ?? null;
+}
+
+/**
+ * The active account's `User`, resolved from `usersById`. `null` when there
+ * is no state, no active account is set, or the active account id is absent
+ * from `usersById`.
+ */
+export function activeUserOf(state, usersById) {
+  if (state === null || state.activeAccountId === null) {
+    return null;
+  }
+  return usersById.get(state.activeAccountId) ?? null;
+}
+
+/**
+ * All account ids in `state`, suitable for an `oxyServices.getUsersByIds(...)`
+ * fetch. `[]` for `null` state.
+ */
+export function accountIdsOf(state) {
+  if (state === null) {
+    return [];
+  }
+  return state.accounts.map(account => account.accountId);
+}
+//# sourceMappingURL=projectSessionState.js.map

package/lib/module/ui/session/projectSessionState.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["deviceStateToClientSessions","state","usersById","provisionalTimestamp","Date","updatedAt","toISOString","accounts","map","account","sessionId","deviceId","expiresAt","lastActive","userId","accountId","isCurrent","activeAccountId","authuser","activeSessionIdOf","activeAccount","find","activeUserOf","get","accountIdsOf"],"sourceRoot":"../../../../src","sources":["ui/session/projectSessionState.ts"],"mappings":";;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,2BAA2BA,CACzCC,KAAyB,EACzBC,SAA4B,EACX;EACjB,MAAMC,oBAAoB,GAAG,IAAIC,IAAI,CAACH,KAAK,CAACI,SAAS,CAAC,CAACC,WAAW,CAAC,CAAC;EACpE,OAAOL,KAAK,CAACM,QAAQ,CAACC,GAAG,CAAEC,OAAO,KAAM;IACtCC,SAAS,EAAED,OAAO,CAACC,SAAS;IAC5BC,QAAQ,EAAEV,KAAK,CAACU,QAAQ;IACxB;IACA;IACAC,SAAS,EAAET,oBAAoB;IAC/BU,UAAU,EAAEV,oBAAoB;IAChCW,MAAM,EAAEL,OAAO,CAACM,SAAS;IACzBC,SAAS,EAAEP,OAAO,CAACM,SAAS,KAAKd,KAAK,CAACgB,eAAe;IACtDC,QAAQ,EAAET,OAAO,CAACS;EACpB,CAAC,CAAC,CAAC;AACL;;AAEA;AACA;AACA;AACA;AACA,OAAO,SAASC,iBAAiBA,CAAClB,KAAgC,EAAiB;EACjF,IAAIA,KAAK,KAAK,IAAI,IAAIA,KAAK,CAACgB,eAAe,KAAK,IAAI,EAAE;IACpD,OAAO,IAAI;EACb;EACA,MAAMA,eAAe,GAAGhB,KAAK,CAACgB,eAAe;EAC7C,MAAMG,aAAa,GAAGnB,KAAK,CAACM,QAAQ,CAACc,IAAI,CAAEZ,OAAO,IAAKA,OAAO,CAACM,SAAS,KAAKE,eAAe,CAAC;EAC7F,OAAOG,aAAa,EAAEV,SAAS,IAAI,IAAI;AACzC;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASY,YAAYA,CAC1BrB,KAAgC,EAChCC,SAA4B,EACf;EACb,IAAID,KAAK,KAAK,IAAI,IAAIA,KAAK,CAACgB,eAAe,KAAK,IAAI,EAAE;IACpD,OAAO,IAAI;EACb;EACA,OAAOf,SAAS,CAACqB,GAAG,CAACtB,KAAK,CAACgB,eAAe,CAAC,IAAI,IAAI;AACrD;;AAEA;AACA;AACA;AACA;AACA,OAAO,SAASO,YAAYA,CAACvB,KAAgC,EAAY;EACvE,IAAIA,KAAK,KAAK,IAAI,EAAE;IAClB,OAAO,EAAE;EACX;EACA,OAAOA,KAAK,CAACM,QAAQ,CAACC,GAAG,CAAEC,OAAO,IAAKA,OAAO,CAACM,SAAS,CAAC;AAC3D","ignoreList":[]}

package/lib/module/ui/session/sessionClientHost.js

@@ -0,0 +1,26 @@
+"use strict";
+
+/**
+ * Thin `SessionClientHost` adapter over an `OxyServices` instance.
+ *
+ * `SessionClient` (in `@oxyhq/core`) is host-agnostic: it only needs a REST +
+ * token surface. `OxyServices` already exposes all of that except
+ * `getCurrentAccountId`, which has no direct equivalent — the adapter holds a
+ * mutable ref set by the caller (`OxyContext`, in Fase 3-B) via
+ * `setCurrentAccountId`.
+ */
+export function createSessionClientHost(oxyServices) {
+  let currentAccountId = null;
+  return {
+    makeRequest: (method, url, data, options) => oxyServices.makeRequest(method, url, data, options),
+    getBaseURL: () => oxyServices.getBaseURL(),
+    getAccessToken: () => oxyServices.getAccessToken(),
+    onTokensChanged: listener => oxyServices.onTokensChanged(listener),
+    setTokens: accessToken => oxyServices.setTokens(accessToken),
+    getCurrentAccountId: () => currentAccountId,
+    setCurrentAccountId: id => {
+      currentAccountId = id;
+    }
+  };
+}
+//# sourceMappingURL=sessionClientHost.js.map

package/lib/module/ui/session/sessionClientHost.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createSessionClientHost","oxyServices","currentAccountId","makeRequest","method","url","data","options","getBaseURL","getAccessToken","onTokensChanged","listener","setTokens","accessToken","getCurrentAccountId","setCurrentAccountId","id"],"sourceRoot":"../../../../src","sources":["ui/session/sessionClientHost.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,uBAAuBA,CACrCC,WAAwB,EAC8C;EACtE,IAAIC,gBAA+B,GAAG,IAAI;EAC1C,OAAO;IACLC,WAAW,EAAEA,CAACC,MAAM,EAAEC,GAAG,EAAEC,IAAI,EAAEC,OAAO,KAAKN,WAAW,CAACE,WAAW,CAACC,MAAM,EAAEC,GAAG,EAAEC,IAAI,EAAEC,OAAO,CAAC;IAChGC,UAAU,EAAEA,CAAA,KAAMP,WAAW,CAACO,UAAU,CAAC,CAAC;IAC1CC,cAAc,EAAEA,CAAA,KAAMR,WAAW,CAACQ,cAAc,CAAC,CAAC;IAClDC,eAAe,EAAGC,QAAQ,IAAKV,WAAW,CAACS,eAAe,CAACC,QAAQ,CAAC;IACpEC,SAAS,EAAGC,WAAW,IAAKZ,WAAW,CAACW,SAAS,CAACC,WAAW,CAAC;IAC9DC,mBAAmB,EAAEA,CAAA,KAAMZ,gBAAgB;IAC3Ca,mBAAmB,EAAGC,EAAE,IAAK;MAC3Bd,gBAAgB,GAAGc,EAAE;IACvB;EACF,CAAC;AACH","ignoreList":[]}

package/lib/module/ui/session/tokenTransport.js

@@ -0,0 +1,74 @@
+"use strict";
+
+import { logger } from '@oxyhq/core';
+import { isWebBrowser } from "../hooks/useWebSSO.js";
+
+/**
+ * Platform `TokenTransport` for `SessionClient`: mints an access token when
+ * none is currently held, reusing the SAME primitives `OxyContext`'s cold
+ * boot already relies on (never re-implemented here):
+ *
+ * - web: `oxyServices.silentSignIn()` (per-apex `/auth/silent` iframe).
+ * - native: `oxyServices.signInWithSharedIdentity()` (app-group keychain).
+ *
+ * Both primitives plant the token internally on success (the "Sign-In Token
+ * Planting" rule) — `ensureActiveToken` never calls `setTokens` itself.
+ *
+ * `ensureActiveToken` treats a PRESENT token as sufficient in this phase; it
+ * does not decode/match the token's subject against `state.activeAccountId`
+ * (that refinement is Fase 3-B). Account switching itself is server-driven
+ * via the `activeToken` carried in the sync envelope — this transport is
+ * only the fallback used when the envelope carried no token.
+ *
+ * A failed mint is logged and swallowed: it must never throw out of
+ * `ensureActiveToken`, since that would crash the caller (the SessionClient
+ * socket handler in Fase 3-B).
+ */
+export function createTokenTransport(oxyServices) {
+  // Coalesces concurrent mints: `SessionClient.applyState` can fire
+  // `ensureActiveToken` on rapid successive state pushes; a second call while a
+  // mint is already in flight must reuse it, not spawn a second silent iframe /
+  // shared-key challenge round-trip.
+  let inFlightMint = null;
+  return {
+    async ensureActiveToken(state) {
+      // Read the current token defensively: it is an in-memory getter that
+      // should never throw, but the documented contract is that this method
+      // never throws out — so a surprising throw is logged and treated as "no
+      // token" (fall through to mint) rather than rejecting the promise.
+      try {
+        if (oxyServices.getAccessToken()) {
+          return;
+        }
+      } catch (error) {
+        logger.warn('ensureActiveToken: getAccessToken threw', {
+          component: 'TokenTransport'
+        }, error);
+      }
+      if (inFlightMint) {
+        return inFlightMint;
+      }
+      inFlightMint = (async () => {
+        try {
+          const session = isWebBrowser() ? await oxyServices.silentSignIn() : await oxyServices.signInWithSharedIdentity();
+          if (!session) {
+            logger.debug('ensureActiveToken: platform mint returned no session', {
+              component: 'TokenTransport',
+              deviceId: state.deviceId
+            });
+          }
+        } catch (error) {
+          logger.warn('ensureActiveToken: mint failed', {
+            component: 'TokenTransport'
+          }, error);
+        }
+      })();
+      try {
+        await inFlightMint;
+      } finally {
+        inFlightMint = null;
+      }
+    }
+  };
+}
+//# sourceMappingURL=tokenTransport.js.map

package/lib/module/ui/session/tokenTransport.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["logger","isWebBrowser","createTokenTransport","oxyServices","inFlightMint","ensureActiveToken","state","getAccessToken","error","warn","component","session","silentSignIn","signInWithSharedIdentity","debug","deviceId"],"sourceRoot":"../../../../src","sources":["ui/session/tokenTransport.ts"],"mappings":";;AAEA,SAASA,MAAM,QAAQ,aAAa;AACpC,SAASC,YAAY,QAAQ,uBAAoB;;AAEjD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,oBAAoBA,CAACC,WAAwB,EAAkB;EAC7E;EACA;EACA;EACA;EACA,IAAIC,YAAkC,GAAG,IAAI;EAE7C,OAAO;IACL,MAAMC,iBAAiBA,CAACC,KAAyB,EAAiB;MAChE;MACA;MACA;MACA;MACA,IAAI;QACF,IAAIH,WAAW,CAACI,cAAc,CAAC,CAAC,EAAE;UAChC;QACF;MACF,CAAC,CAAC,OAAOC,KAAK,EAAE;QACdR,MAAM,CAACS,IAAI,CAAC,yCAAyC,EAAE;UAAEC,SAAS,EAAE;QAAiB,CAAC,EAAEF,KAAK,CAAC;MAChG;MAEA,IAAIJ,YAAY,EAAE;QAChB,OAAOA,YAAY;MACrB;MAEAA,YAAY,GAAG,CAAC,YAAY;QAC1B,IAAI;UACF,MAAMO,OAAO,GAAGV,YAAY,CAAC,CAAC,GAC1B,MAAME,WAAW,CAACS,YAAY,CAAC,CAAC,GAChC,MAAMT,WAAW,CAACU,wBAAwB,CAAC,CAAC;UAEhD,IAAI,CAACF,OAAO,EAAE;YACZX,MAAM,CAACc,KAAK,CAAC,sDAAsD,EAAE;cACnEJ,SAAS,EAAE,gBAAgB;cAC3BK,QAAQ,EAAET,KAAK,CAACS;YAClB,CAAC,CAAC;UACJ;QACF,CAAC,CAAC,OAAOP,KAAK,EAAE;UACdR,MAAM,CAACS,IAAI,CAAC,gCAAgC,EAAE;YAAEC,SAAS,EAAE;UAAiB,CAAC,EAAEF,KAAK,CAAC;QACvF;MACF,CAAC,EAAE,CAAC;MAEJ,IAAI;QACF,MAAMJ,YAAY;MACpB,CAAC,SAAS;QACRA,YAAY,GAAG,IAAI;MACrB;IACF;EACF,CAAC;AACH","ignoreList":[]}

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

@@ -1,19 +1,25 @@
 "use strict";
 
 /**
- * Web-only persistence of the active multi-account slot index.
+ * Web-only helpers around the retired `oxy_rt_${authuser}` multi-slot
+ * refresh-cookie scheme, PLUS the (unrelated, still load-bearing) deliberate
+ * sign-out / SSO-bounce gates.
  *
- * Google-style multi-account sign-in stores ONE refresh cookie per device
- * slot (`oxy_rt_${authuser}`, where `authuser` is an integer 0..N). The
- * server's `/auth/refresh-all` returns one entry per valid cookie; the
- * client must remember WHICH slot is currently active across reloads so
- * that the cold-boot snapshot resolves to the user's last selection
- * rather than always defaulting to slot 0.
- *
- * The persisted value is JUST the slot INDEX (a small integer) — never an
- * access token, refresh token, session id, or any user-identifying secret.
- * It is read by both `OxyContext` (cold-boot active selection) and the
- * session-management / auth-operations hooks (switch / logout).
+ * NOTE (session-sync cutover, Task 5): the device account SET is now
+ * server-authoritative via `SessionClient` (`@oxyhq/core`) — nothing in
+ * `@oxyhq/services` writes the persisted active-`authuser`-slot key anymore
+ * (`writeActiveAuthuser`/`clearActiveAuthuser` were deleted; their only
+ * callers were the deleted `establishDeviceRefreshSlot` sign-in registration
+ * and the deleted `switchToAccount`/`switchSession` slot bookkeeping).
+ * {@link readActiveAuthuser} is KEPT purely as an OPTIONAL restore hint:
+ * `OxyContext`'s `restoreStoredSession` cold-boot step reads it only to
+ * backfill `clientSession.authuser` for the active session when a legacy value
+ * happens to be present. It NO LONGER gates whether restore is attempted — the
+ * old guard that also required this marker made every web reload with a lapsed
+ * local bearer bail before any network validation (P0), and was replaced by a
+ * "bail only when there is nothing to restore" guard plus a valid-session
+ * election. Since nothing writes the key anymore, the backfill is dormant on
+ * fresh installs; it stays for legacy installs and costs nothing.
  *
  * Native (React Native) has no equivalent of these device-local cookies
  * and uses bearer-protected session ids directly, so these helpers no-op
@@ -22,23 +28,8 @@
 
 import { ssoAttemptedKey, ssoNoSessionKey, ssoGuardKey, ssoStateKey, ssoDestKey, ssoSignedOutKey, silentRestoreSuppressed } from '@oxyhq/core';
 const ACTIVE_AUTHUSER_KEY = 'oxy_active_authuser';
-
-/**
- * Safely resolve `window.localStorage`, returning `null` when it is
- * unavailable. The PROPERTY ACCESS itself (`window.localStorage`) can throw a
- * `SecurityError` synchronously in opaque-origin / sandboxed iframes or when
- * storage is disabled — even `typeof window.localStorage` evaluates the getter
- * and throws. Every read/write in this module routes through here so the getter
- * throw is caught once, at the source, and callers stay clean. Returns `null`
- * off-web and on any access failure (fail safe).
- */
-function getLocalStorage() {
-  if (typeof window === 'undefined') return null;
-  try {
-    return window.localStorage ?? null;
-  } catch {
-    return null;
-  }
+function hasLocalStorage() {
+  return typeof window !== 'undefined' && typeof window.localStorage !== 'undefined';
 }
 function getSessionStorage() {
   if (typeof window === 'undefined') return null;
@@ -57,12 +48,11 @@ function getSessionStorage() {
  * fall back to deterministic selection (lowest authuser).
  */
 export function readActiveAuthuser() {
-  const storage = getLocalStorage();
-  if (!storage) {
+  if (!hasLocalStorage()) {
     return null;
   }
   try {
-    const raw = storage.getItem(ACTIVE_AUTHUSER_KEY);
+    const raw = window.localStorage.getItem(ACTIVE_AUTHUSER_KEY);
     if (raw === null) return null;
     const parsed = Number.parseInt(raw, 10);
     if (!Number.isFinite(parsed) || parsed < 0) return null;
@@ -72,50 +62,18 @@ export function readActiveAuthuser() {
   }
 }
 
-/**
- * Persist the active `authuser` slot index. No-ops on native and on any
- * storage failure (e.g. Safari private mode). Callers MUST NOT depend on
- * this succeeding — it is best-effort UX persistence, not authoritative.
- */
-export function writeActiveAuthuser(authuser) {
-  if (!Number.isFinite(authuser) || authuser < 0) return;
-  const storage = getLocalStorage();
-  if (!storage) return;
-  try {
-    storage.setItem(ACTIVE_AUTHUSER_KEY, String(authuser));
-  } catch {
-    // Best-effort persistence; swallow QuotaExceededError / SecurityError.
-  }
-}
-
-/**
- * Clear the persisted active `authuser` slot index. Called on full sign-out
- * (logoutAll) so that the next cold boot doesn't try to resurrect a
- * cleared slot.
- */
-export function clearActiveAuthuser() {
-  const storage = getLocalStorage();
-  if (!storage) return;
-  try {
-    storage.removeItem(ACTIVE_AUTHUSER_KEY);
-  } catch {
-    // Best-effort.
-  }
-}
-
 /**
  * Mark this origin as DELIBERATELY signed out (durable `localStorage`, via the
  * core {@link ssoSignedOutKey}). Called ONLY on EXPLICIT full sign-out so that
  * the next cold boot does NOT silently re-mint a session from a still-live IdP
- * session (`fedcm-silent` / per-apex `/auth/silent` iframe). Cleared by any
+ * session (the per-apex `/auth/silent` iframe cold-boot step). Cleared by any
  * deliberate sign-in (see {@link clearSignedOut}). No-ops on native / storage
  * failure (best-effort).
  */
 export function markSignedOut() {
-  const storage = getLocalStorage();
-  if (!storage) return;
+  if (!hasLocalStorage()) return;
   try {
-    storage.setItem(ssoSignedOutKey(window.location.origin), '1');
+    window.localStorage.setItem(ssoSignedOutKey(window.location.origin), '1');
   } catch {
     // Best-effort; swallow QuotaExceededError / SecurityError (private mode).
   }
@@ -123,15 +81,14 @@ export function markSignedOut() {
 
 /**
  * Clear the durable deliberately-signed-out flag. Called on ANY deliberate
- * sign-in (password, FedCM, account switch, device claim) so a real sign-in
+ * sign-in (password, account switch, device claim) so a real sign-in
  * fully re-enables automatic silent restore — there is no "stuck signed out"
  * state. No-ops on native / storage failure.
  */
 export function clearSignedOut() {
-  const storage = getLocalStorage();
-  if (!storage) return;
+  if (!hasLocalStorage()) return;
   try {
-    storage.removeItem(ssoSignedOutKey(window.location.origin));
+    window.localStorage.removeItem(ssoSignedOutKey(window.location.origin));
   } catch {
     // Best-effort.
   }
@@ -142,12 +99,14 @@ export function clearSignedOut() {
  * the user deliberately signed out. Reads the durable flag through the core
  * {@link silentRestoreSuppressed} predicate. Returns `false` off-web and on any
  * storage failure (fail safe toward normal restore). Used to gate the
- * `fedcm-silent` and `silent-iframe` cold-boot steps.
+ * `silent-iframe` cold-boot step.
  */
 export function isSilentRestoreSuppressed() {
-  const storage = getLocalStorage();
-  if (!storage) return false;
-  return silentRestoreSuppressed(storage, window.location.origin);
+  // Unlike its try/catch-wrapped siblings this reads `window.location.origin`
+  // directly, so guard it: an RN polyfill can expose `localStorage` without a
+  // `location`, which would throw here. Fail safe toward normal restore.
+  if (!hasLocalStorage() || typeof window.location === 'undefined') return false;
+  return silentRestoreSuppressed(window.localStorage, window.location.origin);
 }
 
 /**
@@ -172,5 +131,4 @@ export function clearSsoBounceState() {
     // Best-effort; swallow SecurityError (e.g. Safari private mode).
   }
 }
-export { ACTIVE_AUTHUSER_KEY };
 //# sourceMappingURL=activeAuthuser.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["ssoAttemptedKey","ssoNoSessionKey","ssoGuardKey","ssoStateKey","ssoDestKey","ssoSignedOutKey","silentRestoreSuppressed","ACTIVE_AUTHUSER_KEY","getLocalStorage","window","localStorage","getSessionStorage","sessionStorage","readActiveAuthuser","storage","raw","getItem","parsed","Number","parseInt","isFinite","writeActiveAuthuser","authuser","setItem","String","clearActiveAuthuser","removeItem","markSignedOut","location","origin","clearSignedOut","isSilentRestoreSuppressed","clearSsoBounceState"],"sourceRoot":"../../../../src","sources":["ui/utils/activeAuthuser.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["ssoAttemptedKey","ssoNoSessionKey","ssoGuardKey","ssoStateKey","ssoDestKey","ssoSignedOutKey","silentRestoreSuppressed","ACTIVE_AUTHUSER_KEY","hasLocalStorage","window","localStorage","getSessionStorage","sessionStorage","readActiveAuthuser","raw","getItem","parsed","Number","parseInt","isFinite","markSignedOut","setItem","location","origin","clearSignedOut","removeItem","isSilentRestoreSuppressed","clearSsoBounceState","storage"],"sourceRoot":"../../../../src","sources":["ui/utils/activeAuthuser.ts"],"mappings":"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","ignoreList":[]}

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

@@ -52,53 +52,4 @@ export const fetchSessionsWithFallback = async (oxyServices, sessionId, {
     return mapSessionsToClient(userSessions, fallbackDeviceId, fallbackUserId);
   }
 };
-
-/**
- * Validate multiple sessions concurrently with configurable concurrency.
- *
- * @param oxyServices - Oxy service instance
- * @param sessionIds - Session identifiers to validate
- * @param options - Validation options
- */
-export const validateSessionBatch = async (oxyServices, sessionIds, {
-  useHeaderValidation = true,
-  maxConcurrency = 5
-} = {}) => {
-  if (!sessionIds.length) {
-    return [];
-  }
-  const uniqueSessionIds = Array.from(new Set(sessionIds));
-  const safeConcurrency = Math.max(1, Math.min(maxConcurrency, uniqueSessionIds.length));
-  const results = [];
-  let index = 0;
-  const worker = async () => {
-    while (index < uniqueSessionIds.length) {
-      const currentIndex = index;
-      index += 1;
-      const sessionId = uniqueSessionIds[currentIndex];
-      try {
-        const validation = await oxyServices.validateSession(sessionId, {
-          useHeaderValidation
-        });
-        const valid = Boolean(validation?.valid);
-        results.push({
-          sessionId,
-          valid,
-          user: validation?.user,
-          raw: validation
-        });
-      } catch (error) {
-        results.push({
-          sessionId,
-          valid: false,
-          error
-        });
-      }
-    }
-  };
-  await Promise.all(Array.from({
-    length: safeConcurrency
-  }, worker));
-  return results;
-};
 //# sourceMappingURL=sessionHelpers.js.map

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","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"],"sourceRoot":"../../../../src","sources":["ui/utils/sessionHelpers.ts"],"mappings":";;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMA,mBAAmB,GAAGA,CACjCC,QAAyB,EACzBC,gBAAyB,EACzBC,cAAuB,KACH;EACpB,MAAMC,GAAG,GAAG,IAAIC,IAAI,CAAC,CAAC;EAEtB,OAAOJ,QAAQ,CAACK,GAAG,CAAEC,OAAO,KAAM;IAChCC,SAAS,EAAED,OAAO,CAACC,SAAS;IAC5BC,QAAQ,EAAEF,OAAO,CAACE,QAAQ,IAAIP,gBAAgB,IAAI,EAAE;IACpDQ,SAAS,EAAEH,OAAO,CAACG,SAAS,IAAI,IAAIL,IAAI,CAACD,GAAG,CAACO,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAACC,WAAW,CAAC,CAAC;IAC/FC,UAAU,EAAEN,OAAO,CAACM,UAAU,IAAIT,GAAG,CAACQ,WAAW,CAAC,CAAC;IACnDE,MAAM,EACJP,OAAO,CAACQ,IAAI,EAAEC,EAAE,IAChBT,OAAO,CAACO,MAAM,KACbP,OAAO,CAACQ,IAAI,EAAEE,GAAG,GAAGV,OAAO,CAACQ,IAAI,CAACE,GAAG,CAACC,QAAQ,CAAC,CAAC,GAAGC,SAAS,CAAC,IAC7DhB,cAAc,IACd,EAAE;IACJiB,SAAS,EAAEC,OAAO,CAACd,OAAO,CAACa,SAAS;EACtC,CAAC,CAAC,CAAC;AACL,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAME,yBAAyB,GAAG,MAAAA,CACvCC,WAA2B,EAC3Bf,SAAiB,EACjB;EACEN,gBAAgB;EAChBC,cAAc;EACdqB;AACgC,CAAC,GAAG,CAAC,CAAC,KACX;EAC7B,IAAI;IACF,MAAMC,cAAc,GAAG,MAAMF,WAAW,CAACG,iBAAiB,CAAClB,SAAS,CAAC;IACrE,OAAOR,mBAAmB,CAACyB,cAAc,EAAEvB,gBAAgB,EAAEC,cAAc,CAAC;EAC9E,CAAC,CAAC,OAAOwB,KAAK,EAAE;IACd,IAAIC,OAAO,IAAIJ,MAAM,EAAE;MACrBA,MAAM,CAAC,8DAA8D,EAAEG,KAAK,CAAC;IAC/E;IAEA,MAAME,YAAY,GAAG,MAAMN,WAAW,CAACO,sBAAsB,CAACtB,SAAS,CAAC;IACxE,OAAOR,mBAAmB,CAAC6B,YAAY,EAAE3B,gBAAgB,EAAEC,cAAc,CAAC;EAC5E;AACF,CAAC","ignoreList":[]}

package/lib/module/utils/deviceFlowSignIn.js

@@ -4,41 +4,62 @@
  * Shared, pure orchestration for completing the cross-app device-flow sign-in
  * (the QR-code / "Open Oxy Auth" path used on native and web).
  *
- * THE BUG THIS FIXES (native): once another authenticated device approves the
- * pending AuthSession, the originating client is notified (socket / poll /
- * deep-link) with the authorized `sessionId`. Before any session-management
- * code can use it, the client MUST exchange the secret 128-bit `sessionToken`
- * (held only by this client, generated for THIS flow) for the first access
- * token via `claimSessionByToken` — the device-flow equivalent of OAuth's
- * code-for-token exchange (RFC 8628 §3.4).
+ * THE FIRST BUG THIS FIXES (native): once another authenticated device
+ * approves the pending AuthSession, the originating client is notified
+ * (socket / poll / deep-link) with the authorized `sessionId`. Before any
+ * session-management code can use it, the client MUST exchange the secret
+ * 128-bit `sessionToken` (held only by this client, generated for THIS flow)
+ * for the first access token via `claimSessionByToken` — the device-flow
+ * equivalent of OAuth's code-for-token exchange (RFC 8628 §3.4).
+ *
+ * THE SECOND BUG THIS FIXES (session-sync cutover regression): the
+ * freshly-claimed session is NOT yet registered in the device's
+ * server-authoritative session set — nothing has run
+ * `sessionClient.addCurrentAccount()` for it — so it must NOT be committed
+ * through `switchSession`. That path is now an account-SWITCH between
+ * accounts already registered on this device (`OxyContext`'s
+ * `switchSessionForContext`), and throws `No device account found for
+ * session "..."` for anything else, surfacing as "Authorization successful
+ * but failed to complete sign in." Instead the claimed session must be
+ * committed through the SAME path a fresh password sign-in uses —
+ * `useOxy().handleWebSession` (`OxyContext`'s `handleWebSSOSession`) — which
+ * registers the account into the device set, persists it durably, and
+ * hydrates the full user profile.
  *
  * Skipping the claim leaves the SDK with NO bearer token: the session is
  * authorized server-side but the app never becomes authenticated and the UI
- * sits "Waiting for authorization..." forever. Consolidating the claim→switch
- * sequence here keeps native and web identical and unit-testable.
+ * sits "Waiting for authorization..." forever. Consolidating the
+ * claim->commit sequence here keeps native and web identical and
+ * unit-testable.
  */
 
-import { KeyManager } from '@oxyhq/core';
+import { KeyManager, establishIdpSessionAfterClaim } from '@oxyhq/core';
 
 /**
  * The minimal `OxyServices` surface this orchestration needs. Kept as a
  * structural type (rather than importing the full client) so the helper is
  * trivially unit-testable with a stub and never pulls the RN/Expo runtime into
  * a test bundle.
+ *
+ * Extends {@link SsoEstablishClient} (`requestSsoEstablishUrl`) so the WEB
+ * post-claim durable-session hop can be driven off the same client.
  */
 
 /**
  * Complete a device-flow sign-in: claim the first access token with the secret
- * `sessionToken` (planting the bearer), then hydrate the session via
- * `switchSession`. Returns the authenticated user.
+ * `sessionToken` (planting the bearer), then commit the resulting session via
+ * `commitSession` (registers it into the device's server-authoritative session
+ * set and hydrates the full user). Returns the authenticated user.
  *
- * Throws if either the claim or the switch fails; callers surface a retry UI.
+ * Throws if the claim did not return a usable session, or if either the claim
+ * or the commit fails; callers surface a retry UI.
  */
 export async function completeDeviceFlowSignIn({
   oxyServices,
   sessionId,
   sessionToken,
-  switchSession
+  commitSession,
+  establishDeps
 }) {
   // 1) Plant the bearer + refresh tokens. The claim response is also persisted
   //    to native shared secure storage so a later cold boot has a bearer before
@@ -47,8 +68,42 @@ export async function completeDeviceFlowSignIn({
   if (claimed?.accessToken) {
     await KeyManager.storeSharedSession(claimed.sessionId || sessionId, claimed.accessToken);
   }
+  if (!claimed?.accessToken || !claimed.user) {
+    throw new Error('Device-flow claim did not return a usable session');
+  }
+
+  // `SessionLoginResponse.user` is the minimal session-carried shape (avatar
+  // is `string | undefined`); the claim response returns the full `User`
+  // (avatar is `string | null | undefined`). Normalize rather than widening
+  // `SessionLoginResponse.user` to accept `null`.
+  const minimalUser = {
+    id: claimed.user.id,
+    username: claimed.user.username,
+    name: claimed.user.name,
+    avatar: claimed.user.avatar ?? undefined
+  };
+
+  // 2) Bearer is now planted — commit the session through the same path a
+  //    fresh sign-in uses so it is registered into the device's
+  //    server-authoritative session set instead of an account switch.
+  await commitSession({
+    sessionId: claimed.sessionId || sessionId,
+    deviceId: claimed.deviceId ?? '',
+    expiresAt: claimed.expiresAt ?? '',
+    user: minimalUser,
+    accessToken: claimed.accessToken
+  });
 
-  // 2) Bearer is now planted — hydrate the session through the normal path.
-  return switchSession(sessionId);
+  // 3) WEB durable-session hop (no-op on native). A device-flow claim plants
+  //    ONLY in-memory tokens — no IdP `fedcm_session` cookie is ever planted, so
+  //    a reload cannot re-mint a token and the session is lost. Now that the
+  //    session is committed AND durably persisted (step 2), plant the per-apex
+  //    IdP cookie via ONE top-level establish hop. Single attempt; total (never
+  //    throws) — an establish failure leaves the committed session as-is. On web
+  //    success it navigates away, so it is the LAST step: the browser tears the
+  //    page down on the next tick, after `claimed.user` is returned to the
+  //    caller's `onSignedIn`.
+  await establishIdpSessionAfterClaim(oxyServices, establishDeps ?? {});
+  return claimed.user;
 }
 //# sourceMappingURL=deviceFlowSignIn.js.map

package/lib/module/utils/deviceFlowSignIn.js.map

@@ -1 +1 @@
-{"version":3,"names":["KeyManager","completeDeviceFlowSignIn","oxyServices","sessionId","sessionToken","switchSession","claimed","claimSessionByToken","accessToken","storeSharedSession"],"sourceRoot":"../../../src","sources":["utils/deviceFlowSignIn.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,UAAU,QAAmB,aAAa;;AAOnD;AACA;AACA;AACA;AACA;AACA;;AA4BA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,wBAAwBA,CAAC;EAC7CC,WAAW;EACXC,SAAS;EACTC,YAAY;EACZC;AAC+B,CAAC,EAAiB;EACjD;EACA;EACA;EACA,MAAMC,OAAO,GAAG,MAAMJ,WAAW,CAACK,mBAAmB,CAACH,YAAY,CAAC;EACnE,IAAIE,OAAO,EAAEE,WAAW,EAAE;IACxB,MAAMR,UAAU,CAACS,kBAAkB,CAACH,OAAO,CAACH,SAAS,IAAIA,SAAS,EAAEG,OAAO,CAACE,WAAW,CAAC;EAC1F;;EAEA;EACA,OAAOH,aAAa,CAACF,SAAS,CAAC;AACjC","ignoreList":[]}
+{"version":3,"names":["KeyManager","establishIdpSessionAfterClaim","completeDeviceFlowSignIn","oxyServices","sessionId","sessionToken","commitSession","establishDeps","claimed","claimSessionByToken","accessToken","storeSharedSession","user","Error","minimalUser","id","username","name","avatar","undefined","deviceId","expiresAt"],"sourceRoot":"../../../src","sources":["utils/deviceFlowSignIn.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SACEA,UAAU,EACVC,6BAA6B,QAMxB,aAAa;;AAUpB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAqCA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,wBAAwBA,CAAC;EAC7CC,WAAW;EACXC,SAAS;EACTC,YAAY;EACZC,aAAa;EACbC;AAC+B,CAAC,EAAiB;EACjD;EACA;EACA;EACA,MAAMC,OAAO,GAAG,MAAML,WAAW,CAACM,mBAAmB,CAACJ,YAAY,CAAC;EACnE,IAAIG,OAAO,EAAEE,WAAW,EAAE;IACxB,MAAMV,UAAU,CAACW,kBAAkB,CAACH,OAAO,CAACJ,SAAS,IAAIA,SAAS,EAAEI,OAAO,CAACE,WAAW,CAAC;EAC1F;EAEA,IAAI,CAACF,OAAO,EAAEE,WAAW,IAAI,CAACF,OAAO,CAACI,IAAI,EAAE;IAC1C,MAAM,IAAIC,KAAK,CAAC,mDAAmD,CAAC;EACtE;;EAEA;EACA;EACA;EACA;EACA,MAAMC,WAA4B,GAAG;IACnCC,EAAE,EAAEP,OAAO,CAACI,IAAI,CAACG,EAAE;IACnBC,QAAQ,EAAER,OAAO,CAACI,IAAI,CAACI,QAAQ;IAC/BC,IAAI,EAAET,OAAO,CAACI,IAAI,CAACK,IAAI;IACvBC,MAAM,EAAEV,OAAO,CAACI,IAAI,CAACM,MAAM,IAAIC;EACjC,CAAC;;EAED;EACA;EACA;EACA,MAAMb,aAAa,CAAC;IAClBF,SAAS,EAAEI,OAAO,CAACJ,SAAS,IAAIA,SAAS;IACzCgB,QAAQ,EAAEZ,OAAO,CAACY,QAAQ,IAAI,EAAE;IAChCC,SAAS,EAAEb,OAAO,CAACa,SAAS,IAAI,EAAE;IAClCT,IAAI,EAAEE,WAAW;IACjBJ,WAAW,EAAEF,OAAO,CAACE;EACvB,CAAC,CAAC;;EAEF;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,MAAMT,6BAA6B,CAACE,WAAW,EAAEI,aAAa,IAAI,CAAC,CAAC,CAAC;EAErE,OAAOC,OAAO,CAACI,IAAI;AACrB","ignoreList":[]}

package/lib/typescript/commonjs/index.d.ts

@@ -28,7 +28,6 @@ export type { AuthState, AuthActions, UseAuthReturn } from './ui/hooks/useAuth';
 export { FontLoader } from './ui/components/FontLoader';
 export { useAuthStore } from './ui/stores/authStore';
 export { useAssetStore, useAssets as useAssetsStore, useAsset, useUploadProgress, useAssetLoading, useAssetErrors, useAssetsByApp, useAssetsByEntity, useAssetUsageCount, useIsAssetLinked, } from './ui/stores/assetStore';
-export { useSessionSocket } from './ui/hooks/useSessionSocket';
 export { useAssets, setOxyAssetInstance } from './ui/hooks/useAssets';
 export { useFileDownloadUrl } from './ui/hooks/useFileDownloadUrl';
 export { useFollow, useFollowerCounts } from './ui/hooks/useFollow';
@@ -71,8 +70,8 @@ export { default as ProfileMenu } from './ui/components/ProfileMenu';
 export type { ProfileMenuProps, ProfileMenuAnchor } from './ui/components/ProfileMenu';
 export { default as AccountSwitcher, AccountSwitcherView } from './ui/components/AccountSwitcher';
 export type { AccountSwitcherProps, AccountSwitcherActions } from './ui/components/AccountSwitcher';
-export { useDeviceAccounts } from './ui/hooks/useDeviceAccounts';
-export type { DeviceAccount, DeviceAccountUser, UseDeviceAccountsResult, } from './ui/hooks/useDeviceAccounts';
+export { useSwitchableAccounts } from './ui/hooks/useSwitchableAccounts';
+export type { SwitchableAccount, SwitchableAccountUser, UseSwitchableAccountsResult, } from './ui/hooks/useSwitchableAccounts';
 export { default as ManageAccountScreen } from './ui/screens/ManageAccountScreen';
 export { default as NotificationsScreen } from './ui/screens/NotificationsScreen';
 export { default as PreferencesScreen } from './ui/screens/PreferencesScreen';