@auth0/auth0-spa-js 2.4.1 → 2.6.0

package/README.md

@@ -29,7 +29,7 @@ npm install @auth0/auth0-spa-js
 From the CDN:
 
 ```html
-<script src="https://cdn.auth0.com/js/auth0-spa-js/2.4/auth0-spa-js.production.js"></script>
+<script src="https://cdn.auth0.com/js/auth0-spa-js/2.6/auth0-spa-js.production.js"></script>
 ```
 
 ### Configure Auth0

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

@@ -540,7 +540,7 @@
         exports.default = SuperTokensLock;
     }));
     var Lock = unwrapExports(browserTabsLock);
-    var version = "2.4.1";
+    var version = "2.6.0";
     const DEFAULT_AUTHORIZE_TIMEOUT_IN_SECONDS = 60;
     const DEFAULT_POPUP_CONFIG_OPTIONS = {
         timeoutInSeconds: DEFAULT_AUTHORIZE_TIMEOUT_IN_SECONDS
@@ -577,6 +577,15 @@
             Object.setPrototypeOf(this, AuthenticationError.prototype);
         }
     }
+    class ConnectError extends GenericError {
+        constructor(error, error_description, connection, state, appState = null) {
+            super(error, error_description);
+            this.connection = connection;
+            this.state = state;
+            this.appState = appState;
+            Object.setPrototypeOf(this, ConnectError.prototype);
+        }
+    }
     class TimeoutError extends GenericError {
         constructor() {
             super("timeout", "Timeout");
@@ -630,6 +639,7 @@
         return {
             state: searchParams.get("state"),
             code: searchParams.get("code") || undefined,
+            connect_code: searchParams.get("connect_code") || undefined,
             error: searchParams.get("error") || undefined,
             error_description: searchParams.get("error_description") || undefined
         };
@@ -1114,7 +1124,7 @@
             clearTimeout(timeoutId);
         }));
     };
