@oxyhq/core 11.0.1 → 12.1.0

package/dist/esm/index.js

@@ -10,7 +10,7 @@
  * ```ts
  * import { OxyServices, oxyClient } from '@oxyhq/core';
  *
- * const user = await oxyClient.signIn(publicKey);
+ * const user = await oxyClient.getCurrentUser();
  * ```
  *
  * Every export below is NOMINAL — no `export *`, no barrels, no compat shims.
@@ -140,7 +140,7 @@ export { runColdBoot } from './utils/coldBoot.js';
 // Standard OAuth against auth.oxy.so/authorize — no FedCM/cookies/SSO bounce.
 // ---------------------------------------------------------------------------
 export { buildOAuthAuthorizeUrl, computeCodeChallenge, generateOAuthState, generatePkcePair, DEFAULT_OAUTH_SCOPE, OXY_AUTHORIZE_URL, OXY_OAUTH_STATE_STORAGE_KEY, OXY_OAUTH_CODE_VERIFIER_STORAGE_KEY, OXY_SILENT_OAUTH_ATTEMPTED_KEY, OXY_CROSS_ORIGIN_RESTORE_ATTEMPTED_KEY, normalizeOAuthRedirectUri, persistOAuthHandshake, readOAuthHandshake, clearOAuthHandshake, } from './utils/oauthPkce.js';
-export { buildIdpHubOrigin, buildHubSyncUrl, isIdpHubOrigin, isOfficialWebOrigin, isAllowedDeviceJoinOrigin, normalizeOfficialReturnOrigin, parseHubSyncReturnUrl, } from './utils/officialOrigins.js';
+export { buildIdpHubOrigin, buildHubSyncUrl, isIdpHubOrigin, isLoopbackOrigin, isOfficialWebOrigin, isAllowedDeviceJoinOrigin, normalizeOfficialReturnOrigin, parseHubSyncReturnUrl, } from './utils/officialOrigins.js';
 export { syncHubAfterSignIn, redeemHubTicketOnHub, } from './session/hubSync.js';
 // ---------------------------------------------------------------------------
 // Session sync (device-scoped multi-account session client)
@@ -161,9 +161,10 @@ export { deviceStateToClientSessions, activeSessionIdOf, activeUserOf, accountId
 export { projectSwitchableAccounts, switchableAccountIds, } from './session/accountProjection.js';
 // Headless controller for the unified account dialog. Framework-agnostic
 // state machine + subscribe/getSnapshot store (bind via `useSyncExternalStore`)
-// — no password/2FA logic (that lives at the IdP; `openPasswordAtOxyAuth` only
-// hands off). Reuses `SessionClient.switchAccount` / `oxyServices.switchToAccount`
-// for the uniform switch and the existing device-flow methods for sign-in.
+// — sign-in is passkey (WebAuthn) or the Commons QR / shared-keychain handoff;
+// password, social login, and 2FA were removed ecosystem-wide. Reuses
+// `SessionClient.switchAccount` / `oxyServices.switchToAccount` for the uniform
+// switch and the existing device-flow methods for sign-in.
 export { AccountDialogController, createAccountDialogController, } from './session/accountDialogController.js';
 // ---------------------------------------------------------------------------
 // Device-first session machinery (zero-cookie transport).

package/dist/esm/mixins/OxyServices.auth.js

@@ -736,117 +736,6 @@ export function OxyServicesAuthMixin(Base) {
                 throw this.handleError(error);
             }
         }
-        /**
-         * Register a new user with email/username and password
-         */
-        async signUp(username, email, password, deviceName, deviceFingerprint) {
-            try {
-                const session = await this.makeRequest('POST', '/auth/signup', {
-                    username,
-                    email,
-                    password,
-                    deviceName,
-                    deviceFingerprint,
-                }, { cache: false });
-                return {
-                    ...session,
-                    user: normalizeUserIdentity(session.user),
-                };
-            }
-            catch (error) {
-                throw this.handleError(error);
-            }
-        }
-        /**
-         * Sign in with email or username and password
-         */
-        async signIn(identifier, password, deviceName, deviceFingerprint) {
-            try {
-                const session = await this.makeRequest('POST', '/auth/login', {
-                    identifier,
-                    password,
-                    deviceName,
-                    deviceFingerprint,
-                }, { cache: false });
-                return {
-                    ...session,
-                    user: normalizeUserIdentity(session.user),
-                };
-            }
-            catch (error) {
-                throw this.handleError(error);
-            }
-        }
-        /**
-         * Convenience helper for email sign-in
-         */
-        async signInWithEmail(email, password, deviceName, deviceFingerprint) {
-            return this.signIn(email, password, deviceName, deviceFingerprint);
-        }
-        /**
-         * Device-first password sign-in. Unlike the legacy {@link signIn} (which
-         * assumes a one-step session and is kept intact for existing callers until
-         * the F4 cutover), this returns the FULL `POST /auth/login` contract — the
-         * discriminated {@link LoginResult}: either a 2FA challenge
-         * (`{ twoFactorRequired, loginToken }`) to complete via
-         * {@link completeTwoFactorSignIn}, or a session arm.
-         *
-         * On the session arm, a returned access token is planted immediately
-         * (mirroring {@link verifyChallenge}), so the caller has an authenticated
-         * client without a second round-trip. The response's `deviceId` +
-         * `deviceSecret` are the zero-cookie restore credential the caller persists.
-         */
-        async passwordSignIn(identifier, password, options = {}) {
-            try {
-                const res = await this.makeRequest('POST', '/auth/login', {
-                    identifier,
-                    password,
-                    deviceName: options.deviceName,
-                    deviceFingerprint: options.deviceFingerprint,
-                    ...(options.deviceId ? { deviceId: options.deviceId } : {}),
-                }, { cache: false });
-                const parsed = safeParseContract(loginResultSchema, res);
-                if (!parsed) {
-                    throw new Error('auth/login returned an unexpected response shape');
-                }
-                if (!('twoFactorRequired' in parsed) && parsed.accessToken) {
-                    this.setTokens(parsed.accessToken);
-                }
-                return parsed;
-            }
-            catch (error) {
-                throw this.handleError(error);
-            }
-        }
-        /**
-         * Complete a 2FA-gated sign-in started by {@link passwordSignIn}. Presents
-         * the short-lived `loginToken` with either a TOTP `token` or a `backupCode`
-         * to `POST /security/2fa/verify-login`, which must resolve to the session
-         * arm of {@link LoginResult} (a second 2FA challenge here is a protocol
-         * error). A returned access token is planted immediately.
-         */
-        async completeTwoFactorSignIn(params) {
-            try {
-                const res = await this.makeRequest('POST', '/security/2fa/verify-login', {
-                    loginToken: params.loginToken,
-                    token: params.token,
-                    backupCode: params.backupCode,
-                    deviceName: params.deviceName,
-                    ...(params.deviceId ? { deviceId: params.deviceId } : {}),
-                }, { cache: false });
-                const parsed = safeParseContract(loginResultSchema, res);
-                if (!parsed || 'twoFactorRequired' in parsed) {
-                    throw new Error('security/2fa/verify-login returned an unexpected response shape');
-                }
-                if (parsed.accessToken) {
-                    this.setTokens(parsed.accessToken);
-                }
-                return parsed;
-            }
-            catch (error) {
-                throw this.handleError(error);
-            }
-        }
         /**
          * Begin a WebAuthn / passkey REGISTRATION ceremony. Requests the
          * `PublicKeyCredentialCreationOptions` the browser's `navigator.credentials
@@ -891,7 +780,7 @@ export function OxyServicesAuthMixin(Base) {
                         if (!parsed) {
                             throw new Error('auth/webauthn/register/verify returned an unexpected response shape');
                         }
-                        if (!('twoFactorRequired' in parsed) && parsed.accessToken) {
+                        if (parsed.accessToken) {
                             this.setTokens(parsed.accessToken);
                         }
                         return parsed;
@@ -929,9 +818,9 @@ export function OxyServicesAuthMixin(Base) {
          * Finish a WebAuthn / passkey AUTHENTICATION ceremony. Forwards the opaque
          * browser `AuthenticationResponseJSON` (`response`) alongside the
          * device-session envelope. Resolves to the SAME {@link LoginResult} contract
-         * as `POST /auth/verify`; on the session arm the access token is planted
-         * immediately (mirroring {@link passwordSignIn}), and the response's
-         * `deviceId` + `deviceSecret` are the zero-cookie restore credential.
+         * as `POST /auth/verify`; the access token is planted immediately, and the
+         * response's `deviceId` + `deviceSecret` are the zero-cookie restore
+         * credential.
          */
         async webauthnLoginVerify(response, envelope = {}) {
             try {
@@ -940,7 +829,7 @@ export function OxyServicesAuthMixin(Base) {
                 if (!parsed) {
                     throw new Error('auth/webauthn/login/verify returned an unexpected response shape');
                 }
-                if (!('twoFactorRequired' in parsed) && parsed.accessToken) {
+                if (parsed.accessToken) {
                     this.setTokens(parsed.accessToken);
                 }
                 return parsed;
@@ -951,7 +840,7 @@ export function OxyServicesAuthMixin(Base) {
         }
         /**
          * Exchange an OAuth authorization code (returned to the RP redirect URI
-         * after password sign-in at auth.oxy.so) for a device-first session.
+         * after sign-in at auth.oxy.so) for a device-first session.
          * Public first-party clients use PKCE (`codeVerifier`); the access token is
          * planted immediately on success.
          */

package/dist/esm/mixins/OxyServices.identity.js

@@ -100,15 +100,15 @@ export function OxyServicesIdentityMixin(Base) {
             }
         }
         /**
-         * Link password authentication to the current account. Adds a `password`
-         * auth method (does not remove existing methods).
+         * Unlink an authentication method from the current account. The server
+         * refuses to remove the last remaining method (the account would become
+         * inaccessible). Unlinking `identity` downgrades the account to custodial.
          *
-         * @param email - The email to associate with password auth.
-         * @param password - The new password (server enforces strength rules).
+         * @param type - The auth-method type to remove.
          */
-        async linkPassword(email, password) {
+        async unlinkAuthMethod(type) {
             try {
-                const result = await this.makeRequest('POST', '/auth/link', { type: 'password', email, password }, { cache: false });
+                const result = await this.makeRequest('DELETE', `/auth/link/${encodeURIComponent(type)}`, undefined, { cache: false });
                 this._invalidateIdentityCaches(this.getCurrentUserId());
                 return result;
             }
@@ -117,15 +117,19 @@ export function OxyServicesIdentityMixin(Base) {
             }
         }
         /**
-         * Unlink an authentication method from the current account. The server
-         * refuses to remove the last remaining method (the account would become
-         * inaccessible). Unlinking `identity` downgrades the account to custodial.
+         * Remove ONE passkey (WebAuthn credential) from the current account.
          *
-         * @param type - The auth-method type to remove.
+         * Passkeys are per-credential, so unlike {@link unlinkAuthMethod} (which
+         * removes an auth method by type) this targets a specific credential id.
+         * The server refuses to remove the last remaining auth method (the account
+         * would become inaccessible) and deletes the stored `WebauthnCredential`.
+         *
+         * @param credentialId - The passkey's public credential id
+         *   (`AuthMethodEntry.credentialId`).
          */
-        async unlinkAuthMethod(type) {
+        async removePasskey(credentialId) {
             try {
-                const result = await this.makeRequest('DELETE', `/auth/link/${encodeURIComponent(type)}`, undefined, { cache: false });
+                const result = await this.makeRequest('DELETE', `/auth/link/webauthn/${encodeURIComponent(credentialId)}`, undefined, { cache: false });
                 this._invalidateIdentityCaches(this.getCurrentUserId());
                 return result;
             }

package/dist/esm/session/accountDialogController.js

@@ -12,23 +12,26 @@
  *   - the unified account list (via {@link projectSwitchableAccounts}), fetched
  *     from `SessionClient` state ∪ `oxyServices.listAccounts()` and hydrated
  *     with `oxyServices.getUsersByIds()`;
- *   - the dialog `view` state machine (`accounts` | `signin` | `qr` | `add`);
+ *   - the dialog `view` state machine (`accounts` | `signin` | `qr` | `add` |
+ *     `signup`);
  *   - `switchTo` (the uniform switch: `SessionClient.switchAccount` for an
  *     account already on the device, `oxyServices.switchToAccount` to mint on
  *     first entry into a graph account — reusing the existing SDK primitives, no
  *     new switch path);
  *   - the "Sign in with Oxy" device flow (same-device shared-keychain via
  *     `oxyServices.signInWithSharedIdentity`, else the cross-device QR handoff
- *     via `startCommonsSignIn` → poll → `claimSessionByToken`).
+ *     via `startCommonsSignIn` → poll → `claimSessionByToken`);
+ *   - `commonsAvailability` — whether Commons is installed on this device
+ *     (native only, via the injected `canOpenApp` probe), so the QR view can
+ *     offer a "Get Commons" fallback instead of a same-device dead end.
  *
- * It deliberately owns NO password/2FA logic — those live at the IdP
- * (auth.oxy.so). {@link AccountDialogController.openPasswordAtOxyAuth} only
- * builds the hand-off URL; device-first convergence syncs the session back.
+ * Sign-in is passkey (WebAuthn) or the Commons QR / shared-keychain handoff —
+ * password, social login, and 2FA were removed ecosystem-wide. Account
+ * creation (`signup` view) is the same two identity backends: a passkey
+ * ceremony on web, or a Commons-created identity.
  */
 import { logger } from '../logger/index.js';
 import { extractErrorStatus } from '../utils/errorUtils.js';
-import { CENTRAL_IDP_APEX } from '../utils/authWebUrl.js';
-import { generateOAuthState, generatePkcePair, normalizeOAuthRedirectUri, persistOAuthHandshake, } from '../utils/oauthPkce.js';
 import { projectSwitchableAccounts, switchableAccountIds, } from './accountProjection.js';
 /**
  * Slow FALLBACK poll cadence for the QR flow. The `/auth-session` socket delivers
@@ -66,6 +69,7 @@ export class AccountDialogController {
         this.error = null;
         this.switchingAccountId = null;
         this.signIn = IDLE_SIGN_IN;
+        this.commonsAvailability = 'unknown';
         // --- Sign-in device-flow bookkeeping ---
         /** The secret device-flow token of the active QR flow (never surfaced). */
         this.signInToken = null;
@@ -94,9 +98,8 @@ export class AccountDialogController {
         this.clientId = options.clientId ?? null;
         this.locale = options.locale;
         this.commitSession = options.commitSession;
+        this.commitSwitchedSession = options.commitSwitchedSession;
         this.onSignedIn = options.onSignedIn;
-        this.idpApex = options.idpApex ?? CENTRAL_IDP_APEX;
-        this.authRedirectUri = options.authRedirectUri ?? null;
         this.pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
         this.openUrl = options.openUrl;
         this.canOpenApp = options.canOpenApp;
@@ -152,6 +155,11 @@ export class AccountDialogController {
         // bearer is already planted (warm start); when signed out (cold boot before
         // restore) it re-projects from device state and makes NO private call.
         void this.refresh();
+        // Eager, cached Commons-availability probe (native only — a no-op when no
+        // `canOpenApp` was injected). It's a cheap local OS check, so by the time a
+        // user actually opens the sign-in entry it has almost always resolved —
+        // `showQr`'s own lazy probe below is only the safety net for the rare race.
+        void this.resolveCommonsAvailability();
     }
     /**
      * Stop driving the dialog: unsubscribe from `SessionClient` and tear down the
@@ -235,6 +243,10 @@ export class AccountDialogController {
     add() {
         this.setView('add');
     }
+    /** Switch to the "create account" view (passkey / Commons signup entry). */
+    startSignup() {
+        this.setView('signup');
+    }
     // =========================================================================
     // Account list
     // =========================================================================
@@ -380,7 +392,11 @@ export class AccountDialogController {
                     expiresAt: result.expiresAt,
                     user: result.user,
                     accessToken: result.accessToken,
-                }, result.user);
+                }, result.user, 
+                // A switch is IN-PLACE: commit without the hub-sync redirect (the
+                // device is already known/synced). Cross-tab/app propagation rides the
+                // server's `session_state` socket broadcast, not a navigation.
+                { fromSwitch: true });
             }
             // Re-project + refetch immediately; the subscription also fires.
             await this.refresh();
@@ -448,32 +464,63 @@ export class AccountDialogController {
             // connect, so it now runs at the slow fallback cadence.
             this.openAuthSessionSocket(handle.sessionToken);
             this.scheduleNextPoll(handle.sessionToken);
-            // Same-device convenience: if Commons is installed (native only — `canOpenApp`
-            // is undefined/false on web), deep-link straight into its approve screen with
-            // the same `oxycommons://approve?...` payload the QR encodes. The QR + polling
+            // Same-device convenience: if Commons is confirmed installed (native
+            // only — stays `'unknown'` on web, where this never opens anything),
+            // deep-link straight into its approve screen with the same
+            // `oxycommons://approve?...` payload the QR encodes. The QR + polling
             // stay live as the fallback, so a user who dismisses the app-open still
             // completes the sign-in by scanning.
-            void this.maybeOpenCommons(handle.qrPayload);
+            void this.deepLinkIntoCommonsIfAvailable(handle.qrPayload);
         }
         catch (error) {
             this.setSignIn({ ...IDLE_SIGN_IN, phase: 'error', error: errorMessage(error) });
         }
     }
     /**
-     * When a `canOpenApp` probe is injected and reports Commons installed, open the
-     * approve deep link via the injected `openUrl`. Best-effort and non-blocking: a
-     * probe/open failure is logged and swallowed — the QR/polling fallback remains.
+     * Resolve whether Commons is installed on this device via the injected
+     * `canOpenApp` probe, updating {@link commonsAvailability} as durable,
+     * observable snapshot state. Native only — a no-op when `canOpenApp` was
+     * not injected (web), where `commonsAvailability` stays `'unknown'` forever
+     * and the QR view renders unconditionally (no gating).
+     *
+     * Replaces the old `maybeOpenCommons` fire-and-forget probe, whose outcome
+     * was only ever reflected by whether Commons silently opened — a probe
+     * failure or "not installed" answer was swallowed into a debug log with no
+     * way for the UI to react. `commonsAvailability` fixes that.
      */
-    async maybeOpenCommons(qrPayload) {
-        if (!this.canOpenApp || !this.openUrl)
+    async resolveCommonsAvailability() {
+        if (!this.canOpenApp)
             return;
+        this.commonsAvailability = 'checking';
+        this.emit();
+        let available = false;
         try {
-            if (await this.canOpenApp(COMMONS_APP_SCHEME)) {
-                this.openUrl(qrPayload);
-            }
+            available = await this.canOpenApp(COMMONS_APP_SCHEME);
         }
         catch (error) {
-            logger.debug('[AccountDialogController] Commons deep-link probe failed (QR fallback active)', { component: 'AccountDialogController' }, error);
+            logger.debug('[AccountDialogController] Commons availability probe failed', { component: 'AccountDialogController' }, error);
+            available = false; // fail-closed — treat a probe error as "not installed"
+        }
+        this.commonsAvailability = available ? 'available' : 'unavailable';
+        this.emit();
+    }
+    /**
+     * When Commons is confirmed installed, deep-link straight into its approve
+     * screen via the injected `openUrl` with the same `oxycommons://approve?...`
+     * payload the QR encodes. Best-effort and non-blocking — the QR/polling
+     * fallback stays live regardless of the outcome here.
+     */
+    async deepLinkIntoCommonsIfAvailable(qrPayload) {
+        if (!this.openUrl)
+            return;
+        if (this.commonsAvailability === 'unknown' || this.commonsAvailability === 'checking') {
+            // The eager `start()` probe hasn't resolved yet (or was never run, e.g.
+            // `showQr` called without a prior `start()`) — resolve it now rather
+            // than skipping the deep link.
+            await this.resolveCommonsAvailability();
+        }
+        if (this.commonsAvailability === 'available') {
+            this.openUrl(qrPayload);
         }
     }
     /** Tear down the active sign-in device flow (timers + socket + token) and reset to idle. */
@@ -485,46 +532,6 @@ export class AccountDialogController {
             this.setSignIn(IDLE_SIGN_IN);
         }
     }
-    /**
-     * Build (and, when an `openUrl` handler was supplied, open) the auth.oxy.so
-     * password sign-in URL. Password + 2FA are NOT in the SDK — they live at the
-     * IdP; this only hands off. Device-first: after login at the IdP the device
-     * session converges and the caller is woken via the device socket /
-     * `BroadcastChannel`, so the URL only needs to point at the IdP sign-in with
-     * the right return.
-     *
-     * @param params.returnUrl - Where the IdP returns after login. Defaults to the
-     *   current document URL on web (`globalThis.location.href`); pass explicitly
-     *   on native (no `location`).
-     * @param params.state - Optional opaque state echoed back on return.
-     * @returns The absolute auth.oxy.so sign-in URL.
-     */
-    async openPasswordAtOxyAuth(params = {}) {
-        const base = `https://auth.${this.idpApex}`;
-        const url = new URL('/login', base);
-        const rawRedirect = params.redirectUri ??
-            this.authRedirectUri ??
-            params.returnUrl ??
-            currentLocationOrigin();
-        const redirectUri = rawRedirect ? normalizeOAuthRedirectUri(rawRedirect) : '';
-        if (redirectUri) {
-            url.searchParams.set('redirect_uri', redirectUri);
-        }
-        if (this.clientId) {
-            url.searchParams.set('client_id', this.clientId);
-        }
-        const state = params.state ?? (await generateOAuthState());
-        url.searchParams.set('state', state);
-        const { codeChallenge, codeVerifier } = await generatePkcePair();
-        url.searchParams.set('code_challenge', codeChallenge);
-        url.searchParams.set('code_challenge_method', 'S256');
-        if (!persistOAuthHandshake(state, codeVerifier)) {
-            throw new Error('Could not persist OAuth handshake for password sign-in');
-        }
-        const href = url.toString();
-        this.openUrl?.(href);
-        return href;
-    }
     // =========================================================================
     // Internal sign-in helpers
     // =========================================================================
@@ -636,12 +643,21 @@ export class AccountDialogController {
     }
     /**
      * Register a token-planted session into the device set. Prefers the
-     * consumer's `commitSession` (durable persist + hydration); falls back to
+     * consumer's commit funnel (durable persist + hydration); falls back to
      * `SessionClient.registerAndActivate` (registration + activation only).
+     *
+     * A SWITCH (`opts.fromSwitch`) uses the IN-PLACE `commitSwitchedSession` funnel
+     * so it never runs the cross-origin hub-sync redirect; a SIGN-IN uses
+     * `commitSession` (which may hub-sync on an official web origin). When the
+     * switch funnel is not wired it falls back to the sign-in funnel, then to
+     * `registerAndActivate`.
      */
-    async commitAuthorizedSession(session, user) {
-        if (this.commitSession) {
-            await this.commitSession(session);
+    async commitAuthorizedSession(session, user, opts) {
+        const commit = opts?.fromSwitch
+            ? this.commitSwitchedSession ?? this.commitSession
+            : this.commitSession;
+        if (commit) {
+            await commit(session);
         }
         else {
             await this.sessionClient.registerAndActivate(user.id);
@@ -753,6 +769,7 @@ export class AccountDialogController {
             error: this.error,
             switchingAccountId: this.switchingAccountId,
             signIn: this.signIn,
+            commonsAvailability: this.commonsAvailability,
         };
     }
     /** Recompute the snapshot and notify subscribers. */
@@ -772,11 +789,3 @@ export class AccountDialogController {
 export function createAccountDialogController(options) {
     return new AccountDialogController(options);
 }
-// ---------------------------------------------------------------------------
-// Local helpers
-// ---------------------------------------------------------------------------
-/** Current document origin on web; empty string where `location` is absent (native/SSR). */
-function currentLocationOrigin() {
-    const location = globalThis.location;
-    return typeof location?.origin === 'string' ? location.origin : '';
-}

package/dist/esm/utils/officialOrigins.js

@@ -37,7 +37,12 @@ export function isIdpHubOrigin() {
         return false;
     }
 }
-function isLoopbackOrigin(origin) {
+/**
+ * Whether an origin is a loopback / local-dev origin (`localhost`, `127.0.0.1`,
+ * or `[::1]` on any port, http or https). Local dev must never be bounced to a
+ * hosted IdP for cross-origin session restore.
+ */
+export function isLoopbackOrigin(origin) {
     try {
         const parsed = new URL(origin);
         if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {