@oxyhq/services 22.12.4 → 22.12.7

package/lib/commonjs/notifications/deviceNotifications.js

@@ -0,0 +1,380 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getExpoPushToken = getExpoPushToken;
+exports.hasNotificationPermission = hasNotificationPermission;
+exports.installForegroundNotificationHandler = installForegroundNotificationHandler;
+exports.pushTokenPlatform = pushTokenPlatform;
+exports.requestNotificationPermission = requestNotificationPermission;
+exports.subscribeToNotificationResponses = subscribeToNotificationResponses;
+exports.takeLaunchNotificationData = takeLaunchNotificationData;
+var _core = require("@oxyhq/core");
+var _reactNative = require("react-native");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); } /**
+ * The ONE place `@oxyhq/services` touches `expo-notifications`.
+ *
+ * Every Oxy app that receives push needs the identical adapter — native-only,
+ * dynamically imported, reading the OS permission and minting an EXPO push
+ * token — so it lives here instead of being copied into each app. The
+ * bearer-authenticated transport (`registerPushToken` / `unregisterPushToken`)
+ * already lives in `@oxyhq/core`; core may never import an `expo-*` module, and
+ * this adapter is the Expo-side half that closes that gap.
+ *
+ * ## Native-only by construction
+ *
+ * Every entry point resolves its null/no-op result from `Platform.OS` BEFORE the
+ * dynamic `import()`, so a web bundle never requests `expo-notifications` at all.
+ * `expo-notifications` and `expo-constants` are OPTIONAL peer dependencies: an
+ * app that does not use push never installs them, and a build without them
+ * degrades to "notifications unavailable" rather than throwing at
+ * module-evaluation time.
+ *
+ * ## The token is an EXPO push token — never a raw device token
+ *
+ * {@link getExpoPushToken} calls `getExpoPushTokenAsync()`, which returns the
+ * `ExponentPushToken[…]` handle Expo's push service delivers through — the only
+ * form it accepts. `getDevicePushTokenAsync()` — the raw APNs/FCM token — is
+ * deliberately NOT used anywhere: registering one of those looks entirely
+ * successful (the row is stored, the endpoint returns 200) and then every push
+ * silently fails at delivery time. `@oxyhq/core`'s `registerPushToken` rejects a
+ * raw device token before sending, and this module is the reason it never has to.
+ *
+ * ## The payload is untrusted
+ *
+ * Nothing here surfaces a notification's `title` / `body` / `subtitle`. The only
+ * payload that leaves this module is the raw `content.data` — the routing keys —
+ * typed `unknown`, so a caller has to validate it before acting on it and there
+ * is no exported shape that invites rendering push-delivered text. The
+ * foreground handler likewise answers with a visibility verdict and nothing else.
+ */
+const log = (0, _core.createLogger)('deviceNotifications');
+function isRecord(value) {
+  return typeof value === 'object' && value !== null;
+}
+
+/**
+ * Load `expo-notifications`, or `null` when it cannot serve this platform/build.
+ *
+ * The web guard runs before the `import()`, so a web bundle never reaches for the
+ * native module. The dynamic import is intentional: the module registry caches
+ * it, so repeated calls are cheap and no module-level mutable cache is
+ * introduced here.
+ */
+async function loadNotifications() {
+  if (_reactNative.Platform.OS === 'web') {
+    return null;
+  }
+  try {
+    return await Promise.resolve().then(() => _interopRequireWildcard(require('expo-notifications')));
+  } catch (error) {
+    log.warn('expo-notifications is unavailable in this build — push is disabled', {
+      method: 'loadNotifications'
+    }, error);
+    return null;
+  }
+}
+
+/**
+ * The EAS project id an Expo push token is minted against, or `null` when the
+ * app config carries none.
+ *
+ * Resolved exactly the way `expo-notifications` resolves it internally
+ * (`easConfig.projectId`, then `expoConfig.extra.eas.projectId`) and then handed
+ * BACK to `getExpoPushTokenAsync` explicitly, so the two can never disagree.
+ * Reading it here is what turns "no project id" from an opaque
+ * `ERR_NOTIFICATIONS_NO_EXPERIENCE_ID` rejection into a named, actionable state
+ * instead of one more entry in the indistinguishable "permission denied /
+ * offline" bucket.
+ *
+ * A missing `expo-constants` lands on the same `null` outcome — the single
+ * actionable warning is emitted once by the caller, so this path only records
+ * the extra detail at debug level rather than warning twice for one condition.
+ */
+async function easProjectId() {
+  let constants;
+  try {
+    constants = (await Promise.resolve().then(() => _interopRequireWildcard(require('expo-constants')))).default;
+  } catch (error) {
+    log.debug('expo-constants is unavailable in this build — no EAS project id can be resolved', {
+      method: 'easProjectId'
+    }, error);
+    return null;
+  }
+  const fromEasConfig = constants.easConfig?.projectId;
+  if (typeof fromEasConfig === 'string' && fromEasConfig.length > 0) {
+    return fromEasConfig;
+  }
+  const extra = constants.expoConfig?.extra;
+  const eas = isRecord(extra) ? extra.eas : undefined;
+  const projectId = isRecord(eas) ? eas.projectId : undefined;
+  return typeof projectId === 'string' && projectId.length > 0 ? projectId : null;
+}
+
+/**
+ * The platform tag the push-token registry stores this installation under, or
+ * `null` on a platform Oxy does not deliver push to.
+ *
+ * Synchronous and import-free — the answer is a property of the bundle, not of
+ * any native module.
+ *
+ * Web is `null` on purpose: the registry accepts a `web` platform, but browser
+ * push needs a VAPID key + service-worker subscription no Oxy app has wired, so
+ * there is no token to register and claiming otherwise would store a row nothing
+ * can ever deliver to.
+ */
+function pushTokenPlatform() {
+  return _reactNative.Platform.OS === 'ios' || _reactNative.Platform.OS === 'android' ? _reactNative.Platform.OS : null;
+}
+
+/**
+ * Whether the OS notification permission is ALREADY granted.
+ *
+ * Never prompts, so an app can re-check on every cold boot without ever asking
+ * the user twice. Use {@link requestNotificationPermission} for the one place
+ * that is allowed to show the system dialog.
+ */
+async function hasNotificationPermission() {
+  const notifications = await loadNotifications();
+  if (!notifications) {
+    return false;
+  }
+  try {
+    const permissions = await notifications.getPermissionsAsync();
+    return permissions.granted === true;
+  } catch (error) {
+    log.warn('could not read the notification permission', {
+      method: 'hasNotificationPermission'
+    }, error);
+    return false;
+  }
+}
+
+/**
+ * Ensure the OS notification permission, prompting at most once.
+ *
+ * An installation that already answered the system dialog is never asked again:
+ * an already-granted permission resolves `true` without a second dialog, and a
+ * denial with `canAskAgain: false` resolves `false` without issuing a request
+ * the OS would silently ignore.
+ *
+ * @returns Whether notifications are granted once this call is done.
+ */
+async function requestNotificationPermission() {
+  const notifications = await loadNotifications();
+  if (!notifications) {
+    return false;
+  }
+  try {
+    const existing = await notifications.getPermissionsAsync();
+    if (existing.granted === true) {
+      return true;
+    }
+    if (existing.canAskAgain === false) {
+      return false;
+    }
+    const requested = await notifications.requestPermissionsAsync();
+    return requested.granted === true;
+  } catch (error) {
+    log.warn('the notification permission could not be resolved', {
+      method: 'requestNotificationPermission'
+    }, error);
+    return false;
+  }
+}
+
+/**
+ * This installation's Expo push token (`ExponentPushToken[…]`), or `null` when
+ * one cannot be minted.
+ *
+ * Deliberately `getExpoPushTokenAsync` — see the module header for why the raw
+ * device-token variant is never used.
+ *
+ * Every `null` is logged with the reason it happened. A missing EAS project id
+ * in particular is a BUILD MISCONFIGURATION, not a user state: no token can ever
+ * be minted, so push is off for every install of that build until the config is
+ * fixed. It is reported as such rather than blending into the
+ * indistinguishable "permission denied / offline" bucket.
+ */
+async function getExpoPushToken() {
+  const notifications = await loadNotifications();
+  if (!notifications) {
+    return null;
+  }
+  const projectId = await easProjectId();
+  if (!projectId) {
+    log.warn('no EAS project id in the app config (expo.extra.eas.projectId) — an Expo push token cannot be minted, so push is disabled for this build', {
+      method: 'getExpoPushToken'
+    });
+    return null;
+  }
+  try {
+    const token = await notifications.getExpoPushTokenAsync({
+      projectId
+    });
+    if (token.data.length === 0) {
+      log.warn('the Expo push service returned an empty token', {
+        method: 'getExpoPushToken'
+      });
+      return null;
+    }
+    return token.data;
+  } catch (error) {
+    log.warn('could not mint an Expo push token', {
+      method: 'getExpoPushToken'
+    }, error);
+    return null;
+  }
+}
+
+/**
+ * Take the payload of the notification that COLD-LAUNCHED the app, if any.
+ *
+ * "Take" is literal: the response is cleared from `expo-notifications` once
+ * read, so a listener attached later in the same launch is not handed the same
+ * tap again. Clearing is best-effort across OS/module versions, so a caller that
+ * must not act twice still needs its own idempotency ledger.
+ *
+ * @returns The raw, untrusted `content.data` of the launching notification, or
+ *   `null`. Parsing/validation is the caller's job.
+ */
+async function takeLaunchNotificationData() {
+  const notifications = await loadNotifications();
+  if (!notifications) {
+    return null;
+  }
+  try {
+    const response = notifications.getLastNotificationResponse();
+    if (!response) {
+      return null;
+    }
+    const data = response.notification.request.content.data;
+    try {
+      notifications.clearLastNotificationResponse();
+    } catch (clearError) {
+      log.warn('could not clear the launching notification response', {
+        method: 'takeLaunchNotificationData'
+      }, clearError);
+    }
+    return data;
+  } catch (error) {
+    log.warn('could not read the launching notification', {
+      method: 'takeLaunchNotificationData'
+    }, error);
+    return null;
+  }
+}
+
+/**
+ * What the OS should do with a notification that arrives while the app is
+ * FOREGROUNDED.
+ *
+ * `'suppress'` is `expo-notifications`' own default for a foregrounded app, so a
+ * decision function that only ever returns `'show'` for the payloads it
+ * recognises leaves every other notification exactly as it behaves today.
+ */
+
+/**
+ * Whether the process-wide foreground handler has already been ATTEMPTED.
+ *
+ * `setNotificationHandler` is global, last-writer-wins process state, so this is
+ * a one-shot install rather than something a mount/unmount cycle owns. A failed
+ * attempt is deliberately not retried: the only failure modes are permanent for
+ * the life of the process (web, a build without the native module, a native
+ * module that threw on registration).
+ *
+ * Module-scoped and only ever touched from an async install call — never read
+ * during render, so the React Compiler has no memoizable position to freeze it
+ * into.
+ */
+let foregroundHandlerAttempted = false;
+
+/**
+ * Install the ONE process-wide handler that decides whether an incoming
+ * notification is shown while the app is in the FOREGROUND.
+ *
+ * Without a handler, `expo-notifications` shows nothing at all while the app is
+ * open — which is exactly when a time-critical notification (a "Sign in with
+ * Oxy" approval request, say) matters most, because the user is already holding
+ * the phone.
+ *
+ * The handler ONLY decides visibility. It never navigates, never acts on the
+ * notification, and never reads the payload for display — `decide` is handed the
+ * raw, untrusted `content.data` and may answer nothing but `'show'` /
+ * `'suppress'`. Acting on a notification stays with a TAP, routed by
+ * {@link subscribeToNotificationResponses}. No notification actions/categories
+ * are registered here, so the banner cannot carry an action button.
+ *
+ * The one-shot latch is set BEFORE the first `await`, so concurrent callers
+ * cannot both reach `setNotificationHandler`.
+ *
+ * @param decide - Maps the raw, untrusted payload to a presentation verdict.
+ *   Must not throw; a throw is reported by the OS as a handling error and the
+ *   notification is dropped.
+ * @returns Whether a handler was installed by THIS call (`false` on a repeat
+ *   call, on web, or when the native module is unavailable).
+ */
+async function installForegroundNotificationHandler(decide) {
+  if (foregroundHandlerAttempted) {
+    return false;
+  }
+  foregroundHandlerAttempted = true;
+  const notifications = await loadNotifications();
+  if (!notifications) {
+    return false;
+  }
+  try {
+    notifications.setNotificationHandler({
+      handleNotification: async notification => {
+        const data = notification.request.content.data;
+        const show = decide(data) === 'show';
+        return {
+          // Banner: the whole point — make the notification visible on screen.
+          shouldShowBanner: show,
+          // Notification centre: so the user can still review it after
+          // dismissing the banner.
+          shouldShowList: show,
+          // No sound: the app is foregrounded, so the user is already looking at
+          // the screen the banner appears on.
+          shouldPlaySound: false,
+          // Badging is an app-level unread concept this adapter has no view of.
+          shouldSetBadge: false
+        };
+      }
+    });
+    return true;
+  } catch (error) {
+    log.warn('could not install the foreground notification handler', {
+      method: 'installForegroundNotificationHandler'
+    }, error);
+    return false;
+  }
+}
+
+/**
+ * Subscribe to notification TAPS (responses) while the app is running.
+ *
+ * @param listener - Receives the raw, untrusted `content.data` of the tapped
+ *   notification. Parsing/validation is the caller's job.
+ * @returns An unsubscribe function. Safe to call even if the subscription could
+ *   not be established.
+ */
+async function subscribeToNotificationResponses(listener) {
+  const notifications = await loadNotifications();
+  if (!notifications) {
+    return () => undefined;
+  }
+  try {
+    const subscription = notifications.addNotificationResponseReceivedListener(response => {
+      listener(response.notification.request.content.data);
+    });
+    return () => subscription.remove();
+  } catch (error) {
+    log.warn('could not subscribe to notification taps', {
+      method: 'subscribeToNotificationResponses'
+    }, error);
+    return () => undefined;
+  }
+}
+//# sourceMappingURL=deviceNotifications.js.map