-    const fetchWithWorker = async (fetchUrl, audience, scope, fetchOptions, timeout, worker, useFormData) => sendMessage({
+    const fetchWithWorker = async (fetchUrl, audience, scope, fetchOptions, timeout, worker, useFormData, useMrrt) => sendMessage({
         auth: {
             audience: audience,
             scope: scope
@@ -1122,16 +1132,17 @@
         timeout: timeout,
         fetchUrl: fetchUrl,
         fetchOptions: fetchOptions,
-        useFormData: useFormData
+        useFormData: useFormData,
+        useMrrt: useMrrt
     }, worker);
-    const switchFetch = async (fetchUrl, audience, scope, fetchOptions, worker, useFormData, timeout = DEFAULT_FETCH_TIMEOUT_MS) => {
+    const switchFetch = async (fetchUrl, audience, scope, fetchOptions, worker, useFormData, timeout = DEFAULT_FETCH_TIMEOUT_MS, useMrrt) => {
         if (worker) {
-            return fetchWithWorker(fetchUrl, audience, scope, fetchOptions, timeout, worker, useFormData);
+            return fetchWithWorker(fetchUrl, audience, scope, fetchOptions, timeout, worker, useFormData, useMrrt);
         } else {
             return fetchWithoutWorker(fetchUrl, fetchOptions, timeout);
         }
     };
-    async function getJSON(url, timeout, audience, scope, options, worker, useFormData, dpop, isDpopRetry) {
+    async function getJSON(url, timeout, audience, scope, options, worker, useFormData, useMrrt, dpop, isDpopRetry) {
         if (dpop) {
             const dpopProof = await dpop.generateProof({
                 url: url,
@@ -1146,7 +1157,7 @@
         let response;
         for (let i = 0; i < DEFAULT_SILENT_TOKEN_RETRY_COUNT; i++) {
             try {
-                response = await switchFetch(url, audience, scope, options, worker, useFormData, timeout);
+                response = await switchFetch(url, audience, scope, options, worker, useFormData, timeout, useMrrt);
                 fetchError = null;
                 break;
             } catch (e) {
@@ -1176,19 +1187,23 @@
                 if (!dpop || !newDpopNonce || isDpopRetry) {
                     throw new UseDpopNonceError(newDpopNonce);
                 }
-                return getJSON(url, timeout, audience, scope, options, worker, useFormData, dpop, true);
+                return getJSON(url, timeout, audience, scope, options, worker, useFormData, useMrrt, dpop, true);
             }
             throw new GenericError(error || "request_error", errorMessage);
         }
         return data;
     }
     async function oauthToken(_a, worker) {
-        var {baseUrl: baseUrl, timeout: timeout, audience: audience, scope: scope, auth0Client: auth0Client, useFormData: useFormData, dpop: dpop} = _a, options = __rest(_a, [ "baseUrl", "timeout", "audience", "scope", "auth0Client", "useFormData", "dpop" ]);
+        var {baseUrl: baseUrl, timeout: timeout, audience: audience, scope: scope, auth0Client: auth0Client, useFormData: useFormData, useMrrt: useMrrt, dpop: dpop} = _a, options = __rest(_a, [ "baseUrl", "timeout", "audience", "scope", "auth0Client", "useFormData", "useMrrt", "dpop" ]);
         const isTokenExchange = options.grant_type === "urn:ietf:params:oauth:grant-type:token-exchange";
-        const allParams = Object.assign(Object.assign(Object.assign({}, options), isTokenExchange && audience && {
+        const refreshWithMrrt = options.grant_type === "refresh_token" && useMrrt;
+        const allParams = Object.assign(Object.assign(Object.assign(Object.assign({}, options), isTokenExchange && audience && {
             audience: audience
         }), isTokenExchange && scope && {
             scope: scope
+        }), refreshWithMrrt && {
+            audience: audience,
+            scope: scope
         });
         const body = useFormData ? createQueryParams(allParams) : JSON.stringify(allParams);
         const isDpopSupported = isGrantTypeSupported(options.grant_type);
@@ -1199,7 +1214,7 @@
                 "Content-Type": useFormData ? "application/x-www-form-urlencoded" : "application/json",
                 "Auth0-Client": btoa(JSON.stringify(auth0Client || DEFAULT_AUTH0_CLIENT))
             }
-        }, worker, useFormData, isDpopSupported ? dpop : undefined);
+        }, 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(" ");
@@ -1318,7 +1333,7 @@
                 decodedToken: entry.decodedToken
             };
         }
-        async get(cacheKey, expiryAdjustmentSeconds = DEFAULT_EXPIRY_ADJUSTMENT_SECONDS) {
+        async get(cacheKey, expiryAdjustmentSeconds = DEFAULT_EXPIRY_ADJUSTMENT_SECONDS, useMrrt = false, cacheMode) {
             var _a;
             let wrappedEntry = await this.cache.get(cacheKey.toKey());
             if (!wrappedEntry) {
@@ -1328,6 +1343,9 @@
                 if (matchedKey) {
                     wrappedEntry = await this.cache.get(matchedKey);
                 }
+                if (!matchedKey && useMrrt && cacheMode !== "cache-only") {
+                    return this.getEntryWithRefreshToken(cacheKey, keys);
+                }
             }
             if (!wrappedEntry) {
                 return;
@@ -1336,11 +1354,7 @@
             const nowSeconds = Math.floor(now / 1e3);
             if (wrappedEntry.expiresAt - expiryAdjustmentSeconds < nowSeconds) {
                 if (wrappedEntry.body.refresh_token) {
-                    wrappedEntry.body = {
-                        refresh_token: wrappedEntry.body.refresh_token
-                    };
-                    await this.cache.set(cacheKey.toKey(), wrappedEntry);
-                    return wrappedEntry.body;
+                    return this.modifiedCachedEntry(wrappedEntry, cacheKey);
                 }
                 await this.cache.remove(cacheKey.toKey());
                 await ((_a = this.keyManifest) === null || _a === void 0 ? void 0 : _a.remove(cacheKey.toKey()));
@@ -1348,6 +1362,19 @@
             }
             return wrappedEntry.body;
         }
+        async modifiedCachedEntry(wrappedEntry, cacheKey) {
+            wrappedEntry.body = {
+                refresh_token: wrappedEntry.body.refresh_token,
+                audience: wrappedEntry.body.audience,
+                scope: wrappedEntry.body.scope
+            };
+            await this.cache.set(cacheKey.toKey(), wrappedEntry);
+            return {
+                refresh_token: wrappedEntry.body.refresh_token,
+                audience: wrappedEntry.body.audience,
+                scope: wrappedEntry.body.scope
+            };
+        }
         async set(entry) {
             var _a;
             const cacheKey = new CacheKey({
@@ -1400,6 +1427,33 @@
                 return cacheKey.prefix === CACHE_KEY_PREFIX && cacheKey.clientId === keyToMatch.clientId && cacheKey.audience === keyToMatch.audience && hasAllScopes;
             }))[0];
         }
+        async getEntryWithRefreshToken(keyToMatch, allKeys) {
+            var _a;
+            for (const key of allKeys) {
+                const cacheKey = CacheKey.fromKey(key);
+                if (cacheKey.prefix === CACHE_KEY_PREFIX && cacheKey.clientId === keyToMatch.clientId) {
+                    const cachedEntry = await this.cache.get(key);
+                    if ((_a = cachedEntry === null || cachedEntry === void 0 ? void 0 : cachedEntry.body) === null || _a === void 0 ? void 0 : _a.refresh_token) {
+                        return this.modifiedCachedEntry(cachedEntry, keyToMatch);
+                    }
+                }
+            }
+            return undefined;
+        }
+        async updateEntry(oldRefreshToken, newRefreshToken) {
+            var _a;
+            const allKeys = await this.getCacheKeys();
+            if (!allKeys) return;
+            for (const key of allKeys) {
+                const entry = await this.cache.get(key);
+                if (((_a = entry === null || entry === void 0 ? void 0 : entry.body) === null || _a === void 0 ? void 0 : _a.refresh_token) === oldRefreshToken) {
+                    const cacheEntry = Object.assign(Object.assign({}, entry.body), {
+                        refresh_token: newRefreshToken
+                    });
+                    await this.set(cacheEntry);
+                }
+            }
+        }
     }
     const TRANSACTION_STORAGE_KEY_PREFIX = "a0.spajs.txs";
     class TransactionManager {
@@ -1712,6 +1766,12 @@
             sessionStorage.removeItem(key);
         }
     };
+    exports.ResponseType = void 0;
+    (function(ResponseType) {
+        ResponseType["Code"] = "code";
+        ResponseType["ConnectCode"] = "connect_code";
+    })(exports.ResponseType || (exports.ResponseType = {}));
+    class User {}
     function decodeBase64(base64, enableUnicode) {
         var binaryString = atob(base64);
         if (enableUnicode) {
@@ -1741,7 +1801,7 @@
             return new Worker(url, options);
         };
     }
-    var WorkerFactory = createBase64WorkerFactory("Lyogcm9sbHVwLXBsdWdpbi13ZWItd29ya2VyLWxvYWRlciAqLwooZnVuY3Rpb24oKSB7CiAgICAidXNlIHN0cmljdCI7CiAgICBjbGFzcyBHZW5lcmljRXJyb3IgZXh0ZW5kcyBFcnJvciB7CiAgICAgICAgY29uc3RydWN0b3IoZXJyb3IsIGVycm9yX2Rlc2NyaXB0aW9uKSB7CiAgICAgICAgICAgIHN1cGVyKGVycm9yX2Rlc2NyaXB0aW9uKTsKICAgICAgICAgICAgdGhpcy5lcnJvciA9IGVycm9yOwogICAgICAgICAgICB0aGlzLmVycm9yX2Rlc2NyaXB0aW9uID0gZXJyb3JfZGVzY3JpcHRpb247CiAgICAgICAgICAgIE9iamVjdC5zZXRQcm90b3R5cGVPZih0aGlzLCBHZW5lcmljRXJyb3IucHJvdG90eXBlKTsKICAgICAgICB9CiAgICAgICAgc3RhdGljIGZyb21QYXlsb2FkKHtlcnJvcjogZXJyb3IsIGVycm9yX2Rlc2NyaXB0aW9uOiBlcnJvcl9kZXNjcmlwdGlvbn0pIHsKICAgICAgICAgICAgcmV0dXJuIG5ldyBHZW5lcmljRXJyb3IoZXJyb3IsIGVycm9yX2Rlc2NyaXB0aW9uKTsKICAgICAgICB9CiAgICB9CiAgICBjbGFzcyBNaXNzaW5nUmVmcmVzaFRva2VuRXJyb3IgZXh0ZW5kcyBHZW5lcmljRXJyb3IgewogICAgICAgIGNvbnN0cnVjdG9yKGF1ZGllbmNlLCBzY29wZSkgewogICAgICAgICAgICBzdXBlcigibWlzc2luZ19yZWZyZXNoX3Rva2VuIiwgYE1pc3NpbmcgUmVmcmVzaCBUb2tlbiAoYXVkaWVuY2U6ICcke3ZhbHVlT3JFbXB0eVN0cmluZyhhdWRpZW5jZSwgWyAiZGVmYXVsdCIgXSl9Jywgc2NvcGU6ICcke3ZhbHVlT3JFbXB0eVN0cmluZyhzY29wZSl9JylgKTsKICAgICAgICAgICAgdGhpcy5hdWRpZW5jZSA9IGF1ZGllbmNlOwogICAgICAgICAgICB0aGlzLnNjb3BlID0gc2NvcGU7CiAgICAgICAgICAgIE9iamVjdC5zZXRQcm90b3R5cGVPZih0aGlzLCBNaXNzaW5nUmVmcmVzaFRva2VuRXJyb3IucHJvdG90eXBlKTsKICAgICAgICB9CiAgICB9CiAgICBmdW5jdGlvbiB2YWx1ZU9yRW1wdHlTdHJpbmcodmFsdWUsIGV4Y2x1ZGUgPSBbXSkgewogICAgICAgIHJldHVybiB2YWx1ZSAmJiAhZXhjbHVkZS5pbmNsdWRlcyh2YWx1ZSkgPyB2YWx1ZSA6ICIiOwogICAgfQogICAgZnVuY3Rpb24gX19yZXN0KHMsIGUpIHsKICAgICAgICB2YXIgdCA9IHt9OwogICAgICAgIGZvciAodmFyIHAgaW4gcykgaWYgKE9iamVjdC5wcm90b3R5cGUuaGFzT3duUHJvcGVydHkuY2FsbChzLCBwKSAmJiBlLmluZGV4T2YocCkgPCAwKSB0W3BdID0gc1twXTsKICAgICAgICBpZiAocyAhPSBudWxsICYmIHR5cGVvZiBPYmplY3QuZ2V0T3duUHJvcGVydHlTeW1ib2xzID09PSAiZnVuY3Rpb24iKSBmb3IgKHZhciBpID0gMCwgcCA9IE9iamVjdC5nZXRPd25Qcm9wZXJ0eVN5bWJvbHMocyk7IGkgPCBwLmxlbmd0aDsgaSsrKSB7CiAgICAgICAgICAgIGlmIChlLmluZGV4T2YocFtpXSkgPCAwICYmIE9iamVjdC5wcm90b3R5cGUucHJvcGVydHlJc0VudW1lcmFibGUuY2FsbChzLCBwW2ldKSkgdFtwW2ldXSA9IHNbcFtpXV07CiAgICAgICAgfQogICAgICAgIHJldHVybiB0OwogICAgfQogICAgdHlwZW9mIFN1cHByZXNzZWRFcnJvciA9PT0gImZ1bmN0aW9uIiA/IFN1cHByZXNzZWRFcnJvciA6IGZ1bmN0aW9uKGVycm9yLCBzdXBwcmVzc2VkLCBtZXNzYWdlKSB7CiAgICAgICAgdmFyIGUgPSBuZXcgRXJyb3IobWVzc2FnZSk7CiAgICAgICAgcmV0dXJuIGUubmFtZSA9ICJTdXBwcmVzc2VkRXJyb3IiLCBlLmVycm9yID0gZXJyb3IsIGUuc3VwcHJlc3NlZCA9IHN1cHByZXNzZWQsIGU7CiAgICB9OwogICAgY29uc3Qgc3RyaXBVbmRlZmluZWQgPSBwYXJhbXMgPT4gT2JqZWN0LmtleXMocGFyYW1zKS5maWx0ZXIoKGsgPT4gdHlwZW9mIHBhcmFtc1trXSAhPT0gInVuZGVmaW5lZCIpKS5yZWR1Y2UoKChhY2MsIGtleSkgPT4gT2JqZWN0LmFzc2lnbihPYmplY3QuYXNzaWduKHt9LCBhY2MpLCB7CiAgICAgICAgW2tleV06IHBhcmFtc1trZXldCiAgICB9KSksIHt9KTsKICAgIGNvbnN0IGNyZWF0ZVF1ZXJ5UGFyYW1zID0gX2EgPT4gewogICAgICAgIHZhciB7Y2xpZW50SWQ6IGNsaWVudF9pZH0gPSBfYSwgcGFyYW1zID0gX19yZXN0KF9hLCBbICJjbGllbnRJZCIgXSk7CiAgICAgICAgcmV0dXJuIG5ldyBVUkxTZWFyY2hQYXJhbXMoc3RyaXBVbmRlZmluZWQoT2JqZWN0LmFzc2lnbih7CiAgICAgICAgICAgIGNsaWVudF9pZDogY2xpZW50X2lkCiAgICAgICAgfSwgcGFyYW1zKSkpLnRvU3RyaW5nKCk7CiAgICB9OwogICAgY29uc3QgZnJvbUVudHJpZXMgPSBpdGVyYWJsZSA9PiBbIC4uLml0ZXJhYmxlIF0ucmVkdWNlKCgob2JqLCBba2V5LCB2YWxdKSA9PiB7CiAgICAgICAgb2JqW2tleV0gPSB2YWw7CiAgICAgICAgcmV0dXJuIG9iajsKICAgIH0pLCB7fSk7CiAgICBsZXQgcmVmcmVzaFRva2VucyA9IHt9OwogICAgY29uc3QgY2FjaGVLZXkgPSAoYXVkaWVuY2UsIHNjb3BlKSA9PiBgJHthdWRpZW5jZX18JHtzY29wZX1gOwogICAgY29uc3QgZ2V0UmVmcmVzaFRva2VuID0gKGF1ZGllbmNlLCBzY29wZSkgPT4gcmVmcmVzaFRva2Vuc1tjYWNoZUtleShhdWRpZW5jZSwgc2NvcGUpXTsKICAgIGNvbnN0IHNldFJlZnJlc2hUb2tlbiA9IChyZWZyZXNoVG9rZW4sIGF1ZGllbmNlLCBzY29wZSkgPT4gcmVmcmVzaFRva2Vuc1tjYWNoZUtleShhdWRpZW5jZSwgc2NvcGUpXSA9IHJlZnJlc2hUb2tlbjsKICAgIGNvbnN0IGRlbGV0ZVJlZnJlc2hUb2tlbiA9IChhdWRpZW5jZSwgc2NvcGUpID0+IGRlbGV0ZSByZWZyZXNoVG9rZW5zW2NhY2hlS2V5KGF1ZGllbmNlLCBzY29wZSldOwogICAgY29uc3Qgd2FpdCA9IHRpbWUgPT4gbmV3IFByb21pc2UoKHJlc29sdmUgPT4gc2V0VGltZW91dChyZXNvbHZlLCB0aW1lKSkpOwogICAgY29uc3QgZm9ybURhdGFUb09iamVjdCA9IGZvcm1EYXRhID0+IHsKICAgICAgICBjb25zdCBxdWVyeVBhcmFtcyA9IG5ldyBVUkxTZWFyY2hQYXJhbXMoZm9ybURhdGEpOwogICAgICAgIGNvbnN0IHBhcnNlZFF1ZXJ5ID0ge307CiAgICAgICAgcXVlcnlQYXJhbXMuZm9yRWFjaCgoKHZhbCwga2V5KSA9PiB7CiAgICAgICAgICAgIHBhcnNlZFF1ZXJ5W2tleV0gPSB2YWw7CiAgICAgICAgfSkpOwogICAgICAgIHJldHVybiBwYXJzZWRRdWVyeTsKICAgIH07CiAgICBjb25zdCBtZXNzYWdlSGFuZGxlciA9IGFzeW5jICh7ZGF0YToge3RpbWVvdXQ6IHRpbWVvdXQsIGF1dGg6IGF1dGgsIGZldGNoVXJsOiBmZXRjaFVybCwgZmV0Y2hPcHRpb25zOiBmZXRjaE9wdGlvbnMsIHVzZUZvcm1EYXRhOiB1c2VGb3JtRGF0YX0sIHBvcnRzOiBbcG9ydF19KSA9PiB7CiAgICAgICAgbGV0IGhlYWRlcnMgPSB7fTsKICAgICAgICBsZXQganNvbjsKICAgICAgICBjb25zdCB7YXVkaWVuY2U6IGF1ZGllbmNlLCBzY29wZTogc2NvcGV9ID0gYXV0aCB8fCB7fTsKICAgICAgICB0cnkgewogICAgICAgICAgICBjb25zdCBib2R5ID0gdXNlRm9ybURhdGEgPyBmb3JtRGF0YVRvT2JqZWN0KGZldGNoT3B0aW9ucy5ib2R5KSA6IEpTT04ucGFyc2UoZmV0Y2hPcHRpb25zLmJvZHkpOwogICAgICAgICAgICBpZiAoIWJvZHkucmVmcmVzaF90b2tlbiAmJiBib2R5LmdyYW50X3R5cGUgPT09ICJyZWZyZXNoX3Rva2VuIikgewogICAgICAgICAgICAgICAgY29uc3QgcmVmcmVzaFRva2VuID0gZ2V0UmVmcmVzaFRva2VuKGF1ZGllbmNlLCBzY29wZSk7CiAgICAgICAgICAgICAgICBpZiAoIXJlZnJlc2hUb2tlbikgewogICAgICAgICAgICAgICAgICAgIHRocm93IG5ldyBNaXNzaW5nUmVmcmVzaFRva2VuRXJyb3IoYXVkaWVuY2UsIHNjb3BlKTsKICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgIGZldGNoT3B0aW9ucy5ib2R5ID0gdXNlRm9ybURhdGEgPyBjcmVhdGVRdWVyeVBhcmFtcyhPYmplY3QuYXNzaWduKE9iamVjdC5hc3NpZ24oe30sIGJvZHkpLCB7CiAgICAgICAgICAgICAgICAgICAgcmVmcmVzaF90b2tlbjogcmVmcmVzaFRva2VuCiAgICAgICAgICAgICAgICB9KSkgOiBKU09OLnN0cmluZ2lmeShPYmplY3QuYXNzaWduKE9iamVjdC5hc3NpZ24oe30sIGJvZHkpLCB7CiAgICAgICAgICAgICAgICAgICAgcmVmcmVzaF90b2tlbjogcmVmcmVzaFRva2VuCiAgICAgICAgICAgICAgICB9KSk7CiAgICAgICAgICAgIH0KICAgICAgICAgICAgbGV0IGFib3J0Q29udHJvbGxlcjsKICAgICAgICAgICAgaWYgKHR5cGVvZiBBYm9ydENvbnRyb2xsZXIgPT09ICJmdW5jdGlvbiIpIHsKICAgICAgICAgICAgICAgIGFib3J0Q29udHJvbGxlciA9IG5ldyBBYm9ydENvbnRyb2xsZXI7CiAgICAgICAgICAgICAgICBmZXRjaE9wdGlvbnMuc2lnbmFsID0gYWJvcnRDb250cm9sbGVyLnNpZ25hbDsKICAgICAgICAgICAgfQogICAgICAgICAgICBsZXQgcmVzcG9uc2U7CiAgICAgICAgICAgIHRyeSB7CiAgICAgICAgICAgICAgICByZXNwb25zZSA9IGF3YWl0IFByb21pc2UucmFjZShbIHdhaXQodGltZW91dCksIGZldGNoKGZldGNoVXJsLCBPYmplY3QuYXNzaWduKHt9LCBmZXRjaE9wdGlvbnMpKSBdKTsKICAgICAgICAgICAgfSBjYXRjaCAoZXJyb3IpIHsKICAgICAgICAgICAgICAgIHBvcnQucG9zdE1lc3NhZ2UoewogICAgICAgICAgICAgICAgICAgIGVycm9yOiBlcnJvci5tZXNzYWdlCiAgICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgfQogICAgICAgICAgICBpZiAoIXJlc3BvbnNlKSB7CiAgICAgICAgICAgICAgICBpZiAoYWJvcnRDb250cm9sbGVyKSBhYm9ydENvbnRyb2xsZXIuYWJvcnQoKTsKICAgICAgICAgICAgICAgIHBvcnQucG9zdE1lc3NhZ2UoewogICAgICAgICAgICAgICAgICAgIGVycm9yOiAiVGltZW91dCB3aGVuIGV4ZWN1dGluZyAnZmV0Y2gnIgogICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgIH0KICAgICAgICAgICAgaGVhZGVycyA9IGZyb21FbnRyaWVzKHJlc3BvbnNlLmhlYWRlcnMpOwogICAgICAgICAgICBqc29uID0gYXdhaXQgcmVzcG9uc2UuanNvbigpOwogICAgICAgICAgICBpZiAoanNvbi5yZWZyZXNoX3Rva2VuKSB7CiAgICAgICAgICAgICAgICBzZXRSZWZyZXNoVG9rZW4oanNvbi5yZWZyZXNoX3Rva2VuLCBhdWRpZW5jZSwgc2NvcGUpOwogICAgICAgICAgICAgICAgZGVsZXRlIGpzb24ucmVmcmVzaF90b2tlbjsKICAgICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgICAgIGRlbGV0ZVJlZnJlc2hUb2tlbihhdWRpZW5jZSwgc2NvcGUpOwogICAgICAgICAgICB9CiAgICAgICAgICAgIHBvcnQucG9zdE1lc3NhZ2UoewogICAgICAgICAgICAgICAgb2s6IHJlc3BvbnNlLm9rLAogICAgICAgICAgICAgICAganNvbjoganNvbiwKICAgICAgICAgICAgICAgIGhlYWRlcnM6IGhlYWRlcnMKICAgICAgICAgICAgfSk7CiAgICAgICAgfSBjYXRjaCAoZXJyb3IpIHsKICAgICAgICAgICAgcG9ydC5wb3N0TWVzc2FnZSh7CiAgICAgICAgICAgICAgICBvazogZmFsc2UsCiAgICAgICAgICAgICAgICBqc29uOiB7CiAgICAgICAgICAgICAgICAgICAgZXJyb3I6IGVycm9yLmVycm9yLAogICAgICAgICAgICAgICAgICAgIGVycm9yX2Rlc2NyaXB0aW9uOiBlcnJvci5tZXNzYWdlCiAgICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgaGVhZGVyczogaGVhZGVycwogICAgICAgICAgICB9KTsKICAgICAgICB9CiAgICB9OwogICAgewogICAgICAgIGFkZEV2ZW50TGlzdGVuZXIoIm1lc3NhZ2UiLCBtZXNzYWdlSGFuZGxlcik7CiAgICB9Cn0pKCk7Cgo=", 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 && 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);
     const singlePromiseMap = {};
     const singlePromise = (cb, key) => {
         let promise = singlePromiseMap[key];
@@ -1828,6 +1888,30 @@
         });
         return result;
     };
+    const allScopesAreIncluded = (scopeToInclude, scopes) => {
+        const scopeGroup = (scopes === null || scopes === void 0 ? void 0 : scopes.split(" ")) || [];
+        const scopesToInclude = (scopeToInclude === null || scopeToInclude === void 0 ? void 0 : scopeToInclude.split(" ")) || [];
+        return scopesToInclude.every((key => scopeGroup.includes(key)));
+    };
+    const getScopeToRequest = (useMrrt, authorizationParams, cachedAudience, cachedScope) => {
+        var _a;
+        if (useMrrt && cachedAudience && cachedScope) {
+            if (authorizationParams.audience !== cachedAudience) {
+                return authorizationParams.scope;
+            }
+            const cachedScopes = cachedScope.split(" ");
+            const newScopes = ((_a = authorizationParams.scope) === null || _a === void 0 ? void 0 : _a.split(" ")) || [];
+            const newScopesAreIncluded = newScopes.every((scope => cachedScopes.includes(scope)));
+            return cachedScopes.length >= newScopes.length && newScopesAreIncluded ? cachedScope : authorizationParams.scope;
+        }
+        return authorizationParams.scope;
+    };
+    const isRefreshWithMrrt = (cachedAudience, cachedScope, requestAudience, requestScope) => {
+        if (cachedAudience !== requestAudience) {
+            return true;
+        }
+        return !allScopesAreIncluded(requestScope, cachedScope);
+    };
     const VERSION = 1;
     const NAME = "auth0-spa-js";
     const TABLES = {
@@ -1955,8 +2039,8 @@
             }
             throw new TypeError("`url` must be absolute or `baseUrl` non-empty.");
         }
-        getAccessToken() {
-            return this.config.getAccessToken ? this.config.getAccessToken() : this.hooks.getAccessToken();
+        getAccessToken(authParams) {
+            return this.config.getAccessToken ? this.config.getAccessToken(authParams) : this.hooks.getAccessToken(authParams);
         }
         buildBaseRequest(info, init) {
             const request = new Request(info, init);
@@ -1965,7 +2049,7 @@
             }
             return new Request(this.buildUrl(this.config.baseUrl, request.url), request);
         }
-        async setAuthorizationHeader(request, accessToken) {
+        setAuthorizationHeader(request, accessToken) {
             request.headers.set("authorization", `${this.config.dpopNonceId ? "DPoP" : "Bearer"} ${accessToken}`);
         }
         async setDpopProofHeader(request, accessToken) {
@@ -1981,8 +2065,8 @@
             });
             request.headers.set("dpop", dpopProof);
         }
-        async prepareRequest(request) {
-            const accessToken = await this.getAccessToken();
+        async prepareRequest(request, authParams) {
+            const accessToken = await this.getAccessToken(authParams);
             this.setAuthorizationHeader(request, accessToken);
             await this.setDpopProofHeader(request, accessToken);
         }
@@ -2015,19 +2099,76 @@
             }
             return callbacks.onUseDpopNonceError();
         }
