@oxyhq/services 23.0.2 → 23.0.3

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

@@ -0,0 +1,122 @@
+"use strict";
+
+import { clearOAuthHandshake, consumeOAuthReturnPath, logger, canonicalizeOAuthRedirectUri, readOAuthHandshake } from '@oxyhq/core';
+import { completeOAuthCode } from "../oauth/completeOAuthCode.js";
+import { isWebBrowser } from "./isWebBrowser.js";
+
+/**
+ * When the RP lands with `?code=` after signing in at auth.oxy.so, exchange the
+ * code for a device-first session before cold boot runs.
+ *
+ * This is the REDIRECT transport's return leg. The SDK never starts a full-page
+ * authorize navigation on its own any more (#691 phase 7b), but this lane is
+ * still load-bearing: a browser-BLOCKED sign-in popup falls back to a full-page
+ * redirect (`startWebOAuthSignIn`), and that redirect comes back here.
+ *
+ * It owns only what is specific to a full-page round trip — reading the code off
+ * the URL, recovering the handshake `sessionStorage` carried across the
+ * navigation, and cleaning both up afterwards — and delegates state validation,
+ * the PKCE exchange, and the session commit to `completeOAuthCode`, the same
+ * function the popup transport runs.
+ *
+ * It is also the SINGLE cleanup path for an OAuth `error` landing on the URL:
+ * any `?error=…` (including an `error=login_required` left over from the
+ * now-deleted silent restore) is stripped along with `state` /
+ * `error_description`, and the stale PKCE handshake is cleared.
+ */
+export async function tryCompleteOAuthReturn(opts) {
+  if (!isWebBrowser()) return false;
+  const location = globalThis.location;
+  if (!location) return false;
+  const params = new URLSearchParams(location.search);
+  const code = params.get('code');
+  const oauthError = params.get('error');
+  if (oauthError) {
+    stripOAuthParamsFromUrl();
+    clearOAuthHandshake();
+    return false;
+  }
+  if (!code) return false;
+  const clientId = opts.clientId;
+  if (!clientId) {
+    logger.warn('OAuth return ignored: missing clientId', {
+      component: 'oauthReturn'
+    });
+    stripOAuthParamsFromUrl();
+    clearOAuthHandshake();
+    return false;
+  }
+  const handshake = readOAuthHandshake();
+  const redirectUri = canonicalizeOAuthRedirectUri(handshake?.redirectUri ?? opts.authRedirectUri ?? location.origin);
+  const result = await completeOAuthCode({
+    oxyServices: opts.oxyServices,
+    clientId,
+    code,
+    returnedState: params.get('state'),
+    handshake,
+    redirectUri,
+    commitSession: opts.commitSession,
+    // Strip the params before the commit so a stale `?code=` cannot re-enter the
+    // exchange loop, and read the return path FIRST — clearOAuthHandshake drops
+    // it along with the PKCE keys.
+    cleanup: () => {
+      stripOAuthParamsFromUrl();
+      clearOAuthHandshake();
+    }
+  });
+  return result.ok;
+}
+
+/**
+ * Rewrite the address bar after an authorize round trip, and tell the router.
+ *
+ * Prefers the page the visit started on (see `persistOAuthReturnPath`) over the
+ * bare origin the IdP redirected to, falling back to `fallbackUrl` when nothing
+ * was recorded.
+ *
+ * The `popstate` dispatch is the load-bearing part. `history.replaceState`
+ * fires no event, and cold boot runs *inside* the mounted app — by the time
+ * this executes, a history-based router (React Router, Vue Router, …) has
+ * already read `location` and rendered the route for `/`. Without a
+ * notification the address bar would show the restored deep link while the page
+ * still displayed the home page. `popstate` is the event the History API
+ * defines for exactly this, and it is what those routers subscribe to.
+ *
+ * Only dispatched when the URL actually changed, so the common no-op case does
+ * not push a spurious event at every listener on the page.
+ */
+export function replaceUrlAfterOAuthReturn(fallbackUrl) {
+  const location = globalThis.location;
+  const history = globalThis.history;
+  if (!location || !history?.replaceState) return;
+  const current = `${location.pathname}${location.search}${location.hash}`;
+  const target = consumeOAuthReturnPath() ?? fallbackUrl;
+  history.replaceState(history.state, '', target);
+  if (target === current) return;
+  const dispatch = globalThis.dispatchEvent;
+  if (typeof dispatch !== 'function') return;
+  try {
+    // `PopStateEvent` is web-only; plain `Event` is a good enough carrier for
+    // any host that lacks it (routers read `location`, not `event.state`).
+    const event = typeof PopStateEvent === 'function' ? new PopStateEvent('popstate', {
+      state: history.state
+    }) : new Event('popstate');
+    dispatch.call(globalThis, event);
+  } catch (error) {
+    logger.warn('Could not notify router of restored URL', {
+      component: 'oauthReturn'
+    }, error);
+  }
+}
+function stripOAuthParamsFromUrl() {
+  const location = globalThis.location;
+  const history = globalThis.history;
+  if (!location || !history?.replaceState) return;
+  const url = new URL(location.href);
+  url.searchParams.delete('code');
+  url.searchParams.delete('state');
+  url.searchParams.delete('error');
+  url.searchParams.delete('error_description');
+  replaceUrlAfterOAuthReturn(`${url.pathname}${url.search}${url.hash}`);
+}
+//# sourceMappingURL=oauthReturn.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["clearOAuthHandshake","consumeOAuthReturnPath","logger","canonicalizeOAuthRedirectUri","readOAuthHandshake","completeOAuthCode","isWebBrowser","tryCompleteOAuthReturn","opts","location","globalThis","params","URLSearchParams","search","code","get","oauthError","stripOAuthParamsFromUrl","clientId","warn","component","handshake","redirectUri","authRedirectUri","origin","result","oxyServices","returnedState","commitSession","cleanup","ok","replaceUrlAfterOAuthReturn","fallbackUrl","history","replaceState","current","pathname","hash","target","state","dispatch","dispatchEvent","event","PopStateEvent","Event","call","error","url","URL","href","searchParams","delete"],"sourceRoot":"../../../../src","sources":["ui/utils/oauthReturn.ts"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,55 @@
+"use strict";
+
+/**
+ * Service type for session helpers.
+ * Uses 'unknown' to work around TypeScript mixin composition type inference issues.
+ * The OxyServices class has these methods but TypeScript can't see them due to the mixin pattern.
+ * Methods are accessed dynamically, so callers must pass a properly typed instance.
+ */
+// biome-ignore lint/suspicious/noExplicitAny: OxyServices methods are accessed dynamically due to mixin composition; TypeScript cannot infer the full type
+
+/**
+ * Normalize backend session payloads into `ClientSession` objects.
+ *
+ * @param sessions - Raw session array returned from the API
+ * @param fallbackDeviceId - Device identifier to use when missing from payload
+ * @param fallbackUserId - User identifier to use when missing from payload
+ */
+export const mapSessionsToClient = (sessions, fallbackDeviceId, fallbackUserId) => {
+  const now = new Date();
+  return sessions.map(session => ({
+    sessionId: session.sessionId,
+    deviceId: session.deviceId || fallbackDeviceId || '',
+    expiresAt: session.expiresAt || new Date(now.getTime() + 7 * 24 * 60 * 60 * 1000).toISOString(),
+    lastActive: session.lastActive || now.toISOString(),
+    userId: session.user?.id || session.userId || (session.user?._id ? session.user._id.toString() : undefined) || fallbackUserId || '',
+    isCurrent: Boolean(session.isCurrent)
+  }));
+};
+
+/**
+ * Fetch device sessions, falling back to the per-user session endpoint
+ * if the device endpoint is unavailable (older API versions or disabled
+ * device-grouping feature flag).
+ *
+ * @param oxyServices - Oxy service instance
+ * @param sessionId - Session identifier to fetch
+ * @param options - Optional fallback options
+ */
+export const fetchSessionsWithFallback = async (oxyServices, sessionId, {
+  fallbackDeviceId,
+  fallbackUserId,
+  logger
+} = {}) => {
+  try {
+    const deviceSessions = await oxyServices.getDeviceSessions(sessionId);
+    return mapSessionsToClient(deviceSessions, fallbackDeviceId, fallbackUserId);
+  } catch (error) {
+    if (__DEV__ && logger) {
+      logger('Failed to get device sessions, falling back to user sessions', error);
+    }
+    const userSessions = await oxyServices.getSessionsBySessionId(sessionId);
+    return mapSessionsToClient(userSessions, fallbackDeviceId, fallbackUserId);
+  }
+};
+//# sourceMappingURL=sessionHelpers.js.map

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