package/lib/commonjs/notifications/deviceNotifications.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_core","require","_reactNative","_interopRequireWildcard","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","log","createLogger","isRecord","value","loadNotifications","Platform","OS","Promise","resolve","then","error","warn","method","easProjectId","constants","debug","fromEasConfig","easConfig","projectId","length","extra","expoConfig","eas","undefined","pushTokenPlatform","hasNotificationPermission","notifications","permissions","getPermissionsAsync","granted","requestNotificationPermission","existing","canAskAgain","requested","requestPermissionsAsync","getExpoPushToken","token","getExpoPushTokenAsync","data","takeLaunchNotificationData","response","getLastNotificationResponse","notification","request","content","clearLastNotificationResponse","clearError","foregroundHandlerAttempted","installForegroundNotificationHandler","decide","setNotificationHandler","handleNotification","show","shouldShowBanner","shouldShowList","shouldPlaySound","shouldSetBadge","subscribeToNotificationResponses","listener","subscription","addNotificationResponseReceivedListener","remove"],"sourceRoot":"../../../src","sources":["notifications/deviceNotifications.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/boot/runProviderColdBoot.js

@@ -10,6 +10,7 @@ var _deviceCredential = require("../utils/deviceCredential.js");
 var _crossOriginRestore = require("../utils/crossOriginRestore.js");
 var _oauthReturn = require("../utils/oauthReturn.js");
 var _isWebBrowser = require("../utils/isWebBrowser.js");
