@oxyhq/services 22.12.4 → 22.13.0

package/lib/module/ui/oauth/oauthHandshake.js

@@ -0,0 +1,50 @@
+"use strict";
+
+/**
+ * The RP half of an OAuth authorize request: a fresh CSRF `state` + PKCE pair,
+ * and the authorize URL built from them.
+ *
+ * Both web transports start here, and the ONLY difference between them is one
+ * parameter: `popup` asks the IdP for `response_mode=web_message` so the result
+ * comes back to `window.opener` instead of navigating the RP's tab. Everything
+ * else — `S256` PKCE, exact registered `redirect_uri`, random `state` — is
+ * identical, which is what lets both lanes converge on one completion path.
+ */
+
+import { buildOAuthAuthorizeUrl, generateOAuthState, generatePkcePair } from '@oxyhq/core';
+
+/** Inputs for {@link prepareAuthorizeRequest}. */
+
+/** A ready-to-use authorize request plus the secrets that finish it. */
+
+/**
+ * Generate a fresh handshake and build the authorize URL around it.
+ *
+ * The verifier is returned to the caller and never stored here: the popup
+ * transport keeps it in memory for the lifetime of the attempt, and the
+ * redirect transport persists it through `persistOAuthHandshake` because a
+ * full-page navigation destroys the running document.
+ */
+export async function prepareAuthorizeRequest(params) {
+  const [pkce, state] = await Promise.all([generatePkcePair(), generateOAuthState()]);
+  const authorizeUrl = buildOAuthAuthorizeUrl({
+    authorizeBaseUrl: params.authorizeBaseUrl,
+    clientId: params.clientId,
+    redirectUri: params.redirectUri,
+    scope: params.scope,
+    state,
+    codeChallenge: pkce.codeChallenge,
+    ...(params.responseMode ? {
+      responseMode: params.responseMode
+    } : {})
+  });
+  return {
+    authorizeUrl,
+    authorizeOrigin: new URL(authorizeUrl).origin,
+    handshake: {
+      state,
+      codeVerifier: pkce.codeVerifier
+    }
+  };
+}
+//# sourceMappingURL=oauthHandshake.js.map

package/lib/module/ui/oauth/oauthHandshake.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["buildOAuthAuthorizeUrl","generateOAuthState","generatePkcePair","prepareAuthorizeRequest","params","pkce","state","Promise","all","authorizeUrl","authorizeBaseUrl","clientId","redirectUri","scope","codeChallenge","responseMode","authorizeOrigin","URL","origin","handshake","codeVerifier"],"sourceRoot":"../../../../src","sources":["ui/oauth/oauthHandshake.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SAASA,sBAAsB,EAAEC,kBAAkB,EAAEC,gBAAgB,QAAQ,aAAa;;AAG1F;;AAkBA;;AAaA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,uBAAuBA,CAC3CC,MAAqC,EACF;EACnC,MAAM,CAACC,IAAI,EAAEC,KAAK,CAAC,GAAG,MAAMC,OAAO,CAACC,GAAG,CAAC,CAACN,gBAAgB,CAAC,CAAC,EAAED,kBAAkB,CAAC,CAAC,CAAC,CAAC;EAEnF,MAAMQ,YAAY,GAAGT,sBAAsB,CAAC;IAC1CU,gBAAgB,EAAEN,MAAM,CAACM,gBAAgB;IACzCC,QAAQ,EAAEP,MAAM,CAACO,QAAQ;IACzBC,WAAW,EAAER,MAAM,CAACQ,WAAW;IAC/BC,KAAK,EAAET,MAAM,CAACS,KAAK;IACnBP,KAAK;IACLQ,aAAa,EAAET,IAAI,CAACS,aAAa;IACjC,IAAIV,MAAM,CAACW,YAAY,GAAG;MAAEA,YAAY,EAAEX,MAAM,CAACW;IAAa,CAAC,GAAG,CAAC,CAAC;EACtE,CAAC,CAAC;EAEF,OAAO;IACLN,YAAY;IACZO,eAAe,EAAE,IAAIC,GAAG,CAACR,YAAY,CAAC,CAACS,MAAM;IAC7CC,SAAS,EAAE;MAAEb,KAAK;MAAEc,YAAY,EAAEf,IAAI,CAACe;IAAa;EACtD,CAAC;AACH","ignoreList":[]}

package/lib/module/ui/oauth/oauthPopup.js

