@auth0/auth0-spa-js 2.6.0 → 2.8.0

package/README.md

@@ -1,7 +1,8 @@
 ![Auth0 SDK for Single Page Applications using Authorization Code Grant Flow with PKCE.](https://cdn.auth0.com/website/sdks/banners/spa-js-banner.png)
 
-![Release](https://img.shields.io/npm/v/@auth0/auth0-spa-js)
+[![npm version](https://img.shields.io/npm/v/@auth0/auth0-spa-js?style=flat-square&logo=npm&logoColor=CB3837)](https://www.npmjs.com/package/@auth0/auth0-spa-js)
 [![Codecov](https://img.shields.io/codecov/c/github/auth0/auth0-spa-js)](https://codecov.io/gh/auth0/auth0-spa-js)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/auth0/auth0-spa-js)
 ![Downloads](https://img.shields.io/npm/dw/@auth0/auth0-spa-js)
 [![License](https://img.shields.io/:license-mit-blue.svg?style=flat)](https://opensource.org/licenses/MIT)
 ![CircleCI](https://img.shields.io/circleci/build/github/auth0/auth0-spa-js)
@@ -29,7 +30,7 @@ npm install @auth0/auth0-spa-js
 From the CDN:
 
 ```html
-<script src="https://cdn.auth0.com/js/auth0-spa-js/2.6/auth0-spa-js.production.js"></script>
+<script src="https://cdn.auth0.com/js/auth0-spa-js/2.8/auth0-spa-js.production.js"></script>
 ```
 
 ### Configure Auth0
@@ -156,4 +157,4 @@ Please do not report security vulnerabilities on the public GitHub issue tracker
 </p>
 <p align="center">
   This project is licensed under the MIT license. See the <a href="https://github.com/auth0/auth0-spa-js/blob/main/LICENSE"> LICENSE</a> file for more info.
-</p>
+</p>

package/dist/auth0-spa-js.development.js

@@ -540,7 +540,7 @@
         exports.default = SuperTokensLock;
     }));
     var Lock = unwrapExports(browserTabsLock);
-    var version = "2.6.0";
+    var version = "2.8.0";
     const DEFAULT_AUTHORIZE_TIMEOUT_IN_SECONDS = 60;
     const DEFAULT_POPUP_CONFIG_OPTIONS = {
         timeoutInSeconds: DEFAULT_AUTHORIZE_TIMEOUT_IN_SECONDS
@@ -558,6 +558,7 @@
         version: version
     };
     const DEFAULT_NOW_PROVIDER = () => Date.now();
+    const DEFAULT_AUDIENCE = "default";
     class GenericError extends Error {
         constructor(error, error_description) {
             super(error_description);
@@ -621,6 +622,14 @@
             Object.setPrototypeOf(this, MissingRefreshTokenError.prototype);
         }
     }
+    class MissingScopesError extends GenericError {
+        constructor(audience, scope) {
+            super("missing_scopes", `Missing requested scopes after refresh (audience: '${valueOrEmptyString(audience, [ "default" ])}', missing scope: '${valueOrEmptyString(scope)}')`);
+            this.audience = audience;
+            this.scope = scope;
+            Object.setPrototypeOf(this, MissingScopesError.prototype);
+        }
+    }
     class UseDpopNonceError extends GenericError {
         constructor(newDpopNonce) {
             super("use_dpop_nonce", "Server rejected DPoP proof: wrong nonce");
@@ -725,6 +734,23 @@
     const stripUndefined = params => Object.keys(params).filter((k => typeof params[k] !== "undefined")).reduce(((acc, key) => Object.assign(Object.assign({}, acc), {
         [key]: params[key]
     })), {});
+    const ALLOWED_AUTH0CLIENT_PROPERTIES = [ {
+        key: "name",
+        type: [ "string" ]
+    }, {
+        key: "version",
+        type: [ "string", "number" ]
+    }, {
+        key: "env",
+        type: [ "object" ]
+    } ];
+    const stripAuth0Client = auth0Client => Object.keys(auth0Client).reduce(((acc, key) => {
+        const allowedProperty = ALLOWED_AUTH0CLIENT_PROPERTIES.find((p => p.key === key));
+        if (allowedProperty && allowedProperty.type.includes(typeof auth0Client[key])) {
+            acc[key] = auth0Client[key];
+        }
+        return acc;
+    }), {});
     const createQueryParams = _a => {
         var {clientId: client_id} = _a, params = __rest(_a, [ "clientId" ]);
         return new URLSearchParams(stripUndefined(Object.assign({
@@ -1207,17 +1233,42 @@
         });
         const body = useFormData ? createQueryParams(allParams) : JSON.stringify(allParams);
         const isDpopSupported = isGrantTypeSupported(options.grant_type);
-        return await getJSON(`${baseUrl}/oauth/token`, timeout, audience || "default", scope, {
+        return await getJSON(`${baseUrl}/oauth/token`, timeout, audience || DEFAULT_AUDIENCE, scope, {
             method: "POST",
             body: body,
             headers: {
                 "Content-Type": useFormData ? "application/x-www-form-urlencoded" : "application/json",
-                "Auth0-Client": btoa(JSON.stringify(auth0Client || DEFAULT_AUTH0_CLIENT))
+                "Auth0-Client": btoa(JSON.stringify(stripAuth0Client(auth0Client || DEFAULT_AUTH0_CLIENT)))
             }
         }, worker, useFormData, useMrrt, isDpopSupported ? dpop : undefined);
     }
     const dedupe = arr => Array.from(new Set(arr));
     const getUniqueScopes = (...scopes) => dedupe(scopes.filter(Boolean).join(" ").trim().split(/\s+/)).join(" ");
+    const injectDefaultScopes = (authScopes, openIdScope, ...extraScopes) => {
+        if (typeof authScopes !== "object") {
+            return {
+                [DEFAULT_AUDIENCE]: getUniqueScopes(openIdScope, authScopes, ...extraScopes)
+            };
+        }
+        let requestedScopes = {
+            [DEFAULT_AUDIENCE]: getUniqueScopes(openIdScope, ...extraScopes)
+        };
+        Object.keys(authScopes).forEach((key => {
+            const audienceScopes = authScopes[key];
+            requestedScopes[key] = getUniqueScopes(openIdScope, audienceScopes, ...extraScopes);
+        }));
+        return requestedScopes;
+    };
+    const scopesToRequest = (authScopes, methodScopes, audience) => {
+        let scope;
+        if (audience) {
+            scope = authScopes[audience];
+        }
+        if (!scope) {
+            scope = authScopes[DEFAULT_AUDIENCE];
+        }
+        return getUniqueScopes(scope, methodScopes);
+    };
     const CACHE_KEY_PREFIX = "@@auth0spajs@@";
     const CACHE_KEY_ID_TOKEN_SUFFIX = "@@user@@";
     class CacheKey {
@@ -1386,6 +1437,14 @@
             await this.cache.set(cacheKey.toKey(), wrappedEntry);
             await ((_a = this.keyManifest) === null || _a === void 0 ? void 0 : _a.add(cacheKey.toKey()));
         }
+        async remove(client_id, audience, scope) {
+            const cacheKey = new CacheKey({
+                clientId: client_id,
+                scope: scope,
+                audience: audience
+            });
+            await this.cache.remove(cacheKey.toKey());
+        }
         async clear(clientId) {
             var _a;
             const keys = await this.getCacheKeys();
@@ -1801,7 +1860,7 @@
             return new Worker(url, options);
         };
     }
-    var WorkerFactory = createBase64WorkerFactory("/* rollup-plugin-web-worker-loader */
(function() {
    "use strict";
    class GenericError extends Error {
        constructor(error, error_description) {
            super(error_description);
            this.error = error;
            this.error_description = error_description;
            Object.setPrototypeOf(this, GenericError.prototype);
        }
        static fromPayload({error: error, error_description: error_description}) {
            return new GenericError(error, error_description);
        }
    }
    class MissingRefreshTokenError extends GenericError {
        constructor(audience, scope) {
            super("missing_refresh_token", `Missing Refresh Token (audience: '${valueOrEmptyString(audience, [ "default" ])}', scope: '${valueOrEmptyString(scope)}')`);
            this.audience = audience;
            this.scope = scope;
            Object.setPrototypeOf(this, MissingRefreshTokenError.prototype);
        }
    }
    function valueOrEmptyString(value, exclude = []) {
        return value && !exclude.includes(value) ? value : "";
    }
    function __rest(s, e) {
        var t = {};
        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
        if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
        }
        return t;
    }
    typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
        var e = new Error(message);
        return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
    };
    const stripUndefined = params => Object.keys(params).filter((k => typeof params[k] !== "undefined")).reduce(((acc, key) => Object.assign(Object.assign({}, acc), {
        [key]: params[key]
    })), {});
    const createQueryParams = _a => {
        var {clientId: client_id} = _a, params = __rest(_a, [ "clientId" ]);
        return new URLSearchParams(stripUndefined(Object.assign({
            client_id: client_id
        }, params))).toString();
    };
    const fromEntries = iterable => [ ...iterable ].reduce(((obj, [key, val]) => {
        obj[key] = val;
        return obj;
    }), {});
    let refreshTokens = {};
    const cacheKey = (audience, scope) => `${audience}|${scope}`;
    const cacheKeyContainsAudience = (audience, cacheKey) => cacheKey.startsWith(`${audience}|`);
    const getRefreshToken = (audience, scope) => refreshTokens[cacheKey(audience, scope)];
    const setRefreshToken = (refreshToken, audience, scope) => refreshTokens[cacheKey(audience, scope)] = refreshToken;
    const deleteRefreshToken = (audience, scope) => delete refreshTokens[cacheKey(audience, scope)];
    const wait = time => new Promise((resolve => setTimeout(resolve, time)));
    const formDataToObject = formData => {
        const queryParams = new URLSearchParams(formData);
        const parsedQuery = {};
        queryParams.forEach(((val, key) => {
            parsedQuery[key] = val;
        }));
        return parsedQuery;
    };
    const updateRefreshTokens = (oldRefreshToken, newRefreshToken) => {
        Object.entries(refreshTokens).forEach((([key, token]) => {
            if (token === oldRefreshToken) {
                refreshTokens[key] = newRefreshToken;
            }
        }));
    };
    const checkDownscoping = (scope, audience) => {
        const findCoincidence = Object.keys(refreshTokens).find((key => {
            if (key !== "latest_refresh_token") {
                const isSameAudience = cacheKeyContainsAudience(audience, key);
                const scopesKey = key.split("|")[1].split(" ");
                const requestedScopes = scope.split(" ");
                const scopesAreIncluded = requestedScopes.every((key => scopesKey.includes(key)));
                return isSameAudience && scopesAreIncluded;
            }
        }));
        return findCoincidence ? true : false;
    };
    const messageHandler = async ({data: {timeout: timeout, auth: auth, fetchUrl: fetchUrl, fetchOptions: fetchOptions, useFormData: useFormData, useMrrt: useMrrt}, ports: [port]}) => {
        let headers = {};
        let json;
        let refreshToken;
        const {audience: audience, scope: scope} = auth || {};
        try {
            const body = useFormData ? formDataToObject(fetchOptions.body) : JSON.parse(fetchOptions.body);
            if (!body.refresh_token && body.grant_type === "refresh_token") {
                refreshToken = getRefreshToken(audience, scope);
                if (!refreshToken && useMrrt) {
                    const latestRefreshToken = refreshTokens["latest_refresh_token"];
                    const isDownscoping = checkDownscoping(scope, audience);
                    if (latestRefreshToken && !isDownscoping) {
                        refreshToken = latestRefreshToken;
                    }
                }
                if (!refreshToken) {
                    throw new MissingRefreshTokenError(audience, scope);
                }
                fetchOptions.body = useFormData ? createQueryParams(Object.assign(Object.assign({}, body), {
                    refresh_token: refreshToken
                })) : JSON.stringify(Object.assign(Object.assign({}, body), {
                    refresh_token: refreshToken
                }));
            }
            let abortController;
            if (typeof AbortController === "function") {
                abortController = new AbortController;
                fetchOptions.signal = abortController.signal;
            }
            let response;
            try {
                response = await Promise.race([ wait(timeout), fetch(fetchUrl, Object.assign({}, fetchOptions)) ]);
            } catch (error) {
                port.postMessage({
                    error: error.message
                });
                return;
            }
            if (!response) {
                if (abortController) abortController.abort();
                port.postMessage({
                    error: "Timeout when executing 'fetch'"
                });
                return;
            }
            headers = fromEntries(response.headers);
            json = await response.json();
            if (json.refresh_token) {
                if (useMrrt && audience !== "default") {
                    refreshTokens["latest_refresh_token"] = json.refresh_token;
                    updateRefreshTokens(refreshToken, json.refresh_token);
                }
                setRefreshToken(json.refresh_token, audience, scope);
                delete json.refresh_token;
            } else {
                deleteRefreshToken(audience, scope);
            }
            port.postMessage({
                ok: response.ok,
                json: json,
                headers: headers
            });
        } catch (error) {
            port.postMessage({
                ok: false,
                json: {
                    error: error.error,
                    error_description: error.message
                },
                headers: headers
            });
        }
    };
    {
        addEventListener("message", messageHandler);
    }
})();

", null, false);
+    var WorkerFactory = createBase64WorkerFactory("/* rollup-plugin-web-worker-loader */
(function() {
    "use strict";
    class GenericError extends Error {
        constructor(error, error_description) {
            super(error_description);
            this.error = error;
            this.error_description = error_description;
            Object.setPrototypeOf(this, GenericError.prototype);
        }
        static fromPayload({error: error, error_description: error_description}) {
            return new GenericError(error, error_description);
        }
    }
    class MissingRefreshTokenError extends GenericError {
        constructor(audience, scope) {
            super("missing_refresh_token", `Missing Refresh Token (audience: '${valueOrEmptyString(audience, [ "default" ])}', scope: '${valueOrEmptyString(scope)}')`);
            this.audience = audience;
            this.scope = scope;
            Object.setPrototypeOf(this, MissingRefreshTokenError.prototype);
        }
    }
    function valueOrEmptyString(value, exclude = []) {
        return value && !exclude.includes(value) ? value : "";
    }
    function __rest(s, e) {
        var t = {};
        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
        if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
        }
        return t;
    }
    typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
        var e = new Error(message);
        return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
    };
    const stripUndefined = params => Object.keys(params).filter((k => typeof params[k] !== "undefined")).reduce(((acc, key) => Object.assign(Object.assign({}, acc), {
        [key]: params[key]
    })), {});
    const createQueryParams = _a => {
        var {clientId: client_id} = _a, params = __rest(_a, [ "clientId" ]);
        return new URLSearchParams(stripUndefined(Object.assign({
            client_id: client_id
        }, params))).toString();
    };
    const fromEntries = iterable => [ ...iterable ].reduce(((obj, [key, val]) => {
        obj[key] = val;
        return obj;
    }), {});
    let refreshTokens = {};
    const cacheKey = (audience, scope) => `${audience}|${scope}`;
    const cacheKeyContainsAudience = (audience, cacheKey) => cacheKey.startsWith(`${audience}|`);
    const getRefreshToken = (audience, scope) => refreshTokens[cacheKey(audience, scope)];
    const setRefreshToken = (refreshToken, audience, scope) => refreshTokens[cacheKey(audience, scope)] = refreshToken;
    const deleteRefreshToken = (audience, scope) => delete refreshTokens[cacheKey(audience, scope)];
    const wait = time => new Promise((resolve => setTimeout(resolve, time)));
    const formDataToObject = formData => {
        const queryParams = new URLSearchParams(formData);
        const parsedQuery = {};
        queryParams.forEach(((val, key) => {
            parsedQuery[key] = val;
        }));
        return parsedQuery;
    };
    const updateRefreshTokens = (oldRefreshToken, newRefreshToken) => {
        Object.entries(refreshTokens).forEach((([key, token]) => {
            if (token === oldRefreshToken) {
                refreshTokens[key] = newRefreshToken;
            }
        }));
    };
    const checkDownscoping = (scope, audience) => {
        const findCoincidence = Object.keys(refreshTokens).find((key => {
            if (key !== "latest_refresh_token") {
                const isSameAudience = cacheKeyContainsAudience(audience, key);
                const scopesKey = key.split("|")[1].split(" ");
                const requestedScopes = scope.split(" ");
                const scopesAreIncluded = requestedScopes.every((key => scopesKey.includes(key)));
                return isSameAudience && scopesAreIncluded;
            }
        }));
        return findCoincidence ? true : false;
    };
    const messageHandler = async ({data: {timeout: timeout, auth: auth, fetchUrl: fetchUrl, fetchOptions: fetchOptions, useFormData: useFormData, useMrrt: useMrrt}, ports: [port]}) => {
        let headers = {};
        let json;
        let refreshToken;
        const {audience: audience, scope: scope} = auth || {};
        try {
            const body = useFormData ? formDataToObject(fetchOptions.body) : JSON.parse(fetchOptions.body);
            if (!body.refresh_token && body.grant_type === "refresh_token") {
                refreshToken = getRefreshToken(audience, scope);
                if (!refreshToken && useMrrt) {
                    const latestRefreshToken = refreshTokens["latest_refresh_token"];
                    const isDownscoping = checkDownscoping(scope, audience);
                    if (latestRefreshToken && !isDownscoping) {
                        refreshToken = latestRefreshToken;
                    }
                }
                if (!refreshToken) {
                    throw new MissingRefreshTokenError(audience, scope);
                }
                fetchOptions.body = useFormData ? createQueryParams(Object.assign(Object.assign({}, body), {
                    refresh_token: refreshToken
                })) : JSON.stringify(Object.assign(Object.assign({}, body), {
                    refresh_token: refreshToken
                }));
            }
            let abortController;
            if (typeof AbortController === "function") {
                abortController = new AbortController;
                fetchOptions.signal = abortController.signal;
            }
            let response;
            try {
                response = await Promise.race([ wait(timeout), fetch(fetchUrl, Object.assign({}, fetchOptions)) ]);
            } catch (error) {
                port.postMessage({
                    error: error.message
                });
                return;
            }
            if (!response) {
                if (abortController) abortController.abort();
                port.postMessage({
                    error: "Timeout when executing 'fetch'"
                });
                return;
            }
            headers = fromEntries(response.headers);
            json = await response.json();
            if (json.refresh_token) {
                if (useMrrt) {
                    refreshTokens["latest_refresh_token"] = json.refresh_token;
                    updateRefreshTokens(refreshToken, json.refresh_token);
                }
                setRefreshToken(json.refresh_token, audience, scope);
                delete json.refresh_token;
            } else {
                deleteRefreshToken(audience, scope);
            }
            port.postMessage({
                ok: response.ok,
                json: json,
                headers: headers
            });
        } catch (error) {
            port.postMessage({
                ok: false,
                json: {
                    error: error.error,
                    error_description: error.message
                },
                headers: headers
            });
        }
    };
    {
        addEventListener("message", messageHandler);
    }
})();

", null, false);
     const singlePromiseMap = {};
     const singlePromise = (cb, key) => {
         let promise = singlePromiseMap[key];
@@ -1860,6 +1919,7 @@
         }
     }
     const GET_TOKEN_SILENTLY_LOCK_KEY = "auth0.lock.getTokenSilently";
+    const buildGetTokenSilentlyLockKey = (clientId, audience) => `${GET_TOKEN_SILENTLY_LOCK_KEY}.${clientId}.${audience}`;
     const buildOrganizationHintCookieName = clientId => `auth0.${clientId}.organization_hint`;
     const OLD_IS_AUTHENTICATED_COOKIE_NAME = "auth0.is.authenticated";
     const buildIsAuthenticatedCookieName = clientId => `auth0.${clientId}.is.authenticated`;
@@ -1871,7 +1931,7 @@
     const getAuthorizeParams = (clientOptions, scope, authorizationParams, state, nonce, code_challenge, redirect_uri, response_mode, thumbprint) => Object.assign(Object.assign(Object.assign({
         client_id: clientOptions.clientId
     }, clientOptions.authorizationParams), authorizationParams), {
-        scope: getUniqueScopes(scope, authorizationParams.scope),
+        scope: scopesToRequest(scope, authorizationParams.scope, authorizationParams.audience),
         response_type: "code",
         response_mode: response_mode || "query",
         state: state,
@@ -1893,6 +1953,12 @@
         const scopesToInclude = (scopeToInclude === null || scopeToInclude === void 0 ? void 0 : scopeToInclude.split(" ")) || [];
         return scopesToInclude.every((key => scopeGroup.includes(key)));
     };
+    const getMissingScopes = (requestedScope, respondedScope) => {
+        const requestedScopes = (requestedScope === null || requestedScope === void 0 ? void 0 : requestedScope.split(" ")) || [];
+        const respondedScopes = (respondedScope === null || respondedScope === void 0 ? void 0 : respondedScope.split(" ")) || [];
+        const missingScopes = requestedScopes.filter((scope => respondedScopes.indexOf(scope) == -1));
+        return missingScopes.join(",");
+    };
     const getScopeToRequest = (useMrrt, authorizationParams, cachedAudience, cachedScope) => {
         var _a;
         if (useMrrt && cachedAudience && cachedScope) {
@@ -2018,6 +2084,11 @@
             await Promise.all([ this.storage.clearNonces(), this.storage.clearKeyPairs() ]);
         }
     }
+    var TokenType;
+    (function(TokenType) {
+        TokenType["Bearer"] = "Bearer";
+        TokenType["DPoP"] = "DPoP";
+    })(TokenType || (TokenType = {}));
     class Fetcher {
         constructor(config, hooks) {
             this.hooks = hooks;
@@ -2042,15 +2113,25 @@
         getAccessToken(authParams) {
             return this.config.getAccessToken ? this.config.getAccessToken(authParams) : this.hooks.getAccessToken(authParams);
         }
+        extractUrl(info) {
+            if (typeof info === "string") {
+                return info;
+            }
+            if (info instanceof URL) {
+                return info.href;
+            }
+            return info.url;
+        }
         buildBaseRequest(info, init) {
-            const request = new Request(info, init);
             if (!this.config.baseUrl) {
-                return request;
+                return new Request(info, init);
             }
-            return new Request(this.buildUrl(this.config.baseUrl, request.url), request);
+            const finalUrl = this.buildUrl(this.config.baseUrl, this.extractUrl(info));
+            const finalInfo = info instanceof Request ? new Request(finalUrl, info) : finalUrl;
+            return new Request(finalInfo, init);
         }
-        setAuthorizationHeader(request, accessToken) {
-            request.headers.set("authorization", `${this.config.dpopNonceId ? "DPoP" : "Bearer"} ${accessToken}`);
+        setAuthorizationHeader(request, accessToken, tokenType = TokenType.Bearer) {
+            request.headers.set("authorization", `${tokenType} ${accessToken}`);
         }
         async setDpopProofHeader(request, accessToken) {
             if (!this.config.dpopNonceId) {
@@ -2066,9 +2147,20 @@
             request.headers.set("dpop", dpopProof);
         }
         async prepareRequest(request, authParams) {
-            const accessToken = await this.getAccessToken(authParams);
-            this.setAuthorizationHeader(request, accessToken);
-            await this.setDpopProofHeader(request, accessToken);
+            const accessTokenResponse = await this.getAccessToken(authParams);
+            let tokenType;
+            let accessToken;
+            if (typeof accessTokenResponse === "string") {
+                tokenType = this.config.dpopNonceId ? TokenType.DPoP : TokenType.Bearer;
+                accessToken = accessTokenResponse;
+            } else {
+                tokenType = accessTokenResponse.token_type;
+                accessToken = accessTokenResponse.access_token;
+            }
+            this.setAuthorizationHeader(request, accessToken, tokenType);
+            if (tokenType === TokenType.DPoP) {
+                await this.setDpopProofHeader(request, accessToken);
+            }
         }
         getHeader(headers, name) {
             if (Array.isArray(headers)) {
@@ -2084,7 +2176,7 @@
                 return false;
             }
             const wwwAuthHeader = this.getHeader(response.headers, "www-authenticate");
-            return wwwAuthHeader.includes("use_dpop_nonce");
+            return wwwAuthHeader.includes("invalid_dpop_nonce") || wwwAuthHeader.includes("use_dpop_nonce");
         }
         async handleResponse(response, callbacks) {
             const newDpopNonce = this.getHeader(response.headers, DPOP_NONCE_HEADER);
@@ -2175,6 +2267,7 @@
     class Auth0Client {
         constructor(options) {
             this.userCache = (new InMemoryCache).enclosedCache;
+            this.activeLockKeys = new Set;
             this.defaultOptions = {
                 authorizationParams: {
                     scope: DEFAULT_SCOPE
@@ -2183,7 +2276,11 @@
                 useFormData: true
             };
             this._releaseLockOnPageHide = async () => {
-                await lock.releaseLock(GET_TOKEN_SILENTLY_LOCK_KEY);
+                const lockKeysToRelease = Array.from(this.activeLockKeys);
+                for (const lockKey of lockKeysToRelease) {
+                    await lock.releaseLock(lockKey);
+                }
+                this.activeLockKeys.clear();
                 window.removeEventListener("pagehide", this._releaseLockOnPageHide);
             };
             this.options = Object.assign(Object.assign(Object.assign({}, this.defaultOptions), options), {
@@ -2210,7 +2307,7 @@
             this.isAuthenticatedCookieName = buildIsAuthenticatedCookieName(this.options.clientId);
             this.sessionCheckExpiryDays = options.sessionCheckExpiryDays || DEFAULT_SESSION_CHECK_EXPIRY_DAYS;
             const transactionStorage = options.useCookiesForTransactions ? this.cookieStorage : SessionStorage;
-            this.scope = getUniqueScopes("openid", this.options.authorizationParams.scope, this.options.useRefreshTokens ? "offline_access" : "");
+            this.scope = injectDefaultScopes(this.options.authorizationParams.scope, "openid", this.options.useRefreshTokens ? "offline_access" : "");
             this.transactionManager = new TransactionManager(transactionStorage, this.options.clientId, this.options.cookieDomain);
             this.nowProvider = this.options.nowProvider || DEFAULT_NOW_PROVIDER;
             this.cacheManager = new CacheManager(cache, !cache.allKeys ? new CacheKeyManifest(cache, this.options.clientId) : undefined, this.nowProvider);
@@ -2225,7 +2322,8 @@
                     authorizationParams: {
                         scope: "create:me:connected_accounts",
                         audience: myAccountApiIdentifier
-                    }
+                    },
+                    detailedResponse: true
                 })
             }));
             this.myAccountApi = new MyAccountApiClient(myAccountFetcher, myAccountApiIdentifier);
@@ -2283,7 +2381,7 @@
                 nonce: nonce,
                 code_verifier: code_verifier,
                 scope: params.scope,
-                audience: params.audience || "default",
+                audience: params.audience || DEFAULT_AUDIENCE,
                 redirect_uri: params.redirect_uri,
                 state: state,
                 url: url
@@ -2433,12 +2531,12 @@
             } catch (_) {}
         }
         async getTokenSilently(options = {}) {
-            var _a;
+            var _a, _b;
             const localOptions = Object.assign(Object.assign({
                 cacheMode: "on"
             }, options), {
                 authorizationParams: Object.assign(Object.assign(Object.assign({}, this.options.authorizationParams), options.authorizationParams), {
-                    scope: getUniqueScopes(this.scope, (_a = options.authorizationParams) === null || _a === void 0 ? void 0 : _a.scope)
+                    scope: scopesToRequest(this.scope, (_a = options.authorizationParams) === null || _a === void 0 ? void 0 : _a.scope, ((_b = options.authorizationParams) === null || _b === void 0 ? void 0 : _b.audience) || this.options.authorizationParams.audience)
                 })
             });
             const result = await singlePromise((() => this._getTokenSilently(localOptions)), `${this.options.clientId}::${localOptions.authorizationParams.audience}::${localOptions.authorizationParams.scope}`);
@@ -2449,7 +2547,7 @@
             if (cacheMode !== "off") {
                 const entry = await this._getEntryFromCache({
                     scope: getTokenOptions.authorizationParams.scope,
-                    audience: getTokenOptions.authorizationParams.audience || "default",
+                    audience: getTokenOptions.authorizationParams.audience || DEFAULT_AUDIENCE,
                     clientId: this.options.clientId,
                     cacheMode: cacheMode
                 });
@@ -2460,13 +2558,17 @@
             if (cacheMode === "cache-only") {
                 return;
             }
-            if (await retryPromise((() => lock.acquireLock(GET_TOKEN_SILENTLY_LOCK_KEY, 5e3)), 10)) {
-                try {
+            const lockKey = buildGetTokenSilentlyLockKey(this.options.clientId, getTokenOptions.authorizationParams.audience || "default");
+            if (await retryPromise((() => lock.acquireLock(lockKey, 5e3)), 10)) {
+                this.activeLockKeys.add(lockKey);
+                if (this.activeLockKeys.size === 1) {
                     window.addEventListener("pagehide", this._releaseLockOnPageHide);
+                }
+                try {
                     if (cacheMode !== "off") {
                         const entry = await this._getEntryFromCache({
                             scope: getTokenOptions.authorizationParams.scope,
-                            audience: getTokenOptions.authorizationParams.audience || "default",
+                            audience: getTokenOptions.authorizationParams.audience || DEFAULT_AUDIENCE,
                             clientId: this.options.clientId
                         });
                         if (entry) {
@@ -2485,25 +2587,28 @@
                         expires_in: expires_in
                     });
                 } finally {
-                    await lock.releaseLock(GET_TOKEN_SILENTLY_LOCK_KEY);
-                    window.removeEventListener("pagehide", this._releaseLockOnPageHide);
+                    await lock.releaseLock(lockKey);
+                    this.activeLockKeys.delete(lockKey);
+                    if (this.activeLockKeys.size === 0) {
+                        window.removeEventListener("pagehide", this._releaseLockOnPageHide);
+                    }
                 }
             } else {
                 throw new TimeoutError;
             }
         }
         async getTokenWithPopup(options = {}, config = {}) {
-            var _a;
+            var _a, _b;
             const localOptions = Object.assign(Object.assign({}, options), {
                 authorizationParams: Object.assign(Object.assign(Object.assign({}, this.options.authorizationParams), options.authorizationParams), {
-                    scope: getUniqueScopes(this.scope, (_a = options.authorizationParams) === null || _a === void 0 ? void 0 : _a.scope)
+                    scope: scopesToRequest(this.scope, (_a = options.authorizationParams) === null || _a === void 0 ? void 0 : _a.scope, ((_b = options.authorizationParams) === null || _b === void 0 ? void 0 : _b.audience) || this.options.authorizationParams.audience)
                 })
             });
             config = Object.assign(Object.assign({}, DEFAULT_POPUP_CONFIG_OPTIONS), config);
             await this.loginWithPopup(localOptions, config);
             const cache = await this.cacheManager.get(new CacheKey({
                 scope: localOptions.authorizationParams.scope,
-                audience: localOptions.authorizationParams.audience || "default",
+                audience: localOptions.authorizationParams.audience || DEFAULT_AUDIENCE,
                 clientId: this.options.clientId
             }), undefined, this.options.useMrrt);
             return cache.access_token;
@@ -2601,14 +2706,14 @@
         async _getTokenUsingRefreshToken(options) {
             const cache = await this.cacheManager.get(new CacheKey({
                 scope: options.authorizationParams.scope,
-                audience: options.authorizationParams.audience || "default",
+                audience: options.authorizationParams.audience || DEFAULT_AUDIENCE,
                 clientId: this.options.clientId
             }), undefined, this.options.useMrrt);
             if ((!cache || !cache.refresh_token) && !this.worker) {
                 if (this.options.useRefreshTokensFallback) {
                     return await this._getTokenFromIFrame(options);
                 }
-                throw new MissingRefreshTokenError(options.authorizationParams.audience || "default", options.authorizationParams.scope);
+                throw new MissingRefreshTokenError(options.authorizationParams.audience || DEFAULT_AUDIENCE, options.authorizationParams.scope);
             }
             const redirect_uri = options.authorizationParams.redirect_uri || this.options.authorizationParams.redirect_uri || window.location.origin;
             const timeout = typeof options.timeoutInSeconds === "number" ? options.timeoutInSeconds * 1e3 : null;
@@ -2634,14 +2739,16 @@
                             if (this.options.useRefreshTokensFallback) {
                                 return await this._getTokenFromIFrame(options);
                             }
-                            throw new MissingRefreshTokenError(options.authorizationParams.audience || "default", options.authorizationParams.scope);
+                            await this.cacheManager.remove(this.options.clientId, options.authorizationParams.audience, options.authorizationParams.scope);
+                            const missingScopes = getMissingScopes(scopesToRequest, tokenResult.scope);
+                            throw new MissingScopesError(options.authorizationParams.audience || "default", missingScopes);
                         }
                     }
                 }
                 return Object.assign(Object.assign({}, tokenResult), {
                     scope: options.authorizationParams.scope,
                     oauthTokenScope: tokenResult.scope,
-                    audience: options.authorizationParams.audience || "default"
+                    audience: options.authorizationParams.audience || DEFAULT_AUDIENCE
                 });
             } catch (e) {
                 if ((e.message.indexOf(MISSING_REFRESH_TOKEN_ERROR_MESSAGE) > -1 || e.message && e.message.indexOf(INVALID_REFRESH_TOKEN_ERROR_MESSAGE) > -1) && this.options.useRefreshTokensFallback) {
@@ -2660,11 +2767,12 @@
             await this.cacheManager.set(entryWithoutIdToken);
         }
         async _getIdTokenFromCache() {
-            const audience = this.options.authorizationParams.audience || "default";
+            const audience = this.options.authorizationParams.audience || DEFAULT_AUDIENCE;
+            const scope = this.scope[audience];
             const cache = await this.cacheManager.getIdToken(new CacheKey({
                 clientId: this.options.clientId,
                 audience: audience,
-                scope: this.scope
+                scope: scope
             }));
             const currentCache = this.userCache.get(CACHE_KEY_ID_TOKEN_SUFFIX);
             if (cache && cache.id_token === (currentCache === null || currentCache === void 0 ? void 0 : currentCache.id_token)) {
@@ -2710,7 +2818,7 @@
             await this._saveEntryInCache(Object.assign(Object.assign(Object.assign(Object.assign({}, authResult), {
                 decodedToken: decodedToken,
                 scope: options.scope,
-                audience: options.audience || "default"
+                audience: options.audience || DEFAULT_AUDIENCE
             }), authResult.scope ? {
                 oauthTokenScope: authResult.scope
             } : null), {
@@ -2730,7 +2838,7 @@
                 grant_type: "urn:ietf:params:oauth:grant-type:token-exchange",
                 subject_token: options.subject_token,
                 subject_token_type: options.subject_token_type,
-                scope: getUniqueScopes(options.scope, this.scope),
+                scope: scopesToRequest(this.scope, options.scope, options.audience || this.options.authorizationParams.audience),
                 audience: options.audience || this.options.authorizationParams.audience
             });
         }
@@ -2752,9 +2860,6 @@
             return this.dpop.generateProof(params);
         }
         createFetcher(config = {}) {
-            if (this.options.useDpop && !config.dpopNonceId) {
-                throw new TypeError("When `useDpop` is enabled, `dpopNonceId` must be set when calling `createFetcher()`.");
-            }
             return new Fetcher(config, {
                 isDpopEnabled: () => !!this.options.useDpop,
                 getAccessToken: authParams => {
@@ -2763,7 +2868,8 @@
                         authorizationParams: {
                             scope: (_a = authParams === null || authParams === void 0 ? void 0 : authParams.scope) === null || _a === void 0 ? void 0 : _a.join(" "),
                             audience: authParams === null || authParams === void 0 ? void 0 : authParams.audience
-                        }
+                        },
+                        detailedResponse: true
                     });
                 },
                 getDpopNonce: () => this.getDpopNonce(config.dpopNonceId),
@@ -2772,12 +2878,6 @@
             });
         }
         async connectAccountWithRedirect(options) {
-            if (!this.options.useDpop) {
-                throw new Error("`useDpop` option must be enabled before using connectAccountWithRedirect.");
-            }
-            if (!this.options.useMrrt) {
-                throw new Error("`useMrrt` option must be enabled before using connectAccountWithRedirect.");
-            }
             const {openUrl: openUrl, appState: appState, connection: connection, authorization_params: authorization_params, redirectUri: redirectUri = this.options.authorizationParams.redirect_uri || window.location.origin} = options;
             if (!connection) {
                 throw new Error("connection is required");