-        async internalFetchWithAuth(info, init, callbacks) {
+        async internalFetchWithAuth(info, init, callbacks, authParams) {
             const request = this.buildBaseRequest(info, init);
-            await this.prepareRequest(request);
+            await this.prepareRequest(request, authParams);
             const response = await this.config.fetch(request);
             return this.handleResponse(response, callbacks);
         }
-        fetchWithAuth(info, init) {
+        fetchWithAuth(info, init, authParams) {
             const callbacks = {
                 onUseDpopNonceError: () => this.internalFetchWithAuth(info, init, Object.assign(Object.assign({}, callbacks), {
                     onUseDpopNonceError: undefined
-                }))
+                }), authParams)
             };
-            return this.internalFetchWithAuth(info, init, callbacks);
+            return this.internalFetchWithAuth(info, init, callbacks, authParams);
+        }
+    }
+    class MyAccountApiClient {
+        constructor(myAccountFetcher, apiBase) {
+            this.myAccountFetcher = myAccountFetcher;
+            this.apiBase = apiBase;
+        }
+        async connectAccount(params) {
+            const res = await this.myAccountFetcher.fetchWithAuth(`${this.apiBase}v1/connected-accounts/connect`, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify(params)
+            });
+            return this._handleResponse(res);
+        }
+        async completeAccount(params) {
+            const res = await this.myAccountFetcher.fetchWithAuth(`${this.apiBase}v1/connected-accounts/complete`, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                body: JSON.stringify(params)
+            });
+            return this._handleResponse(res);
+        }
+        async _handleResponse(res) {
+            let body;
+            try {
+                body = await res.text();
+                body = JSON.parse(body);
+            } catch (err) {
+                throw new MyAccountApiError({
+                    type: "invalid_json",
+                    status: res.status,
+                    title: "Invalid JSON response",
+                    detail: body || String(err)
+                });
+            }
+            if (res.ok) {
+                return body;
+            } else {
+                throw new MyAccountApiError(body);
+            }
+        }
+    }
+    class MyAccountApiError extends Error {
+        constructor({type: type, status: status, title: title, detail: detail, validation_errors: validation_errors}) {
+            super(detail);
+            this.name = "MyAccountApiError";
+            this.type = type;
+            this.status = status;
+            this.title = title;
+            this.detail = detail;
+            this.validation_errors = validation_errors;
+            Object.setPrototypeOf(this, MyAccountApiError.prototype);
         }
     }
     const lock = new Lock;