@@ -0,0 +1,268 @@
+"use strict";
+
+/**
+ * Popup lifecycle for the web OAuth transport.
+ *
+ * Owns the window itself — opening it, navigating it, watching it, and tearing
+ * every listener and timer down — and nothing else: message validation lives in
+ * `oauthPopupMessages.ts`, and the code exchange in `completeOAuthCode.ts`.
+ *
+ * Three browser realities shape this module:
+ *
+ * - **Gesture attribution.** `window.open` only succeeds while the user's click
+ *   is still being handled. Anything awaited first (resolving the application,
+ *   generating PKCE) loses it and the popup is silently blocked. So the window
+ *   is opened EMPTY up front and navigated once the authorize URL exists —
+ *   the same shape as `passkeyHubPopup.ts`.
+ * - **No close event.** A cross-origin popup fires nothing when the user
+ *   dismisses it; polling `closed` is the only mechanism (as in core's
+ *   `AccountDialogController.watchPopup`).
+ * - **No cross-origin reads.** The popup's URL, title, and document are all
+ *   opaque. The authorization result arrives ONLY as a `postMessage`.
+ */
+
+import { canonicalizeOAuthRedirectUri, logger } from '@oxyhq/core';
+import { readOAuthPopupMessage } from "./oauthPopupMessages.js";
+/**
+ * Window name for the sign-in popup. Naming the target means a second press
+ * REUSES the same window instead of stacking a new one behind the first.
+ */
+export const OXY_OAUTH_POPUP_WINDOW_NAME = 'oxy-oauth';
+
+/** Chrome-free window roughly sized for the IdP's sign-in / QR surface. */
+const POPUP_FEATURES = 'popup=yes,width=460,height=700,menubar=no,toolbar=no,location=no,status=no';
+
+/**
+ * How long a popup sign-in may stay unanswered (ms).
+ *
+ * Generous on purpose: the IdP surface can involve scanning a QR and approving
+ * on a phone, so this tracks the authorize handle's own ~5-minute lifetime
+ * rather than a UI-scale timeout. It is a backstop against a wedged popup, not
+ * a pace-setter — a user who gives up closes the window and gets the faster
+ * `closed` outcome.
+ */
+export const DEFAULT_OAUTH_POPUP_TIMEOUT_MS = 300_000;
+
+/** How often the popup's `closed` flag is sampled (ms). */
+const CLOSE_POLL_INTERVAL_MS = 1000;
+
+/**
+ * Grace period (ms) after `closed` flips before reporting cancellation.
+ *
+ * The IdP posts its result and THEN closes itself. Both land as separate tasks,
+ * so a poll tick that happens to fall between them would otherwise turn a
+ * successful sign-in into a "user cancelled". One short grace window lets the
+ * already-queued message win.
+ */
+const CLOSE_GRACE_MS = 400;
+
+/** The `message` half of the DOM host, absent on native and during SSR. */
+
+/** The `open` half of the DOM host, absent on native and during SSR. */
+
+function messageEventHost() {
+  const win = globalThis.window;
+  if (!win || typeof win.addEventListener !== 'function' || typeof win.removeEventListener !== 'function') {
+    return null;
+  }
+  return win;
+}
+
+/**
+ * Open a new, EMPTY sign-in popup.
+ *
+ * MUST be called SYNCHRONOUSLY from a user-gesture handler, before any `await`.
+ * Returns `null` when the browser blocked it, when `window.open` threw, and on
+ * hosts with no DOM (native / SSR) — never throws, because "no popup" is an
+ * ordinary outcome the caller answers by falling back to a redirect.
+ */
+export function openOAuthPopup() {
+  const win = globalThis.window;
+  if (!win || typeof win.open !== 'function') return null;
+  try {
+    return win.open('', OXY_OAUTH_POPUP_WINDOW_NAME, POPUP_FEATURES) ?? null;
+  } catch (error) {
+    logger.warn('Could not open the OAuth sign-in popup', {
+      component: 'oauthPopup'
+    }, error);
+    return null;
+  }
+}
+
+/**
+ * Point an already-open popup at the authorize URL. Returns `false` when the
+ * assignment threw (a window closed between opening and navigating), so the
+ * caller can fall back to a redirect instead of waiting on a dead window.
+ */
+export function navigateOAuthPopup(popup, url) {
+  try {
+    popup.location.href = url;
+    return true;
+  } catch (error) {
+    logger.warn('Could not navigate the OAuth sign-in popup', {
+      component: 'oauthPopup'
+    }, error);
+    return false;
+  }
+}
+
+/** Close the popup if it is still open. Idempotent, null-safe, never throws. */
+export function closeOAuthPopup(popup) {
+  if (!popup || popup.closed) return;
+  try {
+    popup.close();
+  } catch (error) {
+    logger.debug('OAuth popup close failed', {
+      component: 'oauthPopup'
+    }, error);
+  }
+}
+
+/**
+ * When the IdP falls back to a top-level redirect inside the popup (no usable
+ * `window.opener`), a same-origin `redirect_uri` is readable from the opener.
+ * Cross-origin redirects remain opaque and are not handled here.
+ */
+function readSameOriginRedirectOutcome(popup, redirectUri, expectedState) {
+  try {
+    const href = popup.location.href;
+    if (!href) return null;
+    const popupUrl = new URL(href);
+    const expected = new URL(canonicalizeOAuthRedirectUri(redirectUri));
+    if (popupUrl.origin !== expected.origin) return null;
+    if (popupUrl.pathname !== expected.pathname) return null;
+    const oauthError = popupUrl.searchParams.get('error');
+    if (oauthError) {
+      const errorDescription = popupUrl.searchParams.get('error_description') ?? undefined;
+      return {
+        kind: 'oauth-error',
+        error: oauthError,
+        ...(errorDescription ? {
+          errorDescription
+        } : {})
+      };
+    }
+    const code = popupUrl.searchParams.get('code');
+    if (!code) return null;
+    const state = popupUrl.searchParams.get('state');
+    if (!state || state !== expectedState) return {
+      kind: 'state-mismatch'
+    };
+    return {
+      kind: 'code',
+      code,
+      state
+    };
+  } catch {
+    // Cross-origin navigation — the popup URL is opaque to the opener.
+    return null;
+  }
+}
+
+/** Inputs for {@link awaitOAuthPopupResult}. */
+
+/**
+ * Wait for the popup to deliver an authorization result.
+ *
+ * Settles EXACTLY once, with a typed outcome for every path — code, IdP error,
+ * state mismatch, user-closed, timeout — and removes its listener, its close
+ * poll, and both timers before resolving, whatever the outcome. Messages that
+ * arrive after settling reach nothing, so a duplicate delivery is inert.
+ *
+ * Never rejects: closing the window and running out of time are expected
+ * outcomes, not exceptions.
+ */
+export function awaitOAuthPopupResult(options) {
+  const {
+    popup,
+    expectedOrigin,
+    expectedState,
+    redirectUri,
+    timeoutMs = DEFAULT_OAUTH_POPUP_TIMEOUT_MS
+  } = options;
+  const host = messageEventHost();
+  if (!host) return Promise.resolve({
+    kind: 'unsupported'
+  });
+  return new Promise(resolve => {
+    let settled = false;
+    let timeoutTimer = null;
+    let closeGraceTimer = null;
+    let closePoll = null;
+    const onMessage = event => {
+      const verdict = readOAuthPopupMessage(event, {
+        expectedOrigin,
+        expectedState,
+        popup
+      });
+      switch (verdict.kind) {
+        case 'ignore':
+          return;
+        case 'code':
+          settle({
+            kind: 'code',
+            code: verdict.code,
+            state: verdict.state
+          });
+          return;
+        case 'oauth-error':
+          settle({
+            kind: 'oauth-error',
+            error: verdict.error,
+            ...(verdict.errorDescription ? {
+              errorDescription: verdict.errorDescription
+            } : {})
+          });
+          return;
+        case 'state-mismatch':
+          settle({
+            kind: 'state-mismatch'
+          });
+          return;
+      }
+    };
+    const cleanup = () => {
+      host.removeEventListener('message', onMessage);
+      if (timeoutTimer !== null) {
+        clearTimeout(timeoutTimer);
+        timeoutTimer = null;
+      }
+      if (closeGraceTimer !== null) {
+        clearTimeout(closeGraceTimer);
+        closeGraceTimer = null;
+      }
+      if (closePoll !== null) {
+        clearInterval(closePoll);
+        closePoll = null;
+      }
+    };
+    function settle(outcome) {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      resolve(outcome);
+    }
+    host.addEventListener('message', onMessage);
+    timeoutTimer = setTimeout(() => settle({
+      kind: 'timed-out'
+    }), timeoutMs);
+    closePoll = setInterval(() => {
+      const redirectOutcome = readSameOriginRedirectOutcome(popup, redirectUri, expectedState);
+      if (redirectOutcome) {
+        settle(redirectOutcome);
+        return;
+      }
+      if (!popup.closed) return;
+      // Stop sampling immediately: the window is gone and only the in-flight
+      // message (if any) can still change the outcome.
+      if (closePoll !== null) {
+        clearInterval(closePoll);
+        closePoll = null;
+      }
+      closeGraceTimer = setTimeout(() => settle({
+        kind: 'closed'
+      }), CLOSE_GRACE_MS);
+    }, CLOSE_POLL_INTERVAL_MS);
+  });
+}
+//# sourceMappingURL=oauthPopup.js.map