+var _legacyRedirectLanes = require("../oauth/legacyRedirectLanes.js");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /** How long the cold boot waits for the post-boot SessionClient handoff (ms). */
 const SESSION_HANDOFF_DEADLINE_MS = exports.SESSION_HANDOFF_DEADLINE_MS = 6000;
@@ -68,8 +69,18 @@ async function detectOfflineHint() {
  *
  * Ordered pipeline:
  * 1. Complete OAuth authorization-code return (web)
- * 2. `runSessionColdBoot` — device-secret mint (+ native shared-key)
+ * 2. `runSessionColdBoot` — device-secret mint (+ native shared-key, or the
+ *    primary-identity-key lane in `sessionMode: 'identity'`)
  * 3. Silent OAuth for all web apps when mint finds no session
+ *
+ * Steps 1 and 3 are ACCOUNT-MODE ONLY: both commit whichever account the IdP
+ * resolves, which for an identity-bound client is somebody else's account by
+ * construction. In `'identity'` mode the boot is exactly step 2.
+ *
+ * Step 3 is additionally REDIRECT-MODE ONLY: it navigates the top-level window
+ * with no user gesture behind it, which `webAuthMode: 'popup'` exists to
+ * eliminate. In popup mode the boot is steps 1 and 2, and a domain with no local
+ * credential simply resolves signed out. See `allowsAutomaticIdpRedirect`.
  */
 async function runProviderColdBoot(opts) {
   const {
@@ -78,17 +89,34 @@ async function runProviderColdBoot(opts) {
     clientId,
     authRedirectUri,
     authorizeBaseUrl,
+    sessionMode = 'account',
+    identity,
+    webAuthMode = 'redirect',
     sessionClient,
     syncDeviceCredentialToHost,
     commitSession,
     markAuthResolved,
     setTokenReady
   } = opts;
+  const identityBound = sessionMode === 'identity';
   setTokenReady(false);
   try {
+    // MODE-INDEPENDENT URL cleanup, deliberately so: both consume query params a
+    // PREVIOUS redirect-mode session left in the address bar (`?error=login_required`
+    // from a silent authorize, `?hub_sync=failed` from the hub) and restore the
+    // page the visit started on. Flipping an app to popup mode must not strand
+    // those params, so neither is gated on `webAuthMode`. Neither starts a
+    // navigation — they only rewrite the URL via `history.replaceState`.
     (0, _crossOriginRestore.consumeSilentOAuthError)();
     (0, _oauthReturn.consumeHubSyncFailure)();
-    const oauthCompleted = await (0, _oauthReturn.tryCompleteOAuthReturn)({
+
+    // The redirect transport's RETURN leg — also NOT gated on `webAuthMode`. A
+    // popup-mode app legitimately lands here with `?code=` whenever the browser
+    // blocked the popup and `startWebOAuthSignIn` fell back to a full-page
+    // redirect (`popup-blocked` / `popup-navigation-failed`), and an app that
+    // switched modes mid-flight must not be stranded with a dead `?code=`
+    // either. It consumes a code already on the URL; it never starts one.
+    const oauthCompleted = identityBound ? false : await (0, _oauthReturn.tryCompleteOAuthReturn)({
       oxyServices,
       clientId,
       authRedirectUri,
@@ -115,6 +143,8 @@ async function runProviderColdBoot(opts) {
         isWeb: (0, _isWebBrowser.isWebBrowser)(),
         isNative: !(0, _isWebBrowser.isWebBrowser)()
       },
+      sessionMode,
+      identity,
       overallDeadlineMs: COLD_BOOT_OVERALL_DEADLINE_MS,
       isOffline: () => offline,
       onStepDeadline: stepId => {
@@ -169,14 +199,26 @@ async function runProviderColdBoot(opts) {
       }
     });
 
-    // Silent cross-origin OAuth restore (web cross-app SSO). Gate it the SAME
-    // way the hub-sync WRITE side (`syncHubAfterSignIn`) gates: official web
-    // origins only, never the IdP hub itself, and — unlike the write side —
-    // never a loopback / local-dev origin (which must not be bounced to a hosted
-    // IdP on cold boot). The authorize endpoint is env-configurable so a
-    // local/staging app targets its own IdP instead of production.
+    // Silent cross-origin OAuth restore (web cross-app SSO): a full-page
+    // `prompt=none` bounce to the IdP when the mint found no local session.
+    //
+    // TRANSPORT gate (`allowsAutomaticIdpRedirect`): `webAuthMode: 'popup'`
+    // FORBIDS this lane. It navigates the top-level window with no user gesture
+    // behind it, which is precisely what popup mode exists to eliminate — a
+    // popup-mode domain without a local credential resolves signed out right
+    // here and waits for the user's next explicit "Continue with Oxy" (issue
+    // #691, "Cold boot and cross-domain behavior"). `'redirect'` — still the
+    // default and the compatibility path — reaches this lane unchanged, and this
+    // whole block disappears with the transport in phase 7b.
+    //
+    // ORIGIN gate: same as the hub-sync WRITE side (`syncHubAfterSignIn`) —
+    // official web origins only, never the IdP hub itself, and — unlike the
+    // write side — never a loopback / local-dev origin (which must not be
+    // bounced to a hosted IdP on cold boot). The authorize endpoint is
+    // env-configurable so a local/staging app targets its own IdP instead of
+    // production.
     const webOrigin = (0, _isWebBrowser.isWebBrowser)() ? globalThis.location?.origin : undefined;
-    if (clientId && outcome.kind !== 'session' && webOrigin && (0, _crossOriginRestore.isSilentRestoreEligibleOrigin)(webOrigin)) {
+    if (!identityBound && (0, _legacyRedirectLanes.allowsAutomaticIdpRedirect)(webAuthMode) && clientId && outcome.kind !== 'session' && webOrigin && (0, _crossOriginRestore.isSilentRestoreEligibleOrigin)(webOrigin)) {
       const redirected = await (0, _crossOriginRestore.maybeStartSilentOAuthRestore)({
         oxyServices,
         clientId,

package/lib/commonjs/ui/boot/runProviderColdBoot.js.map

@@ -1 +1 @@
-{"version":3,"names":["_core","require","_deviceCredential","_crossOriginRestore","_oauthReturn","_isWebBrowser","_interopRequireWildcard","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","SESSION_HANDOFF_DEADLINE_MS","exports","COLD_BOOT_OVERALL_DEADLINE_MS","OFFLINE_PROBE_TIMEOUT_MS","detectOfflineHint","isWebBrowser","online","globalThis","navigator","onLine","NetInfo","Promise","resolve","then","state","race","fetch","setTimeout","isConnected","runProviderColdBoot","opts","oxyServices","authStore","clientId","authRedirectUri","authorizeBaseUrl","sessionClient","syncDeviceCredentialToHost","commitSession","markAuthResolved","setTokenReady","consumeSilentOAuthError","consumeHubSyncFailure","oauthCompleted","tryCompleteOAuthReturn","input","activate","hubSync","offline","outcome","runSessionColdBoot","oxy","store","platform","isWeb","isNative","overallDeadlineMs","isOffline","onStepDeadline","stepId","loggerUtil","warn","component","method","onSession","session","handoff","sessionId","accessToken","userId","handoffDeadlineId","finally","undefined","clearTimeout","onSignedOut","cred","loadPersistedDeviceCredential","start","socketError","__DEV__","debug","onStepError","id","error","webOrigin","location","origin","kind","isSilentRestoreEligibleOrigin","redirected","maybeStartSilentOAuthRestore","redirectUri","Error","String"],"sourceRoot":"../../../../src","sources":["ui/boot/runProviderColdBoot.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_core","require","_deviceCredential","_crossOriginRestore","_oauthReturn","_isWebBrowser","_legacyRedirectLanes","_interopRequireWildcard","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","SESSION_HANDOFF_DEADLINE_MS","exports","COLD_BOOT_OVERALL_DEADLINE_MS","OFFLINE_PROBE_TIMEOUT_MS","detectOfflineHint","isWebBrowser","online","globalThis","navigator","onLine","NetInfo","Promise","resolve","then","state","race","fetch","setTimeout","isConnected","runProviderColdBoot","opts","oxyServices","authStore","clientId","authRedirectUri","authorizeBaseUrl","sessionMode","identity","webAuthMode","sessionClient","syncDeviceCredentialToHost","commitSession","markAuthResolved","setTokenReady","identityBound","consumeSilentOAuthError","consumeHubSyncFailure","oauthCompleted","tryCompleteOAuthReturn","input","activate","hubSync","offline","outcome","runSessionColdBoot","oxy","store","platform","isWeb","isNative","overallDeadlineMs","isOffline","onStepDeadline","stepId","loggerUtil","warn","component","method","onSession","session","handoff","sessionId","accessToken","userId","handoffDeadlineId","finally","undefined","clearTimeout","onSignedOut","cred","loadPersistedDeviceCredential","start","socketError","__DEV__","debug","onStepError","id","error","webOrigin","location","origin","allowsAutomaticIdpRedirect","kind","isSilentRestoreEligibleOrigin","redirected","maybeStartSilentOAuthRestore","redirectUri","Error","String"],"sourceRoot":"../../../../src","sources":["ui/boot/runProviderColdBoot.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/client.js

@@ -9,12 +9,6 @@ Object.defineProperty(exports, "FollowButton", {
     return _FollowButton.default;
   }
 });
-Object.defineProperty(exports, "FontLoader", {
-  enumerable: true,
-  get: function () {
-    return _FontLoader.FontLoader;
-  }
-});
 Object.defineProperty(exports, "LogoIcon", {
   enumerable: true,
   get: function () {
@@ -87,12 +81,6 @@ Object.defineProperty(exports, "isTimeoutOrNetworkError", {
     return _errorHandlers.isTimeoutOrNetworkError;
   }
 });
-Object.defineProperty(exports, "setupFonts", {
-  enumerable: true,
-  get: function () {
-    return _FontLoader.setupFonts;
-  }
-});
 Object.defineProperty(exports, "useAccountStore", {
   enumerable: true,
   get: function () {
@@ -136,7 +124,6 @@ var _LogoIcon = require("./components/logo/LogoIcon.js");
 var _LogoText = require("./components/logo/LogoText.js");
 var _FollowButton = _interopRequireDefault(require("./components/FollowButton.js"));
 var _OxyPayButton = _interopRequireDefault(require("./components/OxyPayButton.js"));
-var _FontLoader = require("./components/FontLoader");
 var _OxyContext = require("./context/OxyContext.js");
 var _useAuth = require("./hooks/useAuth.js");
 var _useFollow = require("./hooks/useFollow.js");

package/lib/commonjs/ui/client.js.map

@@ -1 +1 @@
-{"version":3,"names":["_OxyProvider","_interopRequireDefault","require","_OxySignInButton","_OxyAuthPrompt","_LogoIcon","_LogoText","_FollowButton","_OxyPayButton","_FontLoader","_OxyContext","_useAuth","_useFollow","_useStorage","_ProfileScreen","_ManageAccountScreen","_authStore","_accountStore","_errorHandlers","e","__esModule","default"],"sourceRoot":"../../../src","sources":["ui/client.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,IAAAA,YAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,cAAA,GAAAH,sBAAA,CAAAC,OAAA;AAEA,IAAAG,SAAA,GAAAH,OAAA;AACA,IAAAI,SAAA,GAAAJ,OAAA;AACA,IAAAK,aAAA,GAAAN,sBAAA,CAAAC,OAAA;AACA,IAAAM,aAAA,GAAAP,sBAAA,CAAAC,OAAA;AACA,IAAAO,WAAA,GAAAP,OAAA;AAGA,IAAAQ,WAAA,GAAAR,OAAA;AAGA,IAAAS,QAAA,GAAAT,OAAA;AAEA,IAAAU,UAAA,GAAAV,OAAA;AACA,IAAAW,WAAA,GAAAX,OAAA;AAIA,IAAAY,cAAA,GAAAb,sBAAA,CAAAC,OAAA;AACA,IAAAa,oBAAA,GAAAd,sBAAA,CAAAC,OAAA;AAGA,IAAAc,UAAA,GAAAd,OAAA;AACA,IAAAe,aAAA,GAAAf,OAAA;AAGA,IAAAgB,cAAA,GAAAhB,OAAA;AAK+B,SAAAD,uBAAAkB,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA","ignoreList":[]}
+{"version":3,"names":["_OxyProvider","_interopRequireDefault","require","_OxySignInButton","_OxyAuthPrompt","_LogoIcon","_LogoText","_FollowButton","_OxyPayButton","_OxyContext","_useAuth","_useFollow","_useStorage","_ProfileScreen","_ManageAccountScreen","_authStore","_accountStore","_errorHandlers","e","__esModule","default"],"sourceRoot":"../../../src","sources":["ui/client.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,IAAAA,YAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,cAAA,GAAAH,sBAAA,CAAAC,OAAA;AAEA,IAAAG,SAAA,GAAAH,OAAA;AACA,IAAAI,SAAA,GAAAJ,OAAA;AACA,IAAAK,aAAA,GAAAN,sBAAA,CAAAC,OAAA;AACA,IAAAM,aAAA,GAAAP,sBAAA,CAAAC,OAAA;AAGA,IAAAO,WAAA,GAAAP,OAAA;AAGA,IAAAQ,QAAA,GAAAR,OAAA;AAEA,IAAAS,UAAA,GAAAT,OAAA;AACA,IAAAU,WAAA,GAAAV,OAAA;AAIA,IAAAW,cAAA,GAAAZ,sBAAA,CAAAC,OAAA;AACA,IAAAY,oBAAA,GAAAb,sBAAA,CAAAC,OAAA;AAGA,IAAAa,UAAA,GAAAb,OAAA;AACA,IAAAc,aAAA,GAAAd,OAAA;AAGA,IAAAe,cAAA,GAAAf,OAAA;AAK+B,SAAAD,uBAAAiB,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA","ignoreList":[]}

package/lib/commonjs/ui/components/AvatarCameraBadge.js

@@ -5,9 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _reactNative = require("react-native");
-var _vectorIcons = require("@expo/vector-icons");
+var _Ionicons = _interopRequireDefault(require("@expo/vector-icons/Ionicons"));
 var _theme = require("@oxyhq/bloom/theme");
 var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * The camera overlay badge on a pressable avatar — the "tap to change your
  * photo" affordance. Shared verbatim by {@link ProfileSummaryCard} (ManageAccount
@@ -31,7 +32,7 @@ const AvatarCameraBadge = () => {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
     style: badgeStyle,
     className: "bg-fill-brand border-border-image",
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vectorIcons.Ionicons, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Ionicons.default, {
       name: "camera",
       size: 14,
       color: theme.colors.primaryForeground

package/lib/commonjs/ui/components/AvatarCameraBadge.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_vectorIcons","_theme","_jsxRuntime","badgeStyle","position","right","bottom","width","height","borderRadius","alignItems","justifyContent","borderWidth","AvatarCameraBadge","theme","useTheme","jsx","View","style","className","children","Ionicons","name","size","color","colors","primaryForeground","_default","exports","default"],"sourceRoot":"../../../../src","sources":["ui/components/AvatarCameraBadge.tsx"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AAA8C,IAAAG,WAAA,GAAAH,OAAA;AAE9C;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GACA,MAAMI,UAAqB,GAAG;EAC5BC,QAAQ,EAAE,UAAU;EACpBC,KAAK,EAAE,CAAC;EACRC,MAAM,EAAE,CAAC;EACTC,KAAK,EAAE,EAAE;EACTC,MAAM,EAAE,EAAE;EACVC,YAAY,EAAE,EAAE;EAChBC,UAAU,EAAE,QAAQ;EACpBC,cAAc,EAAE,QAAQ;EACxBC,WAAW,EAAE;AACf,CAAC;AAED,MAAMC,iBAA2B,GAAGA,CAAA,KAAM;EACxC,MAAMC,KAAK,GAAG,IAAAC,eAAQ,EAAC,CAAC;EACxB,oBACE,IAAAb,WAAA,CAAAc,GAAA,EAAClB,YAAA,CAAAmB,IAAI;IAACC,KAAK,EAAEf,UAAW;IAACgB,SAAS,EAAC,mCAAmC;IAAAC,QAAA,eACpE,IAAAlB,WAAA,CAAAc,GAAA,EAAChB,YAAA,CAAAqB,QAAQ;MAACC,IAAI,EAAC,QAAQ;MAACC,IAAI,EAAE,EAAG;MAACC,KAAK,EAAEV,KAAK,CAACW,MAAM,CAACC;IAAkB,CAAE;EAAC,CACvE,CAAC;AAEX,CAAC;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEahB,iBAAiB","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_Ionicons","_interopRequireDefault","_theme","_jsxRuntime","e","__esModule","default","badgeStyle","position","right","bottom","width","height","borderRadius","alignItems","justifyContent","borderWidth","AvatarCameraBadge","theme","useTheme","jsx","View","style","className","children","name","size","color","colors","primaryForeground","_default","exports"],"sourceRoot":"../../../../src","sources":["ui/components/AvatarCameraBadge.tsx"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,SAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,MAAA,GAAAH,OAAA;AAA8C,IAAAI,WAAA,GAAAJ,OAAA;AAAA,SAAAE,uBAAAG,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAE9C;AACA;AACA;AACA;AACA;AACA;AACA;AACA,GACA,MAAMG,UAAqB,GAAG;EAC5BC,QAAQ,EAAE,UAAU;EACpBC,KAAK,EAAE,CAAC;EACRC,MAAM,EAAE,CAAC;EACTC,KAAK,EAAE,EAAE;EACTC,MAAM,EAAE,EAAE;EACVC,YAAY,EAAE,EAAE;EAChBC,UAAU,EAAE,QAAQ;EACpBC,cAAc,EAAE,QAAQ;EACxBC,WAAW,EAAE;AACf,CAAC;AAED,MAAMC,iBAA2B,GAAGA,CAAA,KAAM;EACxC,MAAMC,KAAK,GAAG,IAAAC,eAAQ,EAAC,CAAC;EACxB,oBACE,IAAAhB,WAAA,CAAAiB,GAAA,EAACtB,YAAA,CAAAuB,IAAI;IAACC,KAAK,EAAEf,UAAW;IAACgB,SAAS,EAAC,mCAAmC;IAAAC,QAAA,eACpE,IAAArB,WAAA,CAAAiB,GAAA,EAACpB,SAAA,CAAAM,OAAQ;MAACmB,IAAI,EAAC,QAAQ;MAACC,IAAI,EAAE,EAAG;MAACC,KAAK,EAAET,KAAK,CAACU,MAAM,CAACC;IAAkB,CAAE;EAAC,CACvE,CAAC;AAEX,CAAC;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAzB,OAAA,GAEaW,iBAAiB","ignoreList":[]}

package/lib/commonjs/ui/components/OxyAccountDialogScreen.js

@@ -117,10 +117,16 @@ const OxyAccountDialogScreen = ({
 
 function headerCopy(view, accountCount, t) {
   switch (view) {
+    // The ACTIVE REQUEST. Its header is deliberately route-AGNOSTIC: Oxy picks
+    // the delivery route (QR here, a push to the user's phone, or opening
+    // Commons on this device — issue #691), so naming one of them in the bar
+    // would contradict the other two. The route-specific status line lives in
+    // the body, derived from `signIn.progress`, and is the only thing that
+    // describes HOW the request is travelling.
     case 'qr':
       return {
-        title: t('accountSwitcher.scanTitle') || 'Sign in with Oxy',
-        subtitle: t('accountSwitcher.scanSubtitle') || 'Scan with Commons on your phone.'
+        title: t('accountSwitcher.signInWithOxy') || 'Sign in with Oxy',
+        subtitle: null
       };
     case 'signup':
       return {
@@ -149,7 +155,12 @@ const EMPTY_SNAPSHOT = {
     authorizeCode: null,
     qrPayload: null,
     expiresAt: null,
-    error: null
+    error: null,
+    route: null,
+    routeFailed: false,
+    pushSentAt: null,
+    openedAt: null,
+    progress: 'idle'
   },
   commonsAvailability: 'unknown'
 };