@@ -2076,6 +2217,18 @@
             this.dpop = this.options.useDpop ? new Dpop(this.options.clientId) : undefined;
             this.domainUrl = getDomain(this.options.domain);
             this.tokenIssuer = getTokenIssuer(this.options.issuer, this.domainUrl);
+            const myAccountApiIdentifier = `${this.domainUrl}/me/`;
+            const myAccountFetcher = this.createFetcher(Object.assign(Object.assign({}, this.options.useDpop && {
+                dpopNonceId: "__auth0_my_account_api__"
+            }), {
+                getAccessToken: () => this.getTokenSilently({
+                    authorizationParams: {
+                        scope: "create:me:connected_accounts",
+                        audience: myAccountApiIdentifier
+                    }
+                })
+            }));
+            this.myAccountApi = new MyAccountApiClient(myAccountFetcher, myAccountApiIdentifier);
             if (typeof window !== "undefined" && window.Worker && this.options.useRefreshTokens && cacheLocation === CACHE_LOCATION_MEMORY) {
                 if (this.options.workerUrl) {
                     this.worker = new Worker(this.options.workerUrl);
@@ -2185,7 +2338,8 @@
             const organization = ((_a = urlOptions.authorizationParams) === null || _a === void 0 ? void 0 : _a.organization) || this.options.authorizationParams.organization;
             const _c = await this._prepareAuthorizeUrl(urlOptions.authorizationParams || {}), {url: url} = _c, transaction = __rest(_c, [ "url" ]);
             this.transactionManager.create(Object.assign(Object.assign(Object.assign({}, transaction), {
-                appState: appState
+                appState: appState,
+                response_type: exports.ResponseType.Code
             }), organization && {
                 organization: organization
             }));
@@ -2201,12 +2355,19 @@
             if (queryStringFragments.length === 0) {
                 throw new Error("There are no query params available for parsing.");
             }
-            const {state: state, code: code, error: error, error_description: error_description} = parseAuthenticationResult(queryStringFragments.join(""));
             const transaction = this.transactionManager.get();
             if (!transaction) {
                 throw new GenericError("missing_transaction", "Invalid state");
             }
             this.transactionManager.remove();
+            const authenticationResult = parseAuthenticationResult(queryStringFragments.join(""));
+            if (transaction.response_type === exports.ResponseType.ConnectCode) {
+                return this._handleConnectAccountRedirectCallback(authenticationResult, transaction);
+            }
+            return this._handleLoginRedirectCallback(authenticationResult, transaction);
+        }
+        async _handleLoginRedirectCallback(authenticationResult, transaction) {
+            const {code: code, state: state, error: error, error_description: error_description} = authenticationResult;
             if (error) {
                 throw new AuthenticationError(error, error_description || error, state, transaction.appState);
             }
@@ -2229,9 +2390,32 @@
                 organization: organization
             });
             return {
-                appState: transaction.appState
+                appState: transaction.appState,
+                response_type: exports.ResponseType.Code
             };
         }