@@ -0,0 +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"],"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/ui/utils/storageHelpers.js

@@ -0,0 +1,111 @@
+"use strict";
+
+/**
+ * Create an in-memory storage implementation used as a safe fallback.
+ */
+const MEMORY_STORAGE = () => {
+  const store = new Map();
+  return {
+    async getItem(key) {
+      return store.get(key) ?? null;
+    },
+    async setItem(key, value) {
+      store.set(key, value);
+    },
+    async removeItem(key) {
+      store.delete(key);
+    },
+    async clear() {
+      store.clear();
+    }
+  };
+};
+
+/**
+ * Create a web storage implementation backed by `localStorage`.
+ * Falls back to in-memory storage when unavailable.
+ */
+const createWebStorage = () => {
+  if (typeof window === 'undefined' || typeof window.localStorage === 'undefined') {
+    return MEMORY_STORAGE();
+  }
+  return {
+    async getItem(key) {
+      try {
+        return window.localStorage.getItem(key);
+      } catch {
+        return null;
+      }
+    },
+    async setItem(key, value) {
+      try {
+        window.localStorage.setItem(key, value);
+      } catch {
+        // Ignore quota or access issues for now.
+      }
+    },
+    async removeItem(key) {
+      try {
+        window.localStorage.removeItem(key);
+      } catch {
+        // Ignore failures.
+      }
+    },
+    async clear() {
+      try {
+        window.localStorage.clear();
+      } catch {
+        // Ignore failures.
+      }
+    }
+  };
+};
+let asyncStorageInstance = null;
+
+/**
+ * Lazily import React Native AsyncStorage implementation.
+ */
+const createNativeStorage = async () => {
+  if (asyncStorageInstance) {
+    return asyncStorageInstance;
+  }
+  try {
+    const asyncStorageModule = await import('@react-native-async-storage/async-storage');
+    asyncStorageInstance = asyncStorageModule.default;
+    return asyncStorageInstance;
+  } catch (error) {
+    if (__DEV__) {
+      console.error('Failed to import AsyncStorage:', error);
+    }
+    throw new Error('AsyncStorage is required in React Native environment');
+  }
+};
+
+/**
+ * Detect whether the current runtime is React Native.
+ */
+export const isReactNative = () => typeof navigator !== 'undefined' && navigator.product === 'ReactNative';
+
+/**
+ * Create a platform-appropriate storage implementation.
+ * Defaults to in-memory storage when no platform storage is available.
+ */
+export const createPlatformStorage = async () => {
+  if (isReactNative()) {
+    return createNativeStorage();
+  }
+  return createWebStorage();
+};
+export const STORAGE_KEY_PREFIX = 'oxy_session';
+
+/**
+ * Produce strongly typed storage key names for the supplied prefix.
+ *
+ * @param prefix - Storage key prefix
+ */
+export const getStorageKeys = (prefix = STORAGE_KEY_PREFIX) => ({
+  activeSessionId: `${prefix}_active_session_id`,
+  sessionIds: `${prefix}_session_ids`,
+  language: `${prefix}_language`
+});
+//# sourceMappingURL=storageHelpers.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["MEMORY_STORAGE","store","Map","getItem","key","get","setItem","value","set","removeItem","delete","clear","createWebStorage","window","localStorage","asyncStorageInstance","createNativeStorage","asyncStorageModule","default","error","__DEV__","console","Error","isReactNative","navigator","product","createPlatformStorage","STORAGE_KEY_PREFIX","getStorageKeys","prefix","activeSessionId","sessionIds","language"],"sourceRoot":"../../../../src","sources":["ui/utils/storageHelpers.ts"],"mappings":"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","ignoreList":[]}

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