package/lib/module/ui/oauth/oauthPopup.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["canonicalizeOAuthRedirectUri","logger","readOAuthPopupMessage","OXY_OAUTH_POPUP_WINDOW_NAME","POPUP_FEATURES","DEFAULT_OAUTH_POPUP_TIMEOUT_MS","CLOSE_POLL_INTERVAL_MS","CLOSE_GRACE_MS","messageEventHost","win","globalThis","window","addEventListener","removeEventListener","openOAuthPopup","open","error","warn","component","navigateOAuthPopup","popup","url","location","href","closeOAuthPopup","closed","close","debug","readSameOriginRedirectOutcome","redirectUri","expectedState","popupUrl","URL","expected","origin","pathname","oauthError","searchParams","get","errorDescription","undefined","kind","code","state","awaitOAuthPopupResult","options","expectedOrigin","timeoutMs","host","Promise","resolve","settled","timeoutTimer","closeGraceTimer","closePoll","onMessage","event","verdict","settle","cleanup","clearTimeout","clearInterval","outcome","setTimeout","setInterval","redirectOutcome"],"sourceRoot":"../../../../src","sources":["ui/oauth/oauthPopup.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/oauth/oauthPopupMessages.js

@@ -0,0 +1,135 @@
+"use strict";
+
+/**
+ * Runtime validation for the popup OAuth `postMessage` channel.
+ *
+ * Everything arriving on `window`'s `message` event is untrusted: any frame on
+ * the page, any other popup, and any browser extension can post to us. This
+ * module is the ONLY place that decides whether an incoming event is a genuine
+ * authorization response, and it answers with a value — never a thrown error.
+ *
+ * A message is accepted only when ALL of these hold:
+ *   1. `event.origin` is EXACTLY the authorize endpoint's origin,
+ *   2. `event.source` is the exact `Window` reference we opened,
+ *   3. `event.data` matches one of the two frozen message shapes,
+ *   4. the `state` it carries matches the one this RP sent.
+ *
+ * Failing (1)–(3) is indistinguishable from unrelated page traffic, so the
+ * message is IGNORED and the flow keeps waiting. Failing (4) means our own
+ * popup answered a different request than the one in flight, which is terminal:
+ * it is reported as a mismatch rather than left to hang until the timeout.
+ */
+
+import { logger } from '@oxyhq/core';
+/** `postMessage` discriminator for a successful authorization. */
+export const OXY_OAUTH_CODE_MESSAGE_TYPE = 'oxy:oauth:code';
+
+/** `postMessage` discriminator for a typed OAuth failure. */
+export const OXY_OAUTH_ERROR_MESSAGE_TYPE = 'oxy:oauth:error';
+
+/** Verdict for one incoming `message` event. */
+
+/** What {@link readOAuthPopupMessage} validates an event against. */
+
+function isNonEmptyString(value) {
+  return typeof value === 'string' && value.length > 0;
+}
+
+/**
+ * Reference equality across two `unknown` values.
+ *
+ * `event.source` is a `WindowProxy` and {@link OAuthPopupHandle} is a narrow
+ * structural type, so comparing them directly is a type error. Widening both to
+ * `unknown` keeps the check a plain identity comparison — which is exactly the
+ * security property we want — without a cast.
+ */
+function isSameWindowReference(a, b) {
+  return a === b;
+}
+
+/**
+ * Parse untrusted `event.data` into one of the two frozen message shapes, or
+ * `null` when it is anything else (including `null`, primitives, arrays, and
+ * objects with missing/wrong-typed fields).
+ *
+ * Unknown extra properties are tolerated but never read: only the fields below
+ * are ever surfaced, so a hostile sender cannot smuggle values past this point.
+ */
+export function parseOAuthPopupMessage(data) {
+  if (typeof data !== 'object' || data === null || Array.isArray(data)) return null;
+  const record = data;
+  if (record.type === OXY_OAUTH_CODE_MESSAGE_TYPE) {
+    if (!isNonEmptyString(record.code) || !isNonEmptyString(record.state)) return null;
+    return {
+      type: OXY_OAUTH_CODE_MESSAGE_TYPE,
+      code: record.code,
+      state: record.state
+    };
+  }
+  if (record.type === OXY_OAUTH_ERROR_MESSAGE_TYPE) {
+    if (!isNonEmptyString(record.error)) return null;
+    return {
+      type: OXY_OAUTH_ERROR_MESSAGE_TYPE,
+      error: record.error,
+      ...(isNonEmptyString(record.errorDescription) ? {
+        errorDescription: record.errorDescription
+      } : {}),
+      ...(isNonEmptyString(record.state) ? {
+        state: record.state
+      } : {})
+    };
+  }
+  return null;
+}
+
+/**
+ * Classify one `message` event against the in-flight authorize request.
+ *
+ * Never throws. See the module header for the acceptance rules.
+ */
+export function readOAuthPopupMessage(event, context) {
+  if (event.origin !== context.expectedOrigin) return {
+    kind: 'ignore'
+  };
+  if (!isSameWindowReference(event.source, context.popup)) return {
+    kind: 'ignore'
+  };
+  const message = parseOAuthPopupMessage(event.data);
+  if (!message) {
+    // Origin and source matched, so this came from the IdP window we opened —
+    // a shape we cannot read is worth a breadcrumb, unlike ordinary page noise.
+    logger.debug('Ignored an unrecognised message from the OAuth popup', {
+      component: 'oauthPopupMessages'
+    });
+    return {
+      kind: 'ignore'
+    };
+  }
+  if (message.type === OXY_OAUTH_CODE_MESSAGE_TYPE) {
+    if (message.state !== context.expectedState) return {
+      kind: 'state-mismatch'
+    };
+    return {
+      kind: 'code',
+      code: message.code,
+      state: message.state
+    };
+  }
+
+  // An error MAY carry `state` (the IdP omits it when the request never got far
+  // enough to bind one). When present it must match: a foreign error must not be
+  // able to end an unrelated in-flight sign-in.
+  if (message.state !== undefined && message.state !== context.expectedState) {
+    return {
+      kind: 'state-mismatch'
+    };
+  }
+  return {
+    kind: 'oauth-error',
+    error: message.error,
+    ...(message.errorDescription ? {
+      errorDescription: message.errorDescription
+    } : {})
+  };
+}
+//# sourceMappingURL=oauthPopupMessages.js.map

package/lib/module/ui/oauth/oauthPopupMessages.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["logger","OXY_OAUTH_CODE_MESSAGE_TYPE","OXY_OAUTH_ERROR_MESSAGE_TYPE","isNonEmptyString","value","length","isSameWindowReference","a","b","parseOAuthPopupMessage","data","Array","isArray","record","type","code","state","error","errorDescription","readOAuthPopupMessage","event","context","origin","expectedOrigin","kind","source","popup","message","debug","component","expectedState","undefined"],"sourceRoot":"../../../../src","sources":["ui/oauth/oauthPopupMessages.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/oauth/types.js

@@ -0,0 +1,2 @@
+"use strict";
+//# sourceMappingURL=types.js.map

package/lib/module/ui/oauth/types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../../../src","sources":["ui/oauth/types.ts"],"mappings":"","ignoreList":[]}

package/lib/module/ui/server.js

@@ -25,8 +25,6 @@ export const LogoIcon = noopComponent;
 export const LogoText = noopComponent;
 export const FollowButton = noopComponent;
 export const OxyPayButton = noopComponent;
-export const FontLoader = noopComponent;
-export const setupFonts = async () => true;
 
 // Context
 export const useOxy = noopHook;

package/lib/module/ui/server.js.map

@@ -1 +1 @@
-{"version":3,"names":["noopComponent","noopHook","noopStorageResult","storage","isReady","OxyProvider","OxySignInButton","LogoIcon","LogoText","FollowButton","OxyPayButton","FontLoader","setupFonts","useOxy","useAuth","useFollow","useStorage","ProfileScreen","useAuthStore","useAccountStore","toast","Object","assign","success","error","info","warning","loading","dismiss","handleAuthError","isInvalidSessionError","isTimeoutOrNetworkError","extractErrorMessage"],"sourceRoot":"../../../src","sources":["ui/server.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,MAAMA,aAAa,GAAGA,CAAA,KAAM,IAAI;AAChC,MAAMC,QAAQ,GAAGA,CAAA,MAAO,CAAC,CAAC,CAAC;AAC3B,MAAMC,iBAAiB,GAAG;EAAEC,OAAO,EAAE,IAAI;EAAEC,OAAO,EAAE;AAAM,CAAC;;AAE3D;AACA,OAAO,MAAMC,WAAW,GAAGL,aAAa;AACxC,OAAO,MAAMM,eAAe,GAAGN,aAAa;AAC5C,OAAO,MAAMO,QAAQ,GAAGP,aAAa;AACrC,OAAO,MAAMQ,QAAQ,GAAGR,aAAa;AACrC,OAAO,MAAMS,YAAY,GAAGT,aAAa;AACzC,OAAO,MAAMU,YAAY,GAAGV,aAAa;AACzC,OAAO,MAAMW,UAAU,GAAGX,aAAa;AACvC,OAAO,MAAMY,UAAU,GAAG,MAAAA,CAAA,KAA8B,IAAI;;AAE5D;AACA,OAAO,MAAMC,MAAM,GAAGZ,QAAQ;;AAE9B;AACA,OAAO,MAAMa,OAAO,GAAGb,QAAQ;AAC/B,OAAO,MAAMc,SAAS,GAAGd,QAAQ;AACjC,OAAO,MAAMe,UAAU,GAAGA,CAAA,KAAMd,iBAAiB;;AAEjD;AACA,OAAO,MAAMe,aAAa,GAAGjB,aAAa;;AAE1C;AACA,OAAO,MAAMkB,YAAY,GAAGjB,QAAQ;AACpC,OAAO,MAAMkB,eAAe,GAAGlB,QAAQ;;AAEvC;AACA,OAAO,MAAMmB,KAAK,GAAGC,MAAM,CAACC,MAAM,CAC9B,MAAM,CAAC,CAAC,EACR;EACIC,OAAO,EAAEA,CAAA,KAAM,CAAC,CAAC;EACjBC,KAAK,EAAEA,CAAA,KAAM,CAAC,CAAC;EACfC,IAAI,EAAEA,CAAA,KAAM,CAAC,CAAC;EACdC,OAAO,EAAEA,CAAA,KAAM,CAAC,CAAC;EACjBC,OAAO,EAAEA,CAAA,KAAM,CAAC,CAAC;EACjBC,OAAO,EAAEA,CAAA,KAAM,CAAC;AACpB,CACJ,CAAC;;AAED;AACA,SACIC,eAAe,EACfC,qBAAqB,EACrBC,uBAAuB,EACvBC,mBAAmB,QAChB,0BAAuB","ignoreList":[]}
+{"version":3,"names":["noopComponent","noopHook","noopStorageResult","storage","isReady","OxyProvider","OxySignInButton","LogoIcon","LogoText","FollowButton","OxyPayButton","useOxy","useAuth","useFollow","useStorage","ProfileScreen","useAuthStore","useAccountStore","toast","Object","assign","success","error","info","warning","loading","dismiss","handleAuthError","isInvalidSessionError","isTimeoutOrNetworkError","extractErrorMessage"],"sourceRoot":"../../../src","sources":["ui/server.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA,MAAMA,aAAa,GAAGA,CAAA,KAAM,IAAI;AAChC,MAAMC,QAAQ,GAAGA,CAAA,MAAO,CAAC,CAAC,CAAC;AAC3B,MAAMC,iBAAiB,GAAG;EAAEC,OAAO,EAAE,IAAI;EAAEC,OAAO,EAAE;AAAM,CAAC;;AAE3D;AACA,OAAO,MAAMC,WAAW,GAAGL,aAAa;AACxC,OAAO,MAAMM,eAAe,GAAGN,aAAa;AAC5C,OAAO,MAAMO,QAAQ,GAAGP,aAAa;AACrC,OAAO,MAAMQ,QAAQ,GAAGR,aAAa;AACrC,OAAO,MAAMS,YAAY,GAAGT,aAAa;AACzC,OAAO,MAAMU,YAAY,GAAGV,aAAa;;AAEzC;AACA,OAAO,MAAMW,MAAM,GAAGV,QAAQ;;AAE9B;AACA,OAAO,MAAMW,OAAO,GAAGX,QAAQ;AAC/B,OAAO,MAAMY,SAAS,GAAGZ,QAAQ;AACjC,OAAO,MAAMa,UAAU,GAAGA,CAAA,KAAMZ,iBAAiB;;AAEjD;AACA,OAAO,MAAMa,aAAa,GAAGf,aAAa;;AAE1C;AACA,OAAO,MAAMgB,YAAY,GAAGf,QAAQ;AACpC,OAAO,MAAMgB,eAAe,GAAGhB,QAAQ;;AAEvC;AACA,OAAO,MAAMiB,KAAK,GAAGC,MAAM,CAACC,MAAM,CAC9B,MAAM,CAAC,CAAC,EACR;EACIC,OAAO,EAAEA,CAAA,KAAM,CAAC,CAAC;EACjBC,KAAK,EAAEA,CAAA,KAAM,CAAC,CAAC;EACfC,IAAI,EAAEA,CAAA,KAAM,CAAC,CAAC;EACdC,OAAO,EAAEA,CAAA,KAAM,CAAC,CAAC;EACjBC,OAAO,EAAEA,CAAA,KAAM,CAAC,CAAC;EACjBC,OAAO,EAAEA,CAAA,KAAM,CAAC;AACpB,CACJ,CAAC;;AAED;AACA,SACIC,eAAe,EACfC,qBAAqB,EACrBC,uBAAuB,EACvBC,mBAAmB,QAChB,0BAAuB","ignoreList":[]}

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

@@ -7,87 +7,17 @@
  * (`deviceId` + `deviceSecret`) per origin (web) / per device (native), and the
  * SDK re-mints the access token from that credential on cold boot. `@oxyhq/core`
  * owns the store shape + logic (`createWebAuthStateStore` /
- * `createNativeAuthStateStore`); this module only supplies the platform storage
+ * `createNativeAuthStateStore`); this module only selects the platform storage
  * seam:
  *
  *  - web  → `createWebAuthStateStore()` (localStorage, in-memory fallback).
  *  - native → `createNativeAuthStateStore(secureKV)` for the SESSION blob over
- *    `expo-secure-store` (AsyncStorage fallback).
- *
- * `expo-secure-store` is loaded via a runtime-computed dynamic import (the same
- * optional-native-module pattern `OxyProvider` uses for netinfo / keyboard
- * controller), so the web bundle never pulls it and a device without it falls
- * back to AsyncStorage rather than crashing.
+ *    the shared `createNativeSecureKeyValueStorage()` adapter
+ *    (`expo-secure-store`, AsyncStorage fallback).
  */
 import { createWebAuthStateStore, createNativeAuthStateStore } from '@oxyhq/core';
-import { createPlatformStorage, isReactNative } from "../utils/storageHelpers.js";
-
-// Variable indirection so Metro's static analyzer never traces expo-secure-store
-// into the web bundle; the module is native-only and optional.
-const SECURE_STORE_MODULE = 'expo-secure-store';
-let secureStorePromise = null;
-
-/**
- * Resolve the `expo-secure-store` module once (memoised), or `null` when it is
- * unavailable — callers then fall back to AsyncStorage. Never throws.
- */
-function loadSecureStore() {
-  if (!secureStorePromise) {
-    const moduleName = SECURE_STORE_MODULE;
-    secureStorePromise = import(moduleName).then(mod => {
-      if (typeof mod.getItemAsync === 'function' && typeof mod.setItemAsync === 'function' && typeof mod.deleteItemAsync === 'function') {
-        return {
-          getItemAsync: mod.getItemAsync.bind(mod),
-          setItemAsync: mod.setItemAsync.bind(mod),
-          deleteItemAsync: mod.deleteItemAsync.bind(mod)
-        };
-      }
-      return null;
-    }).catch(() => null);
-  }
-  return secureStorePromise;
-}
-
-/**
- * A native `NativeKeyValueStorage` that prefers `expo-secure-store` (encrypted
- * at rest) and falls back to AsyncStorage when SecureStore is not installed.
- * The SecureStore module is resolved lazily on first access so construction
- * stays synchronous.
- */
-function createNativeSecureKeyValueStorage() {
-  let asyncStorage = null;
-  const getAsyncStorage = async () => {
-    if (!asyncStorage) {
-      asyncStorage = await createPlatformStorage();
-    }
-    return asyncStorage;
-  };
-  return {
-    getItem: async key => {
-      const secure = await loadSecureStore();
-      if (secure) {
-        return secure.getItemAsync(key);
-      }
-      return (await getAsyncStorage()).getItem(key);
-    },
-    setItem: async (key, value) => {
-      const secure = await loadSecureStore();
-      if (secure) {
-        await secure.setItemAsync(key, value);
-        return;
-      }
-      await (await getAsyncStorage()).setItem(key, value);
-    },
-    removeItem: async key => {
-      const secure = await loadSecureStore();
-      if (secure) {
-        await secure.deleteItemAsync(key);
-        return;
-      }
-      await (await getAsyncStorage()).removeItem(key);
-    }
-  };
-}
+import { isReactNative } from "../utils/storageHelpers.js";
+import { createNativeSecureKeyValueStorage } from "./nativeSecureStorage.js";
 
 /**
  * Build the platform {@link AuthStateStore} for this runtime.

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

@@ -1 +1 @@
-{"version":3,"names":["createWebAuthStateStore","createNativeAuthStateStore","createPlatformStorage","isReactNative","SECURE_STORE_MODULE","secureStorePromise","loadSecureStore","moduleName","then","mod","getItemAsync","setItemAsync","deleteItemAsync","bind","catch","createNativeSecureKeyValueStorage","asyncStorage","getAsyncStorage","getItem","key","secure","setItem","value","removeItem","createPlatformAuthStateStore"],"sourceRoot":"../../../../src","sources":["ui/session/authStore.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createWebAuthStateStore","createNativeAuthStateStore","isReactNative","createNativeSecureKeyValueStorage","createPlatformAuthStateStore"],"sourceRoot":"../../../../src","sources":["ui/session/authStore.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SACEA,uBAAuB,EACvBC,0BAA0B,QAErB,aAAa;AACpB,SAASC,aAAa,QAAQ,4BAAyB;AACvD,SAASC,iCAAiC,QAAQ,0BAAuB;;AAEzE;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,4BAA4BA,CAAA,EAAmB;EAC7D,IAAI,CAACF,aAAa,CAAC,CAAC,EAAE;IACpB,OAAOF,uBAAuB,CAAC,CAAC;EAClC;EAEA,OAAOC,0BAA0B,CAACE,iCAAiC,CAAC,CAAC,CAAC;AACxE","ignoreList":[]}

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

@@ -30,14 +30,22 @@ import { createTokenTransport } from "./tokenTransport.js";
  *
  * The realtime socket uses bearer when authenticated, or deviceId+deviceSecret
  * when signed out (after the one-shot join redirect).
+ *
+ * `getPinnedAccountId` reports the account an IDENTITY-BOUND provider
+ * (`sessionMode: 'identity'`) is pinned to, and `null` for every account-mode
+ * provider — which is exactly the value `SessionClient` and the transport read
+ * when the option is absent, so account mode is unchanged. While it reports an
+ * account, the client tracks device state truthfully but never re-binds its
+ * bearer to the device's mutable active account.
  */
-export function createSessionClient(oxyServices, onUnauthenticated) {
+export function createSessionClient(oxyServices, onUnauthenticated, getPinnedAccountId) {
   const host = createSessionClientHost(oxyServices);
-  const transport = createTokenTransport(oxyServices);
+  const transport = createTokenTransport(oxyServices, getPinnedAccountId);
   const client = new SessionClient(host, {
     transport,
     socketFactory: io,
-    onUnauthenticated
+    onUnauthenticated,
+    getPinnedAccountId
   });
   return {
     client,

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

@@ -1 +1 @@
-{"version":3,"names":["io","SessionClient","createSessionClientHost","createTokenTransport","createSessionClient","oxyServices","onUnauthenticated","host","transport","client","socketFactory"],"sourceRoot":"../../../../src","sources":["ui/session/createSessionClient.ts"],"mappings":";;AAAA,SAASA,EAAE,QAAQ,kBAAkB;AACrC,SACEC,aAAa,EACbC,uBAAuB,QAGlB,aAAa;AACpB,SAASC,oBAAoB,QAAQ,qBAAkB;;AAEvD;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,OAAO,SAASC,mBAAmBA,CACjCC,WAAwB,EACxBC,iBAAwD,EAIxD;EACA,MAAMC,IAAI,GAAGL,uBAAuB,CAACG,WAAW,CAAC;EACjD,MAAMG,SAAS,GAAGL,oBAAoB,CAACE,WAAW,CAAC;EACnD,MAAMI,MAAM,GAAG,IAAIR,aAAa,CAACM,IAAI,EAAE;IAAEC,SAAS;IAAEE,aAAa,EAAEV,EAAE;IAAEM;EAAkB,CAAC,CAAC;EAC3F,OAAO;IAAEG,MAAM;IAAEF;EAAK,CAAC;AACzB","ignoreList":[]}
+{"version":3,"names":["io","SessionClient","createSessionClientHost","createTokenTransport","createSessionClient","oxyServices","onUnauthenticated","getPinnedAccountId","host","transport","client","socketFactory"],"sourceRoot":"../../../../src","sources":["ui/session/createSessionClient.ts"],"mappings":";;AAAA,SAASA,EAAE,QAAQ,kBAAkB;AACrC,SACEC,aAAa,EACbC,uBAAuB,QAGlB,aAAa;AACpB,SAASC,oBAAoB,QAAQ,qBAAkB;;AAEvD;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;AACA;AACA;AACA,OAAO,SAASC,mBAAmBA,CACjCC,WAAwB,EACxBC,iBAAwD,EACxDC,kBAAwC,EAIxC;EACA,MAAMC,IAAI,GAAGN,uBAAuB,CAACG,WAAW,CAAC;EACjD,MAAMI,SAAS,GAAGN,oBAAoB,CAACE,WAAW,EAAEE,kBAAkB,CAAC;EACvE,MAAMG,MAAM,GAAG,IAAIT,aAAa,CAACO,IAAI,EAAE;IACrCC,SAAS;IACTE,aAAa,EAAEX,EAAE;IACjBM,iBAAiB;IACjBC;EACF,CAAC,CAAC;EACF,OAAO;IAAEG,MAAM;IAAEF;EAAK,CAAC;AACzB","ignoreList":[]}