+        async _handleConnectAccountRedirectCallback(connectResult, transaction) {
+            const {connect_code: connect_code, state: state, error: error, error_description: error_description} = connectResult;
+            if (error) {
+                throw new ConnectError(error, error_description || error, transaction.connection, state, transaction.appState);
+            }
+            if (!connect_code) {
+                throw new GenericError("missing_connect_code", "Missing connect code");
+            }
+            if (!transaction.code_verifier || !transaction.state || !transaction.auth_session || !transaction.redirect_uri || transaction.state !== state) {
+                throw new GenericError("state_mismatch", "Invalid state");
+            }
+            const data = await this.myAccountApi.completeAccount({
+                auth_session: transaction.auth_session,
+                connect_code: connect_code,
+                redirect_uri: transaction.redirect_uri,
+                code_verifier: transaction.code_verifier
+            });
+            return Object.assign(Object.assign({}, data), {
+                appState: transaction.appState,
+                response_type: exports.ResponseType.ConnectCode
+            });
+        }
         async checkSession(options) {
             if (!this.cookieStorage.get(this.isAuthenticatedCookieName)) {
                 if (!this.cookieStorage.get(OLD_IS_AUTHENTICATED_COOKIE_NAME)) {
@@ -2266,7 +2450,8 @@
                 const entry = await this._getEntryFromCache({
                     scope: getTokenOptions.authorizationParams.scope,
                     audience: getTokenOptions.authorizationParams.audience || "default",
-                    clientId: this.options.clientId
+                    clientId: this.options.clientId,
+                    cacheMode: cacheMode
                 });
                 if (entry) {
                     return entry;
@@ -2320,7 +2505,7 @@
                 scope: localOptions.authorizationParams.scope,
                 audience: localOptions.authorizationParams.audience || "default",
                 clientId: this.options.clientId
-            }));
+            }), undefined, this.options.useMrrt);
             return cache.access_token;
         }
         async isAuthenticated() {
@@ -2418,7 +2603,7 @@
                 scope: options.authorizationParams.scope,
                 audience: options.authorizationParams.audience || "default",
                 clientId: this.options.clientId
-            }));
+            }), undefined, this.options.useMrrt);
             if ((!cache || !cache.refresh_token) && !this.worker) {
                 if (this.options.useRefreshTokensFallback) {
                     return await this._getTokenFromIFrame(options);
@@ -2427,6 +2612,7 @@
             }
             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;
+            const scopesToRequest = getScopeToRequest(this.options.useMrrt, options.authorizationParams, cache === null || cache === void 0 ? void 0 : cache.audience, cache === null || cache === void 0 ? void 0 : cache.scope);
             try {
                 const tokenResult = await this._requestToken(Object.assign(Object.assign(Object.assign({}, options.authorizationParams), {
                     grant_type: "refresh_token",
@@ -2434,7 +2620,24 @@
                     redirect_uri: redirect_uri
                 }), timeout && {
                     timeout: timeout
-                }));
+                }), {
+                    scopesToRequest: scopesToRequest
+                });
+                if (tokenResult.refresh_token && this.options.useMrrt && (cache === null || cache === void 0 ? void 0 : cache.refresh_token)) {
+                    await this.cacheManager.updateEntry(cache.refresh_token, tokenResult.refresh_token);
+                }
+                if (this.options.useMrrt) {
+                    const isRefreshMrrt = isRefreshWithMrrt(cache === null || cache === void 0 ? void 0 : cache.audience, cache === null || cache === void 0 ? void 0 : cache.scope, options.authorizationParams.audience, options.authorizationParams.scope);
+                    if (isRefreshMrrt) {
+                        const tokenHasAllScopes = allScopesAreIncluded(scopesToRequest, tokenResult.scope);
+                        if (!tokenHasAllScopes) {
+                            if (this.options.useRefreshTokensFallback) {
+                                return await this._getTokenFromIFrame(options);
+                            }
+                            throw new MissingRefreshTokenError(options.authorizationParams.audience || "default", options.authorizationParams.scope);
+                        }
+                    }
+                }
                 return Object.assign(Object.assign({}, tokenResult), {
                     scope: options.authorizationParams.scope,
                     oauthTokenScope: tokenResult.scope,
@@ -2470,12 +2673,12 @@
             this.userCache.set(CACHE_KEY_ID_TOKEN_SUFFIX, cache);
             return cache;
         }
-        async _getEntryFromCache({scope: scope, audience: audience, clientId: clientId}) {
+        async _getEntryFromCache({scope: scope, audience: audience, clientId: clientId, cacheMode: cacheMode}) {
             const entry = await this.cacheManager.get(new CacheKey({
                 scope: scope,
                 audience: audience,
                 clientId: clientId
-            }), 60);
+            }), 60, this.options.useMrrt, cacheMode);
             if (entry && entry.access_token) {
                 const {token_type: token_type, access_token: access_token, oauthTokenScope: oauthTokenScope, expires_in: expires_in} = entry;
                 const cache = await this._getIdTokenFromCache();
@@ -2491,15 +2694,18 @@
             }
         }
         async _requestToken(options, additionalParameters) {
-            const {nonceIn: nonceIn, organization: organization} = additionalParameters || {};
-            const authResult = await oauthToken(Object.assign({
+            const {nonceIn: nonceIn, organization: organization, scopesToRequest: scopesToRequest} = additionalParameters || {};
+            const authResult = await oauthToken(Object.assign(Object.assign({
                 baseUrl: this.domainUrl,
                 client_id: this.options.clientId,
                 auth0Client: this.options.auth0Client,
                 useFormData: this.options.useFormData,
                 timeout: this.httpTimeoutMs,
+                useMrrt: this.options.useMrrt,
                 dpop: this.dpop
-            }, options), this.worker);
+            }, options), {
+                scope: scopesToRequest || options.scope
+            }), this.worker);
             const decodedToken = await this._verifyIdToken(authResult.id_token, nonceIn, organization);
             await this._saveEntryInCache(Object.assign(Object.assign(Object.assign(Object.assign({}, authResult), {
                 decodedToken: decodedToken,
@@ -2551,14 +2757,61 @@
             }
             return new Fetcher(config, {
                 isDpopEnabled: () => !!this.options.useDpop,
-                getAccessToken: () => this.getTokenSilently(),
+                getAccessToken: authParams => {
+                    var _a;
+                    return this.getTokenSilently({
+                        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
+                        }
+                    });
+                },
                 getDpopNonce: () => this.getDpopNonce(config.dpopNonceId),
-                setDpopNonce: nonce => this.setDpopNonce(nonce),
+                setDpopNonce: nonce => this.setDpopNonce(nonce, config.dpopNonceId),
                 generateDpopProof: params => this.generateDpopProof(params)
             });
         }
+        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");
+            }
+            const state = encode(createRandomString());
+            const code_verifier = createRandomString();
+            const code_challengeBuffer = await sha256(code_verifier);
+            const code_challenge = bufferToBase64UrlEncoded(code_challengeBuffer);
+            const {connect_uri: connect_uri, connect_params: connect_params, auth_session: auth_session} = await this.myAccountApi.connectAccount({
+                connection: connection,
+                redirect_uri: redirectUri,
+                state: state,
+                code_challenge: code_challenge,
+                code_challenge_method: "S256",
+                authorization_params: authorization_params
+            });
+            this.transactionManager.create({
+                state: state,
+                code_verifier: code_verifier,
+                auth_session: auth_session,
+                redirect_uri: redirectUri,
+                appState: appState,
+                connection: connection,
+                response_type: exports.ResponseType.ConnectCode
+            });
+            const url = new URL(connect_uri);
+            url.searchParams.set("ticket", connect_params.ticket);
+            if (openUrl) {
+                await openUrl(url.toString());
+            } else {
+                window.location.assign(url);
+            }
+        }
     }
-    class User {}
     async function createAuth0Client(options) {
         const auth0 = new Auth0Client(options);
         await auth0.checkSession();
@@ -2567,11 +2820,13 @@
     exports.Auth0Client = Auth0Client;
     exports.AuthenticationError = AuthenticationError;
     exports.CacheKey = CacheKey;
+    exports.ConnectError = ConnectError;
     exports.GenericError = GenericError;
     exports.InMemoryCache = InMemoryCache;
     exports.LocalStorageCache = LocalStorageCache;
     exports.MfaRequiredError = MfaRequiredError;
     exports.MissingRefreshTokenError = MissingRefreshTokenError;
+    exports.MyAccountApiError = MyAccountApiError;
     exports.PopupCancelledError = PopupCancelledError;
     exports.PopupTimeoutError = PopupTimeoutError;
     exports.TimeoutError = TimeoutError;