@@ -0,0 +1,64 @@
+"use strict";
+
+/**
+ * User display name and date formatting utilities.
+ *
+ * The display-name helpers are thin wrappers around the canonical
+ * `getAccountDisplayName` in `@oxyhq/core`, which handles all the edge cases
+ * (missing username, missing name, fallback to truncated `publicKey`, i18n).
+ */
+
+import { getAccountDisplayName as coreGetAccountDisplayName } from '@oxyhq/core';
+
+/**
+ * Formats a date string to a readable format (e.g., "Feb 21, 2025")
+ */
+export const formatDate = dateString => {
+  if (!dateString) return '';
+  try {
+    const date = dateString instanceof Date ? dateString : new Date(dateString);
+    if (Number.isNaN(date.getTime())) return '';
+    return date.toLocaleDateString('en-US', {
+      month: 'short',
+      day: 'numeric',
+      year: 'numeric'
+    });
+  } catch {
+    return '';
+  }
+};
+
+/**
+ * Gets a display name from user data.
+ *
+ * Prefers full name → composed first+last → username → `Account 0x12345678…`
+ * (derived from publicKey) → translated "Unnamed".
+ *
+ * @param user - User-like object with optional name/username/publicKey
+ * @param locale - Optional locale for the final fallback label
+ */
+export const getDisplayName = (user, locale) => coreGetAccountDisplayName(user, locale);
+
+/**
+ * Gets a short display name (first name or username).
+ *
+ * Used for compact UI (e.g. greetings). Falls back to the full display name
+ * helper, which also handles publicKey-only accounts.
+ */
+export const getShortDisplayName = (user, locale) => {
+  if (!user) return coreGetAccountDisplayName(user, locale);
+  const name = user.name;
+  if (name && typeof name === 'object') {
+    const first = typeof name.first === 'string' ? name.first.trim() : '';
+    if (first) return first;
+    const full = typeof name.full === 'string' ? name.full.trim() : '';
+    if (full) return full.split(' ')[0];
+  } else if (typeof name === 'string' && name.trim()) {
+    return name.trim().split(' ')[0];
+  }
+  if (typeof user.username === 'string' && user.username.trim()) return user.username.trim();
+
+  // Defer to the canonical helper for publicKey/unnamed fallbacks.
+  return coreGetAccountDisplayName(user, locale);
+};
+//# sourceMappingURL=userUtils.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["getAccountDisplayName","coreGetAccountDisplayName","formatDate","dateString","date","Date","Number","isNaN","getTime","toLocaleDateString","month","day","year","getDisplayName","user","locale","getShortDisplayName","name","first","trim","full","split","username"],"sourceRoot":"../../../../src","sources":["ui/utils/userUtils.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,SACEA,qBAAqB,IAAIC,yBAAyB,QAE7C,aAAa;;AAEpB;AACA;AACA;AACA,OAAO,MAAMC,UAAU,GAAIC,UAA4C,IAAa;EAClF,IAAI,CAACA,UAAU,EAAE,OAAO,EAAE;EAE1B,IAAI;IACF,MAAMC,IAAI,GAAGD,UAAU,YAAYE,IAAI,GAAGF,UAAU,GAAG,IAAIE,IAAI,CAACF,UAAU,CAAC;IAC3E,IAAIG,MAAM,CAACC,KAAK,CAACH,IAAI,CAACI,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE;IAE3C,OAAOJ,IAAI,CAACK,kBAAkB,CAAC,OAAO,EAAE;MACtCC,KAAK,EAAE,OAAO;MACdC,GAAG,EAAE,SAAS;MACdC,IAAI,EAAE;IACR,CAAC,CAAC;EACJ,CAAC,CAAC,MAAM;IACN,OAAO,EAAE;EACX;AACF,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,cAAc,GAAGA,CAC5BC,IAA6C,EAC7CC,MAAe,KACJd,yBAAyB,CAACa,IAAI,EAAEC,MAAM,CAAC;;AAEpD;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,mBAAmB,GAAGA,CACjCF,IAA6C,EAC7CC,MAAe,KACJ;EACX,IAAI,CAACD,IAAI,EAAE,OAAOb,yBAAyB,CAACa,IAAI,EAAEC,MAAM,CAAC;EAEzD,MAAME,IAAI,GAAGH,IAAI,CAACG,IAAI;EACtB,IAAIA,IAAI,IAAI,OAAOA,IAAI,KAAK,QAAQ,EAAE;IACpC,MAAMC,KAAK,GAAG,OAAOD,IAAI,CAACC,KAAK,KAAK,QAAQ,GAAGD,IAAI,CAACC,KAAK,CAACC,IAAI,CAAC,CAAC,GAAG,EAAE;IACrE,IAAID,KAAK,EAAE,OAAOA,KAAK;IACvB,MAAME,IAAI,GAAG,OAAOH,IAAI,CAACG,IAAI,KAAK,QAAQ,GAAGH,IAAI,CAACG,IAAI,CAACD,IAAI,CAAC,CAAC,GAAG,EAAE;IAClE,IAAIC,IAAI,EAAE,OAAOA,IAAI,CAACC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;EACrC,CAAC,MAAM,IAAI,OAAOJ,IAAI,KAAK,QAAQ,IAAIA,IAAI,CAACE,IAAI,CAAC,CAAC,EAAE;IAClD,OAAOF,IAAI,CAACE,IAAI,CAAC,CAAC,CAACE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;EAClC;EAEA,IAAI,OAAOP,IAAI,CAACQ,QAAQ,KAAK,QAAQ,IAAIR,IAAI,CAACQ,QAAQ,CAACH,IAAI,CAAC,CAAC,EAAE,OAAOL,IAAI,CAACQ,QAAQ,CAACH,IAAI,CAAC,CAAC;;EAE1F;EACA,OAAOlB,yBAAyB,CAACa,IAAI,EAAEC,MAAM,CAAC;AAChD,CAAC","ignoreList":[]}