@auth0/auth0-spa-js 2.0.0-beta.0 → 2.0.0

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

@@ -472,7 +472,7 @@
         exports.default = SuperTokensLock;
     }));
     var Lock = unwrapExports(browserTabsLock);
-    var version = "2.0.0-beta.0";
+    var version = "2.0.0";
     const DEFAULT_AUTHORIZE_TIMEOUT_IN_SECONDS = 60;
     const DEFAULT_POPUP_CONFIG_OPTIONS = {
         timeoutInSeconds: DEFAULT_AUTHORIZE_TIMEOUT_IN_SECONDS
@@ -703,6 +703,7 @@
             } else {
                 resolve(event.data);
             }
+            messageChannel.port1.close();
         };
         to.postMessage(message, [ messageChannel.port2 ]);
     }));
@@ -782,11 +783,11 @@
         }, worker, useFormData);
     }
     const dedupe = arr => Array.from(new Set(arr));
-    const getUniqueScopes = (...scopes) => dedupe(scopes.join(" ").trim().split(/\s+/)).join(" ");
+    const getUniqueScopes = (...scopes) => dedupe(scopes.filter(Boolean).join(" ").trim().split(/\s+/)).join(" ");
     const CACHE_KEY_PREFIX = "@@auth0spajs@@";
     const CACHE_KEY_ID_TOKEN_SUFFIX = "@@user@@";
     class CacheKey {
-        constructor(data, prefix = CACHE_KEY_PREFIX, suffix = null) {
+        constructor(data, prefix = CACHE_KEY_PREFIX, suffix) {
             this.prefix = prefix;
             this.suffix = suffix;
             this.clientId = data.clientId;
@@ -864,8 +865,7 @@
         constructor(cache, keyManifest, nowProvider) {
             this.cache = cache;
             this.keyManifest = keyManifest;
-            this.nowProvider = nowProvider;
-            this.nowProvider = this.nowProvider || DEFAULT_NOW_PROVIDER;
+            this.nowProvider = nowProvider || DEFAULT_NOW_PROVIDER;
         }
         async setIdToken(clientId, idToken, decodedToken) {
             var _a;
@@ -883,11 +883,17 @@
                 if (!entryByScope) {
                     return;
                 }
+                if (!entryByScope.id_token || !entryByScope.decodedToken) {
+                    return;
+                }
                 return {
                     id_token: entryByScope.id_token,
                     decodedToken: entryByScope.decodedToken
                 };
             }
+            if (!entry) {
+                return;
+            }
             return {
                 id_token: entry.id_token,
                 decodedToken: entry.decodedToken
@@ -954,7 +960,11 @@
         }
         async getCacheKeys() {
             var _a;
-            return this.keyManifest ? (_a = await this.keyManifest.get()) === null || _a === void 0 ? void 0 : _a.keys : await this.cache.allKeys();
+            if (this.keyManifest) {
+                return (_a = await this.keyManifest.get()) === null || _a === void 0 ? void 0 : _a.keys;
+            } else if (this.cache.allKeys) {
+                return this.cache.allKeys();
+            }
         }
         getIdTokenCacheKey(clientId) {
             return new CacheKey({
@@ -1070,7 +1080,7 @@
         if (options.max_age && !isNumber(decoded.claims.auth_time)) {
             throw new Error("Authentication Time (auth_time) claim must be a number present in the ID token when Max Age (max_age) is specified");
         }
-        if (!isNumber(decoded.claims.exp)) {
+        if (decoded.claims.exp == null || !isNumber(decoded.claims.exp)) {
             throw new Error("Expiration Time (exp) claim must be a number present in the ID token");
         }
         if (!isNumber(decoded.claims.iat)) {
@@ -1079,19 +1089,23 @@
         const leeway = options.leeway || 60;
         const now = new Date(options.now || Date.now());
         const expDate = new Date(0);
-        const nbfDate = new Date(0);
-        const authTimeDate = new Date(0);
-        authTimeDate.setUTCSeconds(parseInt(decoded.claims.auth_time) + options.max_age + leeway);
         expDate.setUTCSeconds(decoded.claims.exp + leeway);
-        nbfDate.setUTCSeconds(decoded.claims.nbf - leeway);
         if (now > expDate) {
             throw new Error(`Expiration Time (exp) claim error in the ID token; current time (${now}) is after expiration time (${expDate})`);
         }
-        if (isNumber(decoded.claims.nbf) && now < nbfDate) {
-            throw new Error(`Not Before time (nbf) claim in the ID token indicates that this token can't be used just yet. Current time (${now}) is before ${nbfDate}`);
+        if (decoded.claims.nbf != null && isNumber(decoded.claims.nbf)) {
+            const nbfDate = new Date(0);
+            nbfDate.setUTCSeconds(decoded.claims.nbf - leeway);
+            if (now < nbfDate) {
+                throw new Error(`Not Before time (nbf) claim in the ID token indicates that this token can't be used just yet. Current time (${now}) is before ${nbfDate}`);
+            }
         }
-        if (isNumber(decoded.claims.auth_time) && now > authTimeDate) {
-            throw new Error(`Authentication Time (auth_time) claim in the ID token indicates that too much time has passed since the last end-user authentication. Current time (${now}) is after last auth at ${authTimeDate}`);
+        if (decoded.claims.auth_time != null && isNumber(decoded.claims.auth_time)) {
+            const authTimeDate = new Date(0);
+            authTimeDate.setUTCSeconds(parseInt(decoded.claims.auth_time) + options.max_age + leeway);
+            if (now > authTimeDate) {
+                throw new Error(`Authentication Time (auth_time) claim in the ID token indicates that too much time has passed since the last end-user authentication. Current time (${now}) is after last auth at ${authTimeDate}`);
+            }
         }
         if (options.organizationId) {
             if (!decoded.claims.org_id) {
@@ -1252,7 +1266,7 @@
                 return;
             }
             const value = sessionStorage.getItem(key);
-            if (typeof value === "undefined") {
+            if (value == null) {
                 return;
             }
             return JSON.parse(value);
@@ -1360,10 +1374,10 @@
         localstorage: () => new LocalStorageCache
     };
     const cacheFactory = location => cacheLocationBuilders[location];
-    const getAuthorizeParams = (clientOptions, scope, authorizeOptions, state, nonce, code_challenge, redirect_uri, response_mode) => Object.assign(Object.assign(Object.assign({
+    const getAuthorizeParams = (clientOptions, scope, authorizationParams, state, nonce, code_challenge, redirect_uri, response_mode) => Object.assign(Object.assign(Object.assign({
         client_id: clientOptions.clientId
-    }, clientOptions.authorizationParams), authorizeOptions), {
-        scope: getUniqueScopes(scope, authorizeOptions === null || authorizeOptions === void 0 ? void 0 : authorizeOptions.scope),
+    }, clientOptions.authorizationParams), authorizationParams), {
+        scope: getUniqueScopes(scope, authorizationParams.scope),
         response_type: "code",
         response_mode: response_mode || "query",
         state: state,
@@ -1394,15 +1408,16 @@
             if (options.cache && options.cacheLocation) {
                 console.warn("Both `cache` and `cacheLocation` options have been specified in the Auth0Client configuration; ignoring `cacheLocation` and using `cache`.");
             }
+            let cacheLocation;
             let cache;
             if (options.cache) {
                 cache = options.cache;
             } else {
-                this.cacheLocation = options.cacheLocation || CACHE_LOCATION_MEMORY;
-                if (!cacheFactory(this.cacheLocation)) {
-                    throw new Error(`Invalid cache location "${this.cacheLocation}"`);
+                cacheLocation = options.cacheLocation || CACHE_LOCATION_MEMORY;
+                if (!cacheFactory(cacheLocation)) {
+                    throw new Error(`Invalid cache location "${cacheLocation}"`);
                 }
-                cache = cacheFactory(this.cacheLocation)();
+                cache = cacheFactory(cacheLocation)();
             }
             this.httpTimeoutMs = options.httpTimeoutInSeconds ? options.httpTimeoutInSeconds * 1e3 : DEFAULT_FETCH_TIMEOUT_MS;
             this.cookieStorage = options.legacySameSiteCookie === false ? CookieStorage : CookieStorageWithLegacySameSite;
@@ -1413,10 +1428,10 @@
             this.scope = getUniqueScopes("openid", this.options.authorizationParams.scope, this.options.useRefreshTokens ? "offline_access" : "");
             this.transactionManager = new TransactionManager(transactionStorage, this.options.clientId);
             this.nowProvider = this.options.nowProvider || DEFAULT_NOW_PROVIDER;
-            this.cacheManager = new CacheManager(cache, !cache.allKeys ? new CacheKeyManifest(cache, this.options.clientId) : null, this.nowProvider);
+            this.cacheManager = new CacheManager(cache, !cache.allKeys ? new CacheKeyManifest(cache, this.options.clientId) : undefined, this.nowProvider);
             this.domainUrl = getDomain(this.options.domain);
             this.tokenIssuer = getTokenIssuer(this.options.issuer, this.domainUrl);
-            if (typeof window !== "undefined" && window.Worker && this.options.useRefreshTokens && this.cacheLocation === CACHE_LOCATION_MEMORY) {
+            if (typeof window !== "undefined" && window.Worker && this.options.useRefreshTokens && cacheLocation === CACHE_LOCATION_MEMORY) {
                 this.worker = new WorkerFactory;
             }
         }
@@ -1458,7 +1473,7 @@
             const code_verifier = createRandomString();
             const code_challengeBuffer = await sha256(code_verifier);
             const code_challenge = bufferToBase64UrlEncoded(code_challengeBuffer);
-            const params = getAuthorizeParams(this.options, this.scope, authorizationParams, state, nonce, code_challenge, (authorizationParams === null || authorizationParams === void 0 ? void 0 : authorizationParams.redirect_uri) || this.options.authorizationParams.redirect_uri || fallbackRedirectUri, authorizeOptions === null || authorizeOptions === void 0 ? void 0 : authorizeOptions.response_mode);
+            const params = getAuthorizeParams(this.options, this.scope, authorizationParams, state, nonce, code_challenge, authorizationParams.redirect_uri || this.options.authorizationParams.redirect_uri || fallbackRedirectUri, authorizeOptions === null || authorizeOptions === void 0 ? void 0 : authorizeOptions.response_mode);
             const url = this._authorizeUrl(params);
             return {
                 nonce: nonce,
@@ -1480,7 +1495,7 @@
                     throw new Error("Unable to open a popup for loginWithPopup - window.open returned `null`");
                 }
             }
-            const params = await this._prepareAuthorizeUrl(options.authorizationParams, {
+            const params = await this._prepareAuthorizeUrl(options.authorizationParams || {}, {
                 response_mode: "web_message"
             }, window.location.origin);
             config.popup.location.href = params.url;
@@ -1517,7 +1532,7 @@
             var _a;
             const {onRedirect: onRedirect, fragment: fragment, appState: appState} = options, urlOptions = __rest(options, [ "onRedirect", "fragment", "appState" ]);
             const organizationId = ((_a = urlOptions.authorizationParams) === null || _a === void 0 ? void 0 : _a.organization) || this.options.authorizationParams.organization;
-            const _b = await this._prepareAuthorizeUrl(urlOptions.authorizationParams), {url: url} = _b, transaction = __rest(_b, [ "url" ]);
+            const _b = await this._prepareAuthorizeUrl(urlOptions.authorizationParams || {}), {url: url} = _b, transaction = __rest(_b, [ "url" ]);
             this.transactionManager.create(Object.assign(Object.assign(Object.assign({}, transaction), {
                 appState: appState
             }), organizationId && {
@@ -1542,7 +1557,7 @@
             }
             this.transactionManager.remove();
             if (error) {
-                throw new AuthenticationError(error, error_description, state, transaction.appState);
+                throw new AuthenticationError(error, error_description || error, state, transaction.appState);
             }
             if (!transaction.code_verifier || transaction.state && transaction.state !== state) {
                 throw new Error("Invalid state");
@@ -1584,14 +1599,15 @@
         }
         async getTokenSilently(options = {}) {
             var _a;
-            options = Object.assign(Object.assign({
+            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)
                 })
             });
-            return singlePromise((() => this._getTokenSilently(options)), `${this.options.clientId}::${options.authorizationParams.audience}::${options.authorizationParams.scope}`);
+            const result = await singlePromise((() => this._getTokenSilently(localOptions)), `${this.options.clientId}::${localOptions.authorizationParams.audience}::${localOptions.authorizationParams.scope}`);
+            return options.detailedResponse ? result : result === null || result === void 0 ? void 0 : result.access_token;
         }
         async _getTokenSilently(options) {
             const {cacheMode: cacheMode} = options, getTokenOptions = __rest(options, [ "cacheMode" ]);
@@ -1599,8 +1615,7 @@
                 const entry = await this._getEntryFromCache({
                     scope: getTokenOptions.authorizationParams.scope,
                     audience: getTokenOptions.authorizationParams.audience || "default",
-                    clientId: this.options.clientId,
-                    getDetailedEntry: options.detailedResponse
+                    clientId: this.options.clientId
                 });
                 if (entry) {
                     return entry;
@@ -1616,26 +1631,22 @@
                         const entry = await this._getEntryFromCache({
                             scope: getTokenOptions.authorizationParams.scope,
                             audience: getTokenOptions.authorizationParams.audience || "default",
-                            clientId: this.options.clientId,
-                            getDetailedEntry: options.detailedResponse
+                            clientId: this.options.clientId
                         });
                         if (entry) {
                             return entry;
                         }
                     }
                     const authResult = this.options.useRefreshTokens ? await this._getTokenUsingRefreshToken(getTokenOptions) : await this._getTokenFromIFrame(getTokenOptions);
-                    if (options.detailedResponse) {
-                        const {id_token: id_token, access_token: access_token, oauthTokenScope: oauthTokenScope, expires_in: expires_in} = authResult;
-                        return Object.assign(Object.assign({
-                            id_token: id_token,
-                            access_token: access_token
-                        }, oauthTokenScope ? {
-                            scope: oauthTokenScope
-                        } : null), {
-                            expires_in: expires_in
-                        });
-                    }
-                    return authResult.access_token;
+                    const {id_token: id_token, access_token: access_token, oauthTokenScope: oauthTokenScope, expires_in: expires_in} = authResult;
+                    return Object.assign(Object.assign({
+                        id_token: id_token,
+                        access_token: access_token
+                    }, oauthTokenScope ? {
+                        scope: oauthTokenScope
+                    } : null), {
+                        expires_in: expires_in
+                    });
                 } finally {
                     await lock.releaseLock(GET_TOKEN_SILENTLY_LOCK_KEY);
                     window.removeEventListener("pagehide", this._releaseLockOnPageHide);
@@ -1646,16 +1657,16 @@
         }
         async getTokenWithPopup(options = {}, config = {}) {
             var _a;
-            options = Object.assign(Object.assign({}, options), {
+            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)
                 })
             });
             config = Object.assign(Object.assign({}, DEFAULT_POPUP_CONFIG_OPTIONS), config);
-            await this.loginWithPopup(options, config);
+            await this.loginWithPopup(localOptions, config);
             const cache = await this.cacheManager.get(new CacheKey({
-                scope: options.authorizationParams.scope,
-                audience: options.authorizationParams.audience || "default",
+                scope: localOptions.authorizationParams.scope,
+                audience: localOptions.authorizationParams.audience || "default",
                 clientId: this.options.clientId
             }));
             return cache.access_token;
@@ -1738,11 +1749,6 @@
             }
         }
         async _getTokenUsingRefreshToken(options) {
-            options = Object.assign(Object.assign({}, options), {
-                authorizationParams: Object.assign(Object.assign({}, options.authorizationParams), {
-                    scope: getUniqueScopes(this.scope, options.authorizationParams.scope)
-                })
-            });
             const cache = await this.cacheManager.get(new CacheKey({
                 scope: options.authorizationParams.scope,
                 audience: options.authorizationParams.audience || "default",
@@ -1799,26 +1805,23 @@
             this.userCache.set(CACHE_KEY_ID_TOKEN_SUFFIX, cache);
             return cache;
         }
-        async _getEntryFromCache({scope: scope, audience: audience, clientId: clientId, getDetailedEntry: getDetailedEntry = false}) {
+        async _getEntryFromCache({scope: scope, audience: audience, clientId: clientId}) {
             const entry = await this.cacheManager.get(new CacheKey({
                 scope: scope,
                 audience: audience,
                 clientId: clientId
             }), 60);
             if (entry && entry.access_token) {
-                if (getDetailedEntry) {
-                    const {access_token: access_token, oauthTokenScope: oauthTokenScope, expires_in: expires_in} = entry;
-                    const cache = await this._getIdTokenFromCache();
-                    return Object.assign(Object.assign({
-                        id_token: cache === null || cache === void 0 ? void 0 : cache.id_token,
-                        access_token: access_token
-                    }, oauthTokenScope ? {
-                        scope: oauthTokenScope
-                    } : null), {
-                        expires_in: expires_in
-                    });
-                }
-                return entry.access_token;
+                const {access_token: access_token, oauthTokenScope: oauthTokenScope, expires_in: expires_in} = entry;
+                const cache = await this._getIdTokenFromCache();
+                return cache && Object.assign(Object.assign({
+                    id_token: cache.id_token,
+                    access_token: access_token
+                }, oauthTokenScope ? {
+                    scope: oauthTokenScope
+                } : null), {
+                    expires_in: expires_in
+                });
             }
         }
         async _requestToken(options, additionalParameters) {