@oxyhq/core 1.11.22 → 1.11.24

package/dist/cjs/HttpService.js

@@ -109,6 +109,16 @@ class HttpService {
         this.tokenRefreshPromise = null;
         this.tokenRefreshCooldownUntil = 0;
         this._onTokenRefreshed = null;
+        /**
+         * Fan-out listeners notified on EVERY access-token change on this instance:
+         * explicit `setTokens`, `clearTokens`, a successful silent refresh, and the
+         * internal 401-driven clear. Unlike the single-slot `_onTokenRefreshed`
+         * (owned by AuthManager for the refresh path only), this is a Set so multiple
+         * independent observers can mirror token state without clobbering each other.
+         *
+         * Each listener receives the resulting access token, or `null` when cleared.
+         */
+        this._tokenChangeListeners = new Set();
         // Acting-as identity for managed accounts
         this._actingAsUserId = null;
         // Performance monitoring
@@ -312,6 +322,7 @@ class HttpService {
                         // Refresh failed or no token — clear tokens and stale CSRF
                         this.tokenStore.clearTokens();
                         this.tokenStore.clearCsrfToken();
+                        this.notifyTokenChange();
                     }
                     // On 403 with CSRF error, clear cached token and retry once
                     if (response.status === 403 && !config._isCsrfRetry) {
@@ -691,6 +702,7 @@ class HttpService {
                 const { accessToken: newToken } = await response.json();
                 this.tokenStore.setTokens(newToken);
                 this._onTokenRefreshed?.(newToken);
+                this.notifyTokenChange();
                 this.logger.debug('Token refreshed');
                 return `Bearer ${newToken}`;
             }
@@ -756,6 +768,7 @@ class HttpService {
     // Token management
     setTokens(accessToken, refreshToken = '') {
         this.tokenStore.setTokens(accessToken, refreshToken);
+        this.notifyTokenChange();
     }
     set onTokenRefreshed(callback) {
         this._onTokenRefreshed = callback;
@@ -763,6 +776,45 @@ class HttpService {
     clearTokens() {
         this.tokenStore.clearTokens();
         this.tokenStore.clearCsrfToken();
+        this.notifyTokenChange();
+    }
+    /**
+     * Subscribe to access-token changes on this instance.
+     *
+     * Fires on every mutation of the access token — `setTokens`, `clearTokens`,
+     * a successful silent refresh, and the internal 401-driven clear — passing
+     * the resulting token (or `null` when cleared). Returns an unsubscribe
+     * function; call it on teardown to avoid leaks.
+     *
+     * This is the single hook downstream code (e.g. @oxyhq/services' OxyProvider)
+     * uses to keep an external token sink — such as the shared `oxyClient`
+     * singleton — in lockstep with the active session, regardless of which code
+     * path mutated the token.
+     */
+    addTokenChangeListener(listener) {
+        this._tokenChangeListeners.add(listener);
+        return () => {
+            this._tokenChangeListeners.delete(listener);
+        };
+    }
+    /**
+     * Notify all token-change listeners with the current access token.
+     * Listener exceptions are isolated so one bad subscriber cannot break token
+     * propagation to the others or to the calling auth flow.
+     * @internal
+     */
+    notifyTokenChange() {
+        if (this._tokenChangeListeners.size === 0)
+            return;
+        const accessToken = this.tokenStore.getAccessToken();
+        for (const listener of this._tokenChangeListeners) {
+            try {
+                listener(accessToken);
+            }
+            catch (error) {
+                this.logger.error('Token change listener threw:', error);
+            }
+        }
     }
     getAccessToken() {
         return this.tokenStore.getAccessToken();

package/dist/cjs/OxyServices.base.js

@@ -113,6 +113,22 @@ class OxyServicesBase {
         this._cachedUserId = undefined;
         this._cachedAccessToken = null;
     }
+    /**
+     * Subscribe to access-token changes on this client.
+     *
+     * The listener fires on every access-token mutation — explicit
+     * `setTokens`/`clearTokens`, a successful silent refresh, and the internal
+     * 401-driven clear — receiving the resulting token, or `null` when cleared.
+     * Returns an unsubscribe function.
+     *
+     * Primary use: keeping an external token sink (e.g. the shared `oxyClient`
+     * singleton) in lockstep with whichever `OxyServices` instance actually owns
+     * the session, so imperative consumers reading the singleton always observe
+     * the live token regardless of the code path that changed it.
+     */
+    onTokensChanged(listener) {
+        return this.httpService.addTokenChangeListener(listener);
+    }
     /**
      * Get the current user ID from the access token.
      * Caches the decoded value and invalidates when the token changes.

package/dist/cjs/mixins/OxyServices.fedcm.js

@@ -37,12 +37,44 @@ function isUnknownModeEnumError(error) {
         ((message.includes('active') || message.includes('passive')) &&
             (message.includes('enum') || message.includes('not a valid'))));
 }
+/**
+ * Detect a `navigator.credentials.get` rejection that is consistent with
+ * "the supplied loginHint matched no account at the IdP".
+ *
+ * When an RP passes a `loginHint` and the IdP returns accounts but NONE of them
+ * declare that hint in their `login_hints`, Chrome filters every account out,
+ * greys it in the chooser ("You can't sign in using this account"), logs
+ * "Accounts were received, but none matched the login hint…", and ultimately
+ * rejects the credential request — surfacing as a `NotAllowedError` /
+ * `AbortError` (the same shape as a user-cancelled or timed-out request). A
+ * stale hint left over from a previously-signed-in/test account therefore hard
+ * -blocks sign-in.
+ *
+ * We can only safely apply the clear-and-retry recovery when a `loginHint` was
+ * actually supplied; without one this is just a normal cancel/timeout and must
+ * NOT be retried. Callers gate on `hadLoginHint` before calling this.
+ */
+function isPossibleHintMismatchError(error) {
+    if (!(error instanceof Error))
+        return false;
+    // FedCM surfaces a filtered-out / no-eligible-account outcome as
+    // NotAllowedError (current Chrome) or AbortError (our own timeout abort while
+    // the chooser had no selectable account). Both are indistinguishable from a
+    // genuine user cancel at the API level, so the gate on "a hint was supplied"
+    // (in the caller) is what makes the retry safe and targeted.
+    return error.name === 'NotAllowedError' || error.name === 'AbortError';
+}
 const FEDCM_LOGIN_HINT_KEY = 'oxy_fedcm_login_hint';
 // Global lock to prevent concurrent FedCM requests
 // FedCM only allows one navigator.credentials.get request at a time
 let fedCMRequestInProgress = false;
 let fedCMRequestPromise = null;
 let currentMediationMode = null;
+// AbortController of the in-flight request, exposed at module scope so an
+// arriving INTERACTIVE request can abort a slow/hung SILENT one instead of
+// blocking on it (see requestIdentityCredential). Set when a request starts,
+// cleared in that request's `finally`.
+let fedCMActiveController = null;
 /**
  * Federated Credential Management (FedCM) Authentication Mixin
  *
@@ -71,9 +103,12 @@ function OxyServicesFedCMMixin(Base) {
                 super(...args);
             }
             resolveFedcmConfigUrl() {
+                // `DEFAULT_CONFIG_URL` is a static on the composed class; read it off the
+                // most-derived constructor through a typed cast (not `any`).
+                const configCtor = this.constructor;
                 return this.config.authWebUrl
                     ? `${this.config.authWebUrl}/fedcm.json`
-                    : this.constructor.DEFAULT_CONFIG_URL;
+                    : configCtor.DEFAULT_CONFIG_URL;
             }
             /**
              * Check if FedCM is supported in the current browser
@@ -117,68 +152,105 @@ function OxyServicesFedCMMixin(Base) {
                 if (!this.isFedCMSupported()) {
                     throw new OxyServices_errors_1.OxyAuthenticationError('FedCM not supported in this browser. Please update your browser or use an alternative sign-in method.');
                 }
+                // Use provided loginHint, or fall back to stored last-used account ID.
+                const initialLoginHint = options.loginHint || this.getStoredLoginHint();
                 try {
-                    // Prefer a server-minted, origin-bound nonce so the downstream
-                    // `/fedcm/exchange` can validate it. A caller-supplied nonce is
-                    // respected as-is for advanced use cases.
-                    const nonce = options.nonce || (await this.getFedcmNonce());
-                    const clientId = this.getClientId();
-                    // Use provided loginHint, or fall back to stored last-used account ID
-                    const loginHint = options.loginHint || this.getStoredLoginHint();
-                    debug.log('Interactive sign-in: Requesting credential for', clientId, loginHint ? `(hint: ${loginHint})` : '');
-                    // Request credential from browser's native identity flow.
-                    // mode: 'active' signals this is a user-gesture-initiated (button) flow.
-                    // 'active' is the current W3C spec value; requestIdentityCredential
-                    // transparently retries with the legacy 'button' value for Chrome 125–131.
-                    const credential = await this.requestIdentityCredential({
-                        configURL: this.resolveFedcmConfigUrl(),
-                        clientId,
-                        nonce,
-                        context: options.context,
-                        loginHint,
-                        mode: 'active',
-                    });
-                    if (!credential || !credential.token) {
-                        throw new OxyServices_errors_1.OxyAuthenticationError('No credential received from browser');
-                    }
-                    debug.log('Interactive sign-in: Got credential, exchanging for session');
-                    // Exchange FedCM ID token for Oxy session
-                    const session = await this.exchangeIdTokenForSession(credential.token);
-                    // Store access token in HttpService. `accessToken`/`refreshToken` are
-                    // declared optional on SessionLoginResponse; default the refresh token to
-                    // an empty string when the exchange did not return one.
-                    if (session?.accessToken) {
-                        this.httpService.setTokens(session.accessToken, session.refreshToken ?? '');
-                    }
-                    // Store the user ID as loginHint for future FedCM requests
-                    if (session?.user?.id) {
-                        this.storeLoginHint(session.user.id);
-                    }
-                    debug.log('Interactive sign-in: Success!', { userId: session?.user?.id });
-                    return session;
+                    return await this.attemptInteractiveSignIn(options, initialLoginHint);
                 }
                 catch (error) {
-                    debug.log('Interactive sign-in failed:', error);
-                    const errorMessage = error instanceof Error ? error.message : String(error);
-                    // FedCM aborts/network failures surface as DOMException/Error instances,
-                    // both of which carry a `name`. Anything else has no meaningful name.
-                    const errorName = error instanceof Error ? error.name : '';
-                    if (errorName === 'AbortError') {
-                        throw new OxyServices_errors_1.OxyAuthenticationError('Sign-in was cancelled by user');
-                    }
-                    if (errorName === 'NetworkError') {
-                        throw new OxyServices_errors_1.OxyAuthenticationError('Network error during sign-in. Please check your connection.');
-                    }
-                    if (errorMessage.includes('multiple accounts')) {
-                        throw new OxyServices_errors_1.OxyAuthenticationError('Please sign out and sign in again to use FedCM with a single account');
+                    // A STALE loginHint (e.g. left over from a previously-signed-in or test
+                    // account) that matches no account at the IdP makes Chrome filter out
+                    // every account and reject the request — indistinguishable from a user
+                    // cancel. When that happens AND we supplied a hint, clear the bad hint
+                    // and retry the credential request ONCE with no hint, which lets the
+                    // chooser surface the genuinely available account(s). We only do this for
+                    // a hint we pulled from storage (not a caller-supplied one), and only
+                    // once, so a real cancel never loops.
+                    const usedStoredHint = !!initialLoginHint && !options.loginHint;
+                    if (usedStoredHint && isPossibleHintMismatchError(error)) {
+                        debug.log('Interactive sign-in: stored loginHint matched no account; clearing it and retrying without a hint');
+                        this.clearLoginHint();
+                        return await this.attemptInteractiveSignIn(options, undefined);
                     }
-                    if (errorMessage.includes('retrieving a token') || errorMessage.includes('Error retrieving')) {
-                        debug.error('FedCM token retrieval error - this may be a browser or IdP configuration issue');
-                        throw new OxyServices_errors_1.OxyAuthenticationError('Authentication failed. Please try again or use an alternative sign-in method.');
-                    }
-                    throw error;
+                    throw this.normalizeInteractiveSignInError(error);
                 }
             }
+            /**
+             * Run a single interactive FedCM credential request + token exchange for the
+             * given (possibly undefined) loginHint. A successful exchange plants the
+             * access token and persists the user id as the future loginHint — the hint is
+             * therefore only ever stored after a GENUINELY successful sign-in, never
+             * speculatively.
+             *
+             * @private
+             */
+            async attemptInteractiveSignIn(options, loginHint) {
+                // Prefer a server-minted, origin-bound nonce so the downstream
+                // `/fedcm/exchange` can validate it. A caller-supplied nonce is
+                // respected as-is for advanced use cases.
+                const nonce = options.nonce || (await this.getFedcmNonce());
+                const clientId = this.getClientId();
+                debug.log('Interactive sign-in: Requesting credential for', clientId, loginHint ? `(hint: ${loginHint})` : '');
+                // Request credential from browser's native identity flow.
+                // mode: 'active' signals this is a user-gesture-initiated (button) flow.
+                // 'active' is the current W3C spec value; requestIdentityCredential
+                // transparently retries with the legacy 'button' value for Chrome 125–131.
+                const credential = await this.requestIdentityCredential({
+                    configURL: this.resolveFedcmConfigUrl(),
+                    clientId,
+                    nonce,
+                    context: options.context,
+                    loginHint,
+                    mode: 'active',
+                });
+                if (!credential || !credential.token) {
+                    throw new OxyServices_errors_1.OxyAuthenticationError('No credential received from browser');
+                }
+                debug.log('Interactive sign-in: Got credential, exchanging for session');
+                // Exchange FedCM ID token for Oxy session
+                const session = await this.exchangeIdTokenForSession(credential.token);
+                // Store access token in HttpService. `accessToken`/`refreshToken` are
+                // declared optional on SessionLoginResponse; default the refresh token to
+                // an empty string when the exchange did not return one.
+                if (session?.accessToken) {
+                    this.httpService.setTokens(session.accessToken, session.refreshToken ?? '');
+                }
+                // Store the user ID as loginHint for future FedCM requests — only now, after
+                // a real successful exchange, so we never persist a hint that cannot resolve.
+                if (session?.user?.id) {
+                    this.storeLoginHint(session.user.id);
+                }
+                debug.log('Interactive sign-in: Success!', { userId: session?.user?.id });
+                return session;
+            }
+            /**
+             * Map a raw FedCM/exchange failure to a user-facing {@link OxyAuthenticationError}
+             * (or pass it through). Extracted so the clear-and-retry path can reuse the
+             * exact same error normalisation as the first attempt.
+             *
+             * @private
+             */
+            normalizeInteractiveSignInError(error) {
+                debug.log('Interactive sign-in failed:', error);
+                const errorMessage = error instanceof Error ? error.message : String(error);
+                // FedCM aborts/network failures surface as DOMException/Error instances,
+                // both of which carry a `name`. Anything else has no meaningful name.
+                const errorName = error instanceof Error ? error.name : '';
+                if (errorName === 'AbortError') {
+                    return new OxyServices_errors_1.OxyAuthenticationError('Sign-in was cancelled by user');
+                }
+                if (errorName === 'NetworkError') {
+                    return new OxyServices_errors_1.OxyAuthenticationError('Network error during sign-in. Please check your connection.');
+                }
+                if (errorMessage.includes('multiple accounts')) {
+                    return new OxyServices_errors_1.OxyAuthenticationError('Please sign out and sign in again to use FedCM with a single account');
+                }
+                if (errorMessage.includes('retrieving a token') || errorMessage.includes('Error retrieving')) {
+                    debug.error('FedCM token retrieval error - this may be a browser or IdP configuration issue');
+                    return new OxyServices_errors_1.OxyAuthenticationError('Authentication failed. Please try again or use an alternative sign-in method.');
+                }
+                return error;
+            }
             /**
              * Silent sign-in using FedCM
              *
@@ -319,16 +391,20 @@ function OxyServicesFedCMMixin(Base) {
                 // If a request is already in progress...
                 if (fedCMRequestInProgress && fedCMRequestPromise) {
                     debug.log('Request already in progress, waiting...');
-                    // If current request is silent and new request is interactive,
-                    // wait for silent to finish, then make the interactive request
+                    // If the in-flight request is SILENT and this new one is INTERACTIVE,
+                    // abort the silent and proceed immediately. The silent round-trip can be
+                    // slow (it runs on page load and may stall in the browser), and a user who
+                    // just clicked "Sign In" must never be made to wait on — or be blocked by —
+                    // it. Awaiting the silent here is what previously let a hung silent
+                    // request deadlock the sign-in button, so we deliberately do NOT await it:
+                    // we abort it (its own `finally` resets the lock as it settles) and fall
+                    // through to start the interactive request synchronously below.
                     if (currentMediationMode === 'silent' && isInteractive) {
-                        try {
-                            await fedCMRequestPromise;
-                        }
-                        catch {
-                            // Ignore silent request errors
-                        }
-                        // Now fall through to make the interactive request
+                        debug.log('Aborting in-flight silent request to make way for interactive request');
+                        fedCMActiveController?.abort();
+                        // Fall through. The interactive request synchronously overwrites the
+                        // lock globals (below); the aborted silent's `finally` uses identity
+                        // guards so it cannot later clobber this interactive request's state.
                     }
                     else {
                         // Same type of request - wait for the existing one
@@ -343,10 +419,14 @@ function OxyServicesFedCMMixin(Base) {
                 fedCMRequestInProgress = true;
                 currentMediationMode = requestedMediation;
                 const controller = new AbortController();
-                // Use shorter timeout for silent mediation since it should be quick
+                fedCMActiveController = controller;
+                // Use shorter timeout for silent mediation since it should be quick.
+                // The timeout constants are static on the composed class; read them off the
+                // most-derived constructor through a typed cast (not `any`).
+                const timeoutCtor = this.constructor;
                 const timeoutMs = requestedMediation === 'silent'
-                    ? this.constructor.FEDCM_SILENT_TIMEOUT
-                    : this.constructor.FEDCM_TIMEOUT;
+                    ? timeoutCtor.FEDCM_SILENT_TIMEOUT
+                    : timeoutCtor.FEDCM_TIMEOUT;
                 const timeout = setTimeout(() => {
                     debug.log('Request timed out after', timeoutMs, 'ms (mediation:', requestedMediation + ')');
                     controller.abort();
@@ -423,9 +503,20 @@ function OxyServicesFedCMMixin(Base) {
                     }
                     finally {
                         clearTimeout(timeout);
-                        fedCMRequestInProgress = false;
-                        fedCMRequestPromise = null;
-                        currentMediationMode = null;
+                        // Only reset the shared lock if it still belongs to THIS request. When an
+                        // interactive request aborts a slow silent one, the silent settles (and
+                        // runs this `finally`) AFTER the interactive has already taken over the
+                        // lock and installed its own controller/promise. Guarding on identity
+                        // (`fedCMActiveController === controller`) ensures the settling silent
+                        // cannot null out the interactive request's in-progress state. The
+                        // request that still owns the lock clears it; the superseded one is a
+                        // no-op here.
+                        if (fedCMActiveController === controller) {
+                            fedCMRequestInProgress = false;
+                            fedCMRequestPromise = null;
+                            currentMediationMode = null;
+                            fedCMActiveController = null;
+                        }
                     }
                 })();
                 return fedCMRequestPromise;
@@ -614,7 +705,12 @@ function OxyServicesFedCMMixin(Base) {
         _a.DEFAULT_CONFIG_URL = 'https://auth.oxy.so/fedcm.json',
         _a.FEDCM_TIMEOUT = 15000 // 15 seconds for interactive
     ,
-        _a.FEDCM_SILENT_TIMEOUT = 3000 // 3 seconds for silent mediation
+        // Silent mediation runs on page load (e.g. re-signing-in a user whose stored
+        // session was cleared after a cold-boot token fetch 401'd). The real silent
+        // round-trip — mint nonce → navigator.credentials.get → /fedcm/exchange — was
+        // measured to take more than 3s for live users, so a 3s budget timed out and
+        // left them signed out on reload. 10s gives ample margin while staying bounded.
+        _a.FEDCM_SILENT_TIMEOUT = 10000 // 10 seconds for silent mediation
     ,
         _a;
 }