@azure/msal-browser 2.18.0 → 2.22.0

package/dist/index.cjs.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v2.18.0 2021-10-05 */
+/*! @azure/msal-browser v2.22.0 2022-02-08 */
 'use strict';
 'use strict';
 
@@ -105,7 +105,7 @@ function __spread() {
     return ar;
 }
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -192,7 +192,7 @@ function __spreadArrays() {
     return r;
 }
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -206,6 +206,7 @@ var Constants = {
     // default authority
     DEFAULT_AUTHORITY: "https://login.microsoftonline.com/common/",
     DEFAULT_AUTHORITY_HOST: "login.microsoftonline.com",
+    DEFAULT_COMMON_TENANT: "common",
     // ADFS String
     ADFS: "adfs",
     // Default AAD Instance Discovery Endpoint
@@ -257,6 +258,8 @@ var HeaderNames;
     HeaderNames["CONTENT_TYPE"] = "Content-Type";
     HeaderNames["RETRY_AFTER"] = "Retry-After";
     HeaderNames["CCS_HEADER"] = "X-AnchorMailbox";
+    HeaderNames["WWWAuthenticate"] = "WWW-Authenticate";
+    HeaderNames["AuthenticationInfo"] = "Authentication-Info";
 })(HeaderNames || (HeaderNames = {}));
 /**
  * Persistent cache keys MSAL which stay while user is logged in.
@@ -327,6 +330,8 @@ var AADServerParamKeys;
     AADServerParamKeys["ON_BEHALF_OF"] = "on_behalf_of";
     AADServerParamKeys["FOCI"] = "foci";
     AADServerParamKeys["CCS_HEADER"] = "X-AnchorMailbox";
+    AADServerParamKeys["RETURN_SPA_CODE"] = "return_spa_code";
+    AADServerParamKeys["LOGOUT_HINT"] = "logout_hint";
 })(AADServerParamKeys || (AADServerParamKeys = {}));
 /**
  * Claims request keys
@@ -484,8 +489,9 @@ var SERVER_TELEM_CONSTANTS = {
  */
 exports.AuthenticationScheme = void 0;
 (function (AuthenticationScheme) {
-    AuthenticationScheme["POP"] = "pop";
     AuthenticationScheme["BEARER"] = "Bearer";
+    AuthenticationScheme["POP"] = "pop";
+    AuthenticationScheme["SSH"] = "ssh-cert";
 })(exports.AuthenticationScheme || (exports.AuthenticationScheme = {}));
 /**
  * Constants related to throttling
@@ -550,7 +556,7 @@ var CacheOutcome;
     CacheOutcome["REFRESH_CACHED_ACCESS_TOKEN"] = "4";
 })(CacheOutcome || (CacheOutcome = {}));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -594,7 +600,7 @@ var AuthError = /** @class */ (function (_super) {
     return AuthError;
 }(Error));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -657,10 +663,19 @@ var DEFAULT_CRYPTO_IMPLEMENTATION = {
                 throw AuthError.createUnexpectedError(notImplErr);
             });
         });
+    },
+    hashString: function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var notImplErr;
+            return __generator(this, function (_a) {
+                notImplErr = "Crypto interface - hashString() has not been implemented";
+                throw AuthError.createUnexpectedError(notImplErr);
+            });
+        });
     }
 };
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -846,6 +861,10 @@ var ClientAuthErrorMessage = {
     bindingKeyNotRemovedError: {
         code: "binding_key_not_removed",
         desc: "Could not remove the credential's binding key from storage."
+    },
+    logoutNotSupported: {
+        code: "end_session_endpoint_not_supported",
+        desc: "Provided authority does not support logout."
     }
 };
 /**
@@ -1109,10 +1128,16 @@ var ClientAuthError = /** @class */ (function (_super) {
     ClientAuthError.createBindingKeyNotRemovedError = function () {
         return new ClientAuthError(ClientAuthErrorMessage.bindingKeyNotRemovedError.code, ClientAuthErrorMessage.bindingKeyNotRemovedError.desc);
     };
+    /**
+     * Thrown when logout is attempted for an authority that doesnt have an end_session_endpoint
+     */
+    ClientAuthError.createLogoutNotSupportedError = function () {
+        return new ClientAuthError(ClientAuthErrorMessage.logoutNotSupported.code, ClientAuthErrorMessage.logoutNotSupported.desc);
+    };
     return ClientAuthError;
 }(AuthError));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1237,7 +1262,7 @@ var StringUtils = /** @class */ (function () {
     return StringUtils;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1417,12 +1442,31 @@ var Logger = /** @class */ (function () {
     return Logger;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 /* eslint-disable header/header */
 var name$1 = "@azure/msal-common";
-var version$1 = "5.0.1";
+var version$1 = "6.1.0";
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+exports.AzureCloudInstance = void 0;
+(function (AzureCloudInstance) {
+    // AzureCloudInstance is not specified.
+    AzureCloudInstance[AzureCloudInstance["None"] = 0] = "None";
+    // Microsoft Azure public cloud
+    AzureCloudInstance["AzurePublic"] = "https://login.microsoftonline.com";
+    // Microsoft Chinese national cloud
+    AzureCloudInstance["AzureChina"] = "https://login.chinacloudapi.cn";
+    // Microsoft German national cloud ("Black Forest")
+    AzureCloudInstance["AzureGermany"] = "https://login.microsoftonline.de";
+    // US Government cloud
+    AzureCloudInstance["AzureUsGovernment"] = "https://login.microsoftonline.us";
+})(exports.AzureCloudInstance || (exports.AzureCloudInstance = {}));
+
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1433,7 +1477,7 @@ var version$1 = "5.0.1";
  *
  * Key:Value Schema:
  *
- * Key: <home_account_id*>-<environment>-<credential_type>-<client_id>-<realm*>-<target*>-<scheme>
+ * Key: <home_account_id*>-<environment>-<credential_type>-<client_id>-<realm*>-<target*>-<requestedClaims*>-<scheme*>
  *
  * Value Schema:
  * {
@@ -1447,6 +1491,7 @@ var version$1 = "5.0.1";
  *      target: Permissions that are included in the token, or for refresh tokens, the resource identifier.
  *      oboAssertion: access token passed in as part of OBO request
  *      tokenType: Matches the authentication scheme for which the token was issued (i.e. Bearer or pop)
+ *      requestedClaimsHash: Matches the SHA 256 hash of the claims object included in the token request
  * }
  */
 var CredentialEntity = /** @class */ (function () {
@@ -1474,7 +1519,7 @@ var CredentialEntity = /** @class */ (function () {
      * generates credential key
      */
     CredentialEntity.prototype.generateCredentialKey = function () {
-        return CredentialEntity.generateCredentialCacheKey(this.homeAccountId, this.environment, this.credentialType, this.clientId, this.realm, this.target, this.familyId, this.tokenType);
+        return CredentialEntity.generateCredentialCacheKey(this.homeAccountId, this.environment, this.credentialType, this.clientId, this.realm, this.target, this.familyId, this.tokenType, this.requestedClaimsHash);
     };
     /**
      * returns the type of the cache (in this case credential)
@@ -1518,16 +1563,14 @@ var CredentialEntity = /** @class */ (function () {
      * generates credential key
      * <home_account_id*>-\<environment>-<credential_type>-<client_id>-<realm\*>-<target\*>-<scheme\*>
      */
-    CredentialEntity.generateCredentialCacheKey = function (homeAccountId, environment, credentialType, clientId, realm, target, familyId, tokenType) {
+    CredentialEntity.generateCredentialCacheKey = function (homeAccountId, environment, credentialType, clientId, realm, target, familyId, tokenType, requestedClaimsHash) {
         var credentialKey = [
             this.generateAccountIdForCacheKey(homeAccountId, environment),
             this.generateCredentialIdForCacheKey(credentialType, clientId, realm, familyId),
-            this.generateTargetForCacheKey(target)
+            this.generateTargetForCacheKey(target),
+            this.generateClaimsHashForCacheKey(requestedClaimsHash),
+            this.generateSchemeForCacheKey(tokenType)
         ];
-        // PoP Tokens include scheme in cache key
-        if (tokenType === exports.AuthenticationScheme.POP) {
-            credentialKey.push(tokenType.toLowerCase());
-        }
         return credentialKey.join(Separators.CACHE_KEY_SEPARATOR).toLowerCase();
     };
     /**
@@ -1563,10 +1606,26 @@ var CredentialEntity = /** @class */ (function () {
     CredentialEntity.generateTargetForCacheKey = function (scopes) {
         return (scopes || "").toLowerCase();
     };
+    /**
+     * Generate requested claims key component as per schema: <requestedClaims>
+     */
+    CredentialEntity.generateClaimsHashForCacheKey = function (requestedClaimsHash) {
+        return (requestedClaimsHash || "").toLowerCase();
+    };
+    /**
+     * Generate scheme key componenet as per schema: <scheme>
+     */
+    CredentialEntity.generateSchemeForCacheKey = function (tokenType) {
+        /*
+         * PoP Tokens and SSH certs include scheme in cache key
+         * Cast to lowercase to handle "bearer" from ADFS
+         */
+        return (tokenType && tokenType.toLowerCase() !== exports.AuthenticationScheme.BEARER.toLowerCase()) ? tokenType.toLowerCase() : "";
+    };
     return CredentialEntity;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1638,15 +1697,35 @@ var ClientConfigurationErrorMessage = {
     },
     invalidCloudDiscoveryMetadata: {
         code: "invalid_cloud_discovery_metadata",
-        desc: "Invalid cloudDiscoveryMetadata provided. Must be a JSON object containing tenant_discovery_endpoint and metadata fields"
+        desc: "Invalid cloudDiscoveryMetadata provided. Must be a stringified JSON object containing tenant_discovery_endpoint and metadata fields"
     },
     invalidAuthorityMetadata: {
         code: "invalid_authority_metadata",
-        desc: "Invalid authorityMetadata provided. Must by a JSON object containing authorization_endpoint, token_endpoint, end_session_endpoint, issuer fields."
+        desc: "Invalid authorityMetadata provided. Must by a stringified JSON object containing authorization_endpoint, token_endpoint, issuer fields."
     },
     untrustedAuthority: {
         code: "untrusted_authority",
         desc: "The provided authority is not a trusted authority. Please include this authority in the knownAuthorities config parameter."
+    },
+    invalidAzureCloudInstance: {
+        code: "invalid_azure_cloud_instance",
+        desc: "Invalid AzureCloudInstance provided. Please refer MSAL JS docs: aks.ms/msaljs/azure_cloud_instance for valid values"
+    },
+    missingSshJwk: {
+        code: "missing_ssh_jwk",
+        desc: "Missing sshJwk in SSH certificate request. A stringified JSON Web Key is required when using the SSH authentication scheme."
+    },
+    missingSshKid: {
+        code: "missing_ssh_kid",
+        desc: "Missing sshKid in SSH certificate request. A string that uniquely identifies the public SSH key is required when using the SSH authentication scheme."
+    },
+    missingNonceAuthenticationHeader: {
+        code: "missing_nonce_authentication_header",
+        desc: "Unable to find an authentication header containing server nonce. Either the Authentication-Info or WWW-Authenticate headers must be present in order to obtain a server nonce."
+    },
+    invalidAuthenticationHeader: {
+        code: "invalid_authentication_header",
+        desc: "Invalid authentication header provided"
     }
 };
 /**
@@ -1768,10 +1847,40 @@ var ClientConfigurationError = /** @class */ (function (_super) {
     ClientConfigurationError.createUntrustedAuthorityError = function () {
         return new ClientConfigurationError(ClientConfigurationErrorMessage.untrustedAuthority.code, ClientConfigurationErrorMessage.untrustedAuthority.desc);
     };
+    /**
+     * Throws error when the AzureCloudInstance is set to an invalid value
+     */
+    ClientConfigurationError.createInvalidAzureCloudInstanceError = function () {
+        return new ClientConfigurationError(ClientConfigurationErrorMessage.invalidAzureCloudInstance.code, ClientConfigurationErrorMessage.invalidAzureCloudInstance.desc);
+    };
+    /**
+     * Throws an error when the authentication scheme is set to SSH but the SSH public key is omitted from the request
+     */
+    ClientConfigurationError.createMissingSshJwkError = function () {
+        return new ClientConfigurationError(ClientConfigurationErrorMessage.missingSshJwk.code, ClientConfigurationErrorMessage.missingSshJwk.desc);
+    };
+    /**
+     * Throws an error when the authentication scheme is set to SSH but the SSH public key ID is omitted from the request
+     */
+    ClientConfigurationError.createMissingSshKidError = function () {
+        return new ClientConfigurationError(ClientConfigurationErrorMessage.missingSshKid.code, ClientConfigurationErrorMessage.missingSshKid.desc);
+    };
+    /**
+     * Throws error when provided headers don't contain a header that a server nonce can be extracted from
+     */
+    ClientConfigurationError.createMissingNonceAuthenticationHeadersError = function () {
+        return new ClientConfigurationError(ClientConfigurationErrorMessage.missingNonceAuthenticationHeader.code, ClientConfigurationErrorMessage.missingNonceAuthenticationHeader.desc);
+    };
+    /**
+     * Throws error when a provided header is invalid in any way
+     */
+    ClientConfigurationError.createInvalidAuthenticationHeaderError = function (invalidHeaderName, details) {
+        return new ClientConfigurationError(ClientConfigurationErrorMessage.invalidAuthenticationHeader.code, ClientConfigurationErrorMessage.invalidAuthenticationHeader.desc + ". Invalid header: " + invalidHeaderName + ". Details: " + details);
+    };
     return ClientConfigurationError;
 }(ClientAuthError));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1955,7 +2064,7 @@ var ScopeSet = /** @class */ (function () {
     return ScopeSet;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1993,7 +2102,7 @@ function buildClientInfoFromHomeAccountId(homeAccountId) {
     };
 }
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -2007,7 +2116,7 @@ var AuthorityType;
     AuthorityType[AuthorityType["Adfs"] = 1] = "Adfs";
 })(AuthorityType || (AuthorityType = {}));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2241,7 +2350,7 @@ var AccountEntity = /** @class */ (function () {
     return AccountEntity;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2279,7 +2388,7 @@ var AuthToken = /** @class */ (function () {
     return AuthToken;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2369,7 +2478,8 @@ var CacheManager = /** @class */ (function () {
                             environment: credential.environment,
                             homeAccountId: credential.homeAccountId,
                             realm: credential.realm,
-                            tokenType: credential.tokenType
+                            tokenType: credential.tokenType,
+                            requestedClaimsHash: credential.requestedClaimsHash
                         });
                         currentScopes = ScopeSet.fromString(credential.target);
                         currentAccessTokens = Object.keys(currentTokenCache.accessTokens).map(function (key) { return currentTokenCache.accessTokens[key]; });
@@ -2441,7 +2551,7 @@ var CacheManager = /** @class */ (function () {
      * @param target
      */
     CacheManager.prototype.getCredentialsFilteredBy = function (filter) {
-        return this.getCredentialsFilteredByInternal(filter.homeAccountId, filter.environment, filter.credentialType, filter.clientId, filter.familyId, filter.realm, filter.target, filter.oboAssertion, filter.tokenType);
+        return this.getCredentialsFilteredByInternal(filter.homeAccountId, filter.environment, filter.credentialType, filter.clientId, filter.familyId, filter.realm, filter.target, filter.oboAssertion, filter.tokenType, filter.keyId, filter.requestedClaimsHash);
     };
     /**
      * Support function to help match credentials
@@ -2454,7 +2564,7 @@ var CacheManager = /** @class */ (function () {
      * @param oboAssertion
      * @param tokenType
      */
-    CacheManager.prototype.getCredentialsFilteredByInternal = function (homeAccountId, environment, credentialType, clientId, familyId, realm, target, oboAssertion, tokenType) {
+    CacheManager.prototype.getCredentialsFilteredByInternal = function (homeAccountId, environment, credentialType, clientId, familyId, realm, target, oboAssertion, tokenType, keyId, requestedClaimsHash) {
         var _this = this;
         var allCacheKeys = this.getKeys();
         var matchingCredentials = {
@@ -2501,27 +2611,37 @@ var CacheManager = /** @class */ (function () {
             if (!!target && !_this.matchTarget(entity, target)) {
                 return;
             }
+            // If request OR cached entity has requested Claims Hash, check if they match
+            if (requestedClaimsHash || entity.requestedClaimsHash) {
+                // Don't match if either is undefined or they are different
+                if (entity.requestedClaimsHash !== requestedClaimsHash) {
+                    return;
+                }
+            }
+            // Access Token with Auth Scheme specific matching
             if (credentialType === CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME) {
                 if (!!tokenType && !_this.matchTokenType(entity, tokenType)) {
                     return;
                 }
-                // This check avoids matching outdated POP tokens that don't have the <-scheme> in the cache key
-                if (cacheKey.indexOf(exports.AuthenticationScheme.POP) === -1) {
-                    // AccessToken_With_AuthScheme that doesn't have pop in the key is outdated
-                    _this.removeItem(cacheKey, CacheSchemaType.CREDENTIAL);
-                    return;
+                // KeyId (sshKid) in request must match cached SSH certificate keyId because SSH cert is bound to a specific key
+                if (tokenType === exports.AuthenticationScheme.SSH) {
+                    if (keyId && !_this.matchKeyId(entity, keyId)) {
+                        return;
+                    }
                 }
             }
+            // At this point, the entity matches the request, update cache key if key schema has changed
+            var updatedCacheKey = _this.updateCredentialCacheKey(cacheKey, entity);
             switch (credType) {
                 case CredentialType.ID_TOKEN:
-                    matchingCredentials.idTokens[cacheKey] = entity;
+                    matchingCredentials.idTokens[updatedCacheKey] = entity;
                     break;
                 case CredentialType.ACCESS_TOKEN:
                 case CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME:
-                    matchingCredentials.accessTokens[cacheKey] = entity;
+                    matchingCredentials.accessTokens[updatedCacheKey] = entity;
                     break;
                 case CredentialType.REFRESH_TOKEN:
-                    matchingCredentials.refreshTokens[cacheKey] = entity;
+                    matchingCredentials.refreshTokens[updatedCacheKey] = entity;
                     break;
             }
         });
@@ -2680,6 +2800,7 @@ var CacheManager = /** @class */ (function () {
                     case 0:
                         key = credential.generateCredentialKey();
                         if (!(credential.credentialType.toLowerCase() === CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME.toLowerCase())) return [3 /*break*/, 4];
+                        if (!(credential.tokenType === exports.AuthenticationScheme.POP)) return [3 /*break*/, 4];
                         accessTokenWithAuthSchemeEntity = credential;
                         kid = accessTokenWithAuthSchemeEntity.keyId;
                         if (!kid) return [3 /*break*/, 4];
@@ -2719,10 +2840,10 @@ var CacheManager = /** @class */ (function () {
      * @param environment
      * @param authScheme
      */
-    CacheManager.prototype.readCacheRecord = function (account, clientId, scopes, environment, authScheme) {
+    CacheManager.prototype.readCacheRecord = function (account, clientId, request, environment) {
         var cachedAccount = this.readAccountFromCache(account);
         var cachedIdToken = this.readIdTokenFromCache(clientId, account);
-        var cachedAccessToken = this.readAccessTokenFromCache(clientId, account, scopes, authScheme);
+        var cachedAccessToken = this.readAccessTokenFromCache(clientId, account, request);
         var cachedRefreshToken = this.readRefreshTokenFromCache(clientId, account, false);
         var cachedAppMetadata = this.readAppMetadataFromCache(environment, clientId);
         if (cachedAccount && cachedIdToken) {
@@ -2776,9 +2897,14 @@ var CacheManager = /** @class */ (function () {
      * @param scopes
      * @param authScheme
      */
-    CacheManager.prototype.readAccessTokenFromCache = function (clientId, account, scopes, authScheme) {
-        // Distinguish between Bearer and PoP token cache types
-        var credentialType = (authScheme === exports.AuthenticationScheme.POP) ? CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME : CredentialType.ACCESS_TOKEN;
+    CacheManager.prototype.readAccessTokenFromCache = function (clientId, account, request) {
+        var scopes = new ScopeSet(request.scopes || []);
+        var authScheme = request.authenticationScheme || exports.AuthenticationScheme.BEARER;
+        /*
+         * Distinguish between Bearer and PoP/SSH token cache types
+         * Cast to lowercase to handle "bearer" from ADFS
+         */
+        var credentialType = (authScheme && authScheme.toLowerCase() !== exports.AuthenticationScheme.BEARER.toLowerCase()) ? CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME : CredentialType.ACCESS_TOKEN;
         var accessTokenFilter = {
             homeAccountId: account.homeAccountId,
             environment: account.environment,
@@ -2786,7 +2912,9 @@ var CacheManager = /** @class */ (function () {
             clientId: clientId,
             realm: account.tenantId,
             target: scopes.printScopesLowerCase(),
-            tokenType: authScheme
+            tokenType: authScheme,
+            keyId: request.sshKid,
+            requestedClaimsHash: request.requestedClaimsHash
         };
         var credentialCache = this.getCredentialsFilteredBy(accessTokenFilter);
         var accessTokens = Object.keys(credentialCache.accessTokens).map(function (key) { return credentialCache.accessTokens[key]; });
@@ -2939,6 +3067,14 @@ var CacheManager = /** @class */ (function () {
     CacheManager.prototype.matchTokenType = function (entity, tokenType) {
         return !!(entity.tokenType && entity.tokenType === tokenType);
     };
+    /**
+     * Returns true if the credential's keyId matches the one in the request, false otherwise
+     * @param entity
+     * @param tokenType
+     */
+    CacheManager.prototype.matchKeyId = function (entity, keyId) {
+        return !!(entity.keyId && entity.keyId === keyId);
+    };
     /**
      * returns if a given cache entity is of the type appmetadata
      * @param key
@@ -3087,10 +3223,14 @@ var DefaultStorageClass = /** @class */ (function (_super) {
             });
         });
     };
+    DefaultStorageClass.prototype.updateCredentialCacheKey = function () {
+        var notImplErr = "Storage interface - updateCredentialCacheKey() has not been implemented for the cacheStorage interface.";
+        throw AuthError.createUnexpectedError(notImplErr);
+    };
     return DefaultStorageClass;
 }(CacheManager));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3100,7 +3240,8 @@ var DefaultStorageClass = /** @class */ (function (_super) {
 var DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;
 var DEFAULT_SYSTEM_OPTIONS = {
     tokenRenewalOffsetSeconds: DEFAULT_TOKEN_RENEWAL_OFFSET_SEC,
-    preventCorsPreflight: false
+    preventCorsPreflight: false,
+    proxyUrl: "",
 };
 var DEFAULT_LOGGER_IMPLEMENTATION = {
     loggerCallback: function () {
@@ -3140,6 +3281,10 @@ var DEFAULT_CLIENT_CREDENTIALS = {
     clientSecret: "",
     clientAssertion: undefined
 };
+var DEFAULT_AZURE_CLOUD_OPTIONS = {
+    azureCloudInstance: exports.AzureCloudInstance.None,
+    tenant: "" + Constants.DEFAULT_COMMON_TENANT
+};
 /**
  * Function that sets the default options when not explicitly configured from app developer
  *
@@ -3169,10 +3314,10 @@ function buildClientConfiguration(_a) {
  * @param authOptions
  */
 function buildAuthOptions(authOptions) {
-    return __assign({ clientCapabilities: [] }, authOptions);
+    return __assign({ clientCapabilities: [], azureCloudOptions: DEFAULT_AZURE_CLOUD_OPTIONS }, authOptions);
 }
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3192,7 +3337,7 @@ var ServerError = /** @class */ (function (_super) {
     return ServerError;
 }(AuthError));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3275,10 +3420,12 @@ var ThrottlingUtils = /** @class */ (function () {
             authority: request.authority,
             scopes: request.scopes,
             homeAccountIdentifier: homeAccountIdentifier,
+            claims: request.claims,
             authenticationScheme: request.authenticationScheme,
             resourceRequestMethod: request.resourceRequestMethod,
             resourceRequestUri: request.resourceRequestUri,
-            shrClaims: request.shrClaims
+            shrClaims: request.shrClaims,
+            sshKid: request.sshKid
         };
         var key = this.generateThrottlingStorageKey(thumbprint);
         return cacheManager.removeItem(key, CacheSchemaType.THROTTLING);
@@ -3286,7 +3433,7 @@ var ThrottlingUtils = /** @class */ (function () {
     return ThrottlingUtils;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3335,7 +3482,7 @@ var NetworkManager = /** @class */ (function () {
     return NetworkManager;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3346,7 +3493,7 @@ var CcsCredentialType;
     CcsCredentialType["UPN"] = "UPN";
 })(CcsCredentialType || (CcsCredentialType = {}));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3410,7 +3557,7 @@ var BaseClient = /** @class */ (function () {
             var response;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.networkManager.sendPostRequest(thumbprint, tokenEndpoint, { body: queryString, headers: headers })];
+                    case 0: return [4 /*yield*/, this.networkManager.sendPostRequest(thumbprint, tokenEndpoint, { body: queryString, headers: headers, proxyUrl: this.config.systemOptions.proxyUrl })];
                     case 1:
                         response = _a.sent();
                         if (this.config.serverTelemetryManager && response.status < 500 && response.status !== 429) {
@@ -3435,7 +3582,7 @@ var BaseClient = /** @class */ (function () {
     return BaseClient;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3521,7 +3668,7 @@ var RequestValidator = /** @class */ (function () {
     return RequestValidator;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3825,6 +3972,15 @@ var RequestParameterBuilder = /** @class */ (function () {
             this.parameters.set(AADServerParamKeys.REQ_CNF, encodeURIComponent(cnfString));
         }
     };
+    /**
+     * add SSH JWK and key ID to query params
+     */
+    RequestParameterBuilder.prototype.addSshJwk = function (sshJwkString) {
+        if (!StringUtils.isEmpty(sshJwkString)) {
+            this.parameters.set(AADServerParamKeys.TOKEN_TYPE, exports.AuthenticationScheme.SSH);
+            this.parameters.set(AADServerParamKeys.REQ_CNF, encodeURIComponent(sshJwkString));
+        }
+    };
     /**
      * add server telemetry fields
      * @param serverTelemetryManager
@@ -3839,6 +3995,12 @@ var RequestParameterBuilder = /** @class */ (function () {
     RequestParameterBuilder.prototype.addThrottling = function () {
         this.parameters.set(AADServerParamKeys.X_MS_LIB_CAPABILITY, ThrottlingConstants.X_MS_LIB_CAPABILITY_VALUE);
     };
+    /**
+     * Adds logout_hint parameter for "silent" logout which prevent server account picker
+     */
+    RequestParameterBuilder.prototype.addLogoutHint = function (logoutHint) {
+        this.parameters.set(AADServerParamKeys.LOGOUT_HINT, encodeURIComponent(logoutHint));
+    };
     /**
      * Utility to create a URL from the params map
      */
@@ -3852,7 +4014,7 @@ var RequestParameterBuilder = /** @class */ (function () {
     return RequestParameterBuilder;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3917,7 +4079,7 @@ var IdTokenEntity = /** @class */ (function (_super) {
     return IdTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3967,7 +4129,7 @@ var TimeUtils = /** @class */ (function () {
     return TimeUtils;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4013,8 +4175,8 @@ var AccessTokenEntity = /** @class */ (function (_super) {
      * @param expiresOn
      * @param extExpiresOn
      */
-    AccessTokenEntity.createAccessTokenEntity = function (homeAccountId, environment, accessToken, clientId, tenantId, scopes, expiresOn, extExpiresOn, cryptoUtils, refreshOn, tokenType, oboAssertion) {
-        var _a;
+    AccessTokenEntity.createAccessTokenEntity = function (homeAccountId, environment, accessToken, clientId, tenantId, scopes, expiresOn, extExpiresOn, cryptoUtils, refreshOn, tokenType, oboAssertion, keyId, requestedClaims, requestedClaimsHash) {
+        var _a, _b;
         var atEntity = new AccessTokenEntity();
         atEntity.homeAccountId = homeAccountId;
         atEntity.credentialType = CredentialType.ACCESS_TOKEN;
@@ -4036,15 +4198,28 @@ var AccessTokenEntity = /** @class */ (function (_super) {
         atEntity.target = scopes;
         atEntity.oboAssertion = oboAssertion;
         atEntity.tokenType = StringUtils.isEmpty(tokenType) ? exports.AuthenticationScheme.BEARER : tokenType;
-        // Create Access Token With AuthScheme instead of regular access token
-        if (atEntity.tokenType === exports.AuthenticationScheme.POP) {
+        if (requestedClaims) {
+            atEntity.requestedClaims = requestedClaims;
+            atEntity.requestedClaimsHash = requestedClaimsHash;
+        }
+        /*
+         * Create Access Token With Auth Scheme instead of regular access token
+         * Cast to lower to handle "bearer" from ADFS
+         */
+        if (((_a = atEntity.tokenType) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== exports.AuthenticationScheme.BEARER.toLowerCase()) {
             atEntity.credentialType = CredentialType.ACCESS_TOKEN_WITH_AUTH_SCHEME;
-            // Make sure keyId is present and add it to credential
-            var tokenClaims = AuthToken.extractTokenClaims(accessToken, cryptoUtils);
-            if (!((_a = tokenClaims === null || tokenClaims === void 0 ? void 0 : tokenClaims.cnf) === null || _a === void 0 ? void 0 : _a.kid)) {
-                throw ClientAuthError.createTokenClaimsRequiredError();
+            switch (atEntity.tokenType) {
+                case exports.AuthenticationScheme.POP:
+                    // Make sure keyId is present and add it to credential
+                    var tokenClaims = AuthToken.extractTokenClaims(accessToken, cryptoUtils);
+                    if (!((_b = tokenClaims === null || tokenClaims === void 0 ? void 0 : tokenClaims.cnf) === null || _b === void 0 ? void 0 : _b.kid)) {
+                        throw ClientAuthError.createTokenClaimsRequiredError();
+                    }
+                    atEntity.keyId = tokenClaims.cnf.kid;
+                    break;
+                case exports.AuthenticationScheme.SSH:
+                    atEntity.keyId = keyId;
             }
-            atEntity.keyId = tokenClaims.cnf.kid;
         }
         return atEntity;
     };
@@ -4068,7 +4243,7 @@ var AccessTokenEntity = /** @class */ (function (_super) {
     return AccessTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4135,7 +4310,7 @@ var RefreshTokenEntity = /** @class */ (function (_super) {
     return RefreshTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4199,7 +4374,7 @@ var InteractionRequiredAuthError = /** @class */ (function (_super) {
     return InteractionRequiredAuthError;
 }(AuthError));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4215,7 +4390,7 @@ var CacheRecord = /** @class */ (function () {
     return CacheRecord;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4286,7 +4461,7 @@ var ProtocolUtils = /** @class */ (function () {
     return ProtocolUtils;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4487,7 +4662,7 @@ var UrlString = /** @class */ (function () {
     return UrlString;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4546,14 +4721,14 @@ var PopTokenGenerator = /** @class */ (function () {
     };
     PopTokenGenerator.prototype.signPayload = function (payload, kid, request, claims) {
         return __awaiter(this, void 0, void 0, function () {
-            var resourceRequestMethod, resourceRequestUri, shrClaims, resourceUrlString, resourceUrlComponents;
+            var resourceRequestMethod, resourceRequestUri, shrClaims, shrNonce, resourceUrlString, resourceUrlComponents;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        resourceRequestMethod = request.resourceRequestMethod, resourceRequestUri = request.resourceRequestUri, shrClaims = request.shrClaims;
+                        resourceRequestMethod = request.resourceRequestMethod, resourceRequestUri = request.resourceRequestUri, shrClaims = request.shrClaims, shrNonce = request.shrNonce;
                         resourceUrlString = (resourceRequestUri) ? new UrlString(resourceRequestUri) : undefined;
                         resourceUrlComponents = resourceUrlString === null || resourceUrlString === void 0 ? void 0 : resourceUrlString.getUrlComponents();
-                        return [4 /*yield*/, this.cryptoUtils.signJwt(__assign({ at: payload, ts: TimeUtils.nowSeconds(), m: resourceRequestMethod === null || resourceRequestMethod === void 0 ? void 0 : resourceRequestMethod.toUpperCase(), u: resourceUrlComponents === null || resourceUrlComponents === void 0 ? void 0 : resourceUrlComponents.HostNameAndPort, nonce: this.cryptoUtils.createNewGuid(), p: resourceUrlComponents === null || resourceUrlComponents === void 0 ? void 0 : resourceUrlComponents.AbsolutePath, q: (resourceUrlComponents === null || resourceUrlComponents === void 0 ? void 0 : resourceUrlComponents.QueryString) ? [[], resourceUrlComponents.QueryString] : undefined, client_claims: shrClaims || undefined }, claims), kid)];
+                        return [4 /*yield*/, this.cryptoUtils.signJwt(__assign({ at: payload, ts: TimeUtils.nowSeconds(), m: resourceRequestMethod === null || resourceRequestMethod === void 0 ? void 0 : resourceRequestMethod.toUpperCase(), u: resourceUrlComponents === null || resourceUrlComponents === void 0 ? void 0 : resourceUrlComponents.HostNameAndPort, nonce: shrNonce || this.cryptoUtils.createNewGuid(), p: resourceUrlComponents === null || resourceUrlComponents === void 0 ? void 0 : resourceUrlComponents.AbsolutePath, q: (resourceUrlComponents === null || resourceUrlComponents === void 0 ? void 0 : resourceUrlComponents.QueryString) ? [[], resourceUrlComponents.QueryString] : undefined, client_claims: shrClaims || undefined }, claims), kid)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -4562,7 +4737,7 @@ var PopTokenGenerator = /** @class */ (function () {
     return PopTokenGenerator;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4632,7 +4807,7 @@ var AppMetadataEntity = /** @class */ (function () {
     return AppMetadataEntity;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4668,7 +4843,7 @@ var AppMetadataEntity = /** @class */ (function () {
     return TokenCacheContext;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4749,7 +4924,9 @@ var ResponseHandler = /** @class */ (function () {
                         if (!!authCodePayload && !!authCodePayload.state) {
                             requestStateObj = ProtocolUtils.parseRequestState(this.cryptoObj, authCodePayload.state);
                         }
-                        cacheRecord = this.generateCacheRecord(serverTokenResponse, authority, reqTimestamp, idTokenObj, request.scopes, oboAssertion, authCodePayload);
+                        // Add keyId from request to serverTokenResponse if defined
+                        serverTokenResponse.key_id = serverTokenResponse.key_id || request.sshKid || undefined;
+                        cacheRecord = this.generateCacheRecord(serverTokenResponse, authority, reqTimestamp, request, idTokenObj, oboAssertion, authCodePayload);
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, , 5, 8]);
@@ -4786,7 +4963,7 @@ var ResponseHandler = /** @class */ (function () {
                         _a.sent();
                         _a.label = 7;
                     case 7: return [7 /*endfinally*/];
-                    case 8: return [2 /*return*/, ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, idTokenObj, requestStateObj)];
+                    case 8: return [2 /*return*/, ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, idTokenObj, requestStateObj, serverTokenResponse.spa_code)];
                 }
             });
         });
@@ -4797,7 +4974,7 @@ var ResponseHandler = /** @class */ (function () {
      * @param idTokenObj
      * @param authority
      */
-    ResponseHandler.prototype.generateCacheRecord = function (serverTokenResponse, authority, reqTimestamp, idTokenObj, requestScopes, oboAssertion, authCodePayload) {
+    ResponseHandler.prototype.generateCacheRecord = function (serverTokenResponse, authority, reqTimestamp, request, idTokenObj, oboAssertion, authCodePayload) {
         var env = authority.getPreferredCache();
         if (StringUtils.isEmpty(env)) {
             throw ClientAuthError.createInvalidCacheEnvironmentError();
@@ -4813,7 +4990,7 @@ var ResponseHandler = /** @class */ (function () {
         var cachedAccessToken = null;
         if (!StringUtils.isEmpty(serverTokenResponse.access_token)) {
             // If scopes not returned in server response, use request scopes
-            var responseScopes = serverTokenResponse.scope ? ScopeSet.fromString(serverTokenResponse.scope) : new ScopeSet(requestScopes || []);
+            var responseScopes = serverTokenResponse.scope ? ScopeSet.fromString(serverTokenResponse.scope) : new ScopeSet(request.scopes || []);
             /*
              * Use timestamp calculated before request
              * Server may return timestamps as strings, parse to numbers if so.
@@ -4825,7 +5002,7 @@ var ResponseHandler = /** @class */ (function () {
             var extendedTokenExpirationSeconds = tokenExpirationSeconds + extExpiresIn;
             var refreshOnSeconds = refreshIn && refreshIn > 0 ? reqTimestamp + refreshIn : undefined;
             // non AAD scenarios can have empty realm
-            cachedAccessToken = AccessTokenEntity.createAccessTokenEntity(this.homeAccountIdentifier, env, serverTokenResponse.access_token || Constants.EMPTY_STRING, this.clientId, idTokenObj ? idTokenObj.claims.tid || Constants.EMPTY_STRING : authority.tenant, responseScopes.printScopes(), tokenExpirationSeconds, extendedTokenExpirationSeconds, this.cryptoObj, refreshOnSeconds, serverTokenResponse.token_type, oboAssertion);
+            cachedAccessToken = AccessTokenEntity.createAccessTokenEntity(this.homeAccountIdentifier, env, serverTokenResponse.access_token || Constants.EMPTY_STRING, this.clientId, idTokenObj ? idTokenObj.claims.tid || Constants.EMPTY_STRING : authority.tenant, responseScopes.printScopes(), tokenExpirationSeconds, extendedTokenExpirationSeconds, this.cryptoObj, refreshOnSeconds, serverTokenResponse.token_type, oboAssertion, serverTokenResponse.key_id, request.claims, request.requestedClaimsHash);
         }
         // refreshToken
         var cachedRefreshToken = null;
@@ -4872,7 +5049,7 @@ var ResponseHandler = /** @class */ (function () {
      * @param fromTokenCache
      * @param stateString
      */
-    ResponseHandler.generateAuthenticationResult = function (cryptoObj, authority, cacheRecord, fromTokenCache, request, idTokenObj, requestState) {
+    ResponseHandler.generateAuthenticationResult = function (cryptoObj, authority, cacheRecord, fromTokenCache, request, idTokenObj, requestState, code) {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
             var accessToken, responseScopes, expiresOn, extExpiresOn, familyId, popTokenGenerator, uid, tid;
@@ -4921,7 +5098,8 @@ var ResponseHandler = /** @class */ (function () {
                                 tokenType: ((_a = cacheRecord.accessToken) === null || _a === void 0 ? void 0 : _a.tokenType) || Constants.EMPTY_STRING,
                                 state: requestState ? requestState.userRequestState : Constants.EMPTY_STRING,
                                 cloudGraphHostName: ((_b = cacheRecord.account) === null || _b === void 0 ? void 0 : _b.cloudGraphHostName) || Constants.EMPTY_STRING,
-                                msGraphHost: ((_c = cacheRecord.account) === null || _c === void 0 ? void 0 : _c.msGraphHost) || Constants.EMPTY_STRING
+                                msGraphHost: ((_c = cacheRecord.account) === null || _c === void 0 ? void 0 : _c.msGraphHost) || Constants.EMPTY_STRING,
+                                code: code
                             }];
                 }
             });
@@ -4930,7 +5108,7 @@ var ResponseHandler = /** @class */ (function () {
     return ResponseHandler;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4942,7 +5120,10 @@ var ResponseHandler = /** @class */ (function () {
 var AuthorizationCodeClient = /** @class */ (function (_super) {
     __extends(AuthorizationCodeClient, _super);
     function AuthorizationCodeClient(configuration) {
-        return _super.call(this, configuration) || this;
+        var _this = _super.call(this, configuration) || this;
+        // Flag to indicate if client is for hybrid spa auth code redemption
+        _this.includeRedirectUri = true;
+        return _this;
     }
     /**
      * Creates the URL of the authorization request letting the user input credentials and consent to the
@@ -5042,10 +5223,12 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                             clientId: this.config.authOptions.clientId,
                             authority: authority.canonicalAuthority,
                             scopes: request.scopes,
+                            claims: request.claims,
                             authenticationScheme: request.authenticationScheme,
                             resourceRequestMethod: request.resourceRequestMethod,
                             resourceRequestUri: request.resourceRequestUri,
-                            shrClaims: request.shrClaims
+                            shrClaims: request.shrClaims,
+                            sshKid: request.sshKid
                         };
                         return [4 /*yield*/, this.createTokenRequestBody(request)];
                     case 1:
@@ -5089,13 +5272,24 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
     AuthorizationCodeClient.prototype.createTokenRequestBody = function (request) {
         return __awaiter(this, void 0, void 0, function () {
             var parameterBuilder, clientAssertion, popTokenGenerator, cnfString, correlationId, ccsCred, clientInfo, clientInfo;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         parameterBuilder = new RequestParameterBuilder();
                         parameterBuilder.addClientId(this.config.authOptions.clientId);
-                        // validate the redirectUri (to be a non null value)
-                        parameterBuilder.addRedirectUri(request.redirectUri);
+                        /*
+                         * For hybrid spa flow, there will be a code but no verifier
+                         * In this scenario, don't include redirect uri as auth code will not be bound to redirect URI
+                         */
+                        if (!this.includeRedirectUri) {
+                            // Just validate
+                            RequestValidator.validateRedirectUri(request.redirectUri);
+                        }
+                        else {
+                            // Validate and include redirect uri
+                            parameterBuilder.addRedirectUri(request.redirectUri);
+                        }
                         // Add scope array, parameter builder will add default scopes and dedupe
                         parameterBuilder.addScopes(request.scopes);
                         // add code: user set, not validated
@@ -5124,10 +5318,20 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                         popTokenGenerator = new PopTokenGenerator(this.cryptoUtils);
                         return [4 /*yield*/, popTokenGenerator.generateCnf(request)];
                     case 1:
-                        cnfString = _a.sent();
+                        cnfString = _b.sent();
                         parameterBuilder.addPopToken(cnfString);
-                        _a.label = 2;
+                        return [3 /*break*/, 3];
                     case 2:
+                        if (request.authenticationScheme === exports.AuthenticationScheme.SSH) {
+                            if (request.sshJwk) {
+                                parameterBuilder.addSshJwk(request.sshJwk);
+                            }
+                            else {
+                                throw ClientConfigurationError.createMissingSshJwkError();
+                            }
+                        }
+                        _b.label = 3;
+                    case 3:
                         correlationId = request.correlationId || this.config.cryptoInterface.createNewGuid();
                         parameterBuilder.addCorrelationId(correlationId);
                         if (!StringUtils.isEmptyObj(request.claims) || this.config.authOptions.clientCapabilities && this.config.authOptions.clientCapabilities.length > 0) {
@@ -5166,6 +5370,15 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                                     break;
                             }
                         }
+                        if (request.tokenBodyParameters) {
+                            parameterBuilder.addExtraQueryParameters(request.tokenBodyParameters);
+                        }
+                        // Add hybrid spa parameters if not already provided
+                        if (request.enableSpaAuthorizationCode && (!request.tokenBodyParameters || !request.tokenBodyParameters[AADServerParamKeys.RETURN_SPA_CODE])) {
+                            parameterBuilder.addExtraQueryParameters((_a = {},
+                                _a[AADServerParamKeys.RETURN_SPA_CODE] = "1",
+                                _a));
+                        }
                         return [2 /*return*/, parameterBuilder.createQueryString()];
                 }
             });
@@ -5284,6 +5497,9 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
         if (request.state) {
             parameterBuilder.addState(request.state);
         }
+        if (request.logoutHint) {
+            parameterBuilder.addLogoutHint(request.logoutHint);
+        }
         if (request.extraQueryParameters) {
             parameterBuilder.addExtraQueryParameters(request.extraQueryParameters);
         }
@@ -5303,7 +5519,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
     return AuthorizationCodeClient;
 }(BaseClient));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5414,10 +5630,12 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                             clientId: this.config.authOptions.clientId,
                             authority: authority.canonicalAuthority,
                             scopes: request.scopes,
+                            claims: request.claims,
                             authenticationScheme: request.authenticationScheme,
                             resourceRequestMethod: request.resourceRequestMethod,
                             resourceRequestUri: request.resourceRequestUri,
-                            shrClaims: request.shrClaims
+                            shrClaims: request.shrClaims,
+                            sshKid: request.sshKid
                         };
                         endpoint = UrlString.appendQueryString(authority.tokenEndpoint, queryParameters);
                         return [2 /*return*/, this.executePostToTokenEndpoint(endpoint, requestBody, headers, thumbprint)];
@@ -5442,9 +5660,9 @@ var RefreshTokenClient = /** @class */ (function (_super) {
      */
     RefreshTokenClient.prototype.createTokenRequestBody = function (request) {
         return __awaiter(this, void 0, void 0, function () {
-            var parameterBuilder, correlationId, clientAssertion, popTokenGenerator, _a, _b, clientInfo;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var parameterBuilder, correlationId, clientAssertion, popTokenGenerator, cnfString, clientInfo;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         parameterBuilder = new RequestParameterBuilder();
                         parameterBuilder.addClientId(this.config.authOptions.clientId);
@@ -5469,12 +5687,22 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                         }
                         if (!(request.authenticationScheme === exports.AuthenticationScheme.POP)) return [3 /*break*/, 2];
                         popTokenGenerator = new PopTokenGenerator(this.cryptoUtils);
-                        _b = (_a = parameterBuilder).addPopToken;
                         return [4 /*yield*/, popTokenGenerator.generateCnf(request)];
                     case 1:
-                        _b.apply(_a, [_c.sent()]);
-                        _c.label = 2;
+                        cnfString = _a.sent();
+                        parameterBuilder.addPopToken(cnfString);
+                        return [3 /*break*/, 3];
                     case 2:
+                        if (request.authenticationScheme === exports.AuthenticationScheme.SSH) {
+                            if (request.sshJwk) {
+                                parameterBuilder.addSshJwk(request.sshJwk);
+                            }
+                            else {
+                                throw ClientConfigurationError.createMissingSshJwkError();
+                            }
+                        }
+                        _a.label = 3;
+                    case 3:
                         if (!StringUtils.isEmptyObj(request.claims) || this.config.authOptions.clientCapabilities && this.config.authOptions.clientCapabilities.length > 0) {
                             parameterBuilder.addClaims(request.claims, this.config.authOptions.clientCapabilities);
                         }
@@ -5502,7 +5730,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
     return RefreshTokenClient;
 }(BaseClient));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5548,7 +5776,7 @@ var SilentFlowClient = /** @class */ (function (_super) {
     SilentFlowClient.prototype.acquireCachedToken = function (request) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
-            var requestScopes, environment, authScheme, cacheRecord;
+            var environment, cacheRecord;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
@@ -5556,37 +5784,35 @@ var SilentFlowClient = /** @class */ (function (_super) {
                         if (!request) {
                             throw ClientConfigurationError.createEmptyTokenRequestError();
                         }
-                        // We currently do not support silent flow for account === null use cases; This will be revisited for confidential flow usecases
-                        if (!request.account) {
-                            throw ClientAuthError.createNoAccountInSilentRequestError();
-                        }
-                        requestScopes = new ScopeSet(request.scopes || []);
-                        environment = request.authority || this.authority.getPreferredCache();
-                        authScheme = request.authenticationScheme || exports.AuthenticationScheme.BEARER;
-                        cacheRecord = this.cacheManager.readCacheRecord(request.account, this.config.authOptions.clientId, requestScopes, environment, authScheme);
                         if (request.forceRefresh) {
                             // Must refresh due to present force_refresh flag.
                             (_a = this.serverTelemetryManager) === null || _a === void 0 ? void 0 : _a.setCacheOutcome(CacheOutcome.FORCE_REFRESH);
+                            this.logger.info("SilentFlowClient:acquireCachedToken - Skipping cache because forceRefresh is true.");
                             throw ClientAuthError.createRefreshRequiredError();
                         }
-                        else if (!cacheRecord.accessToken) {
+                        // We currently do not support silent flow for account === null use cases; This will be revisited for confidential flow usecases
+                        if (!request.account) {
+                            throw ClientAuthError.createNoAccountInSilentRequestError();
+                        }
+                        environment = request.authority || this.authority.getPreferredCache();
+                        cacheRecord = this.cacheManager.readCacheRecord(request.account, this.config.authOptions.clientId, request, environment);
+                        if (!cacheRecord.accessToken) {
                             // Must refresh due to non-existent access_token.
                             (_b = this.serverTelemetryManager) === null || _b === void 0 ? void 0 : _b.setCacheOutcome(CacheOutcome.NO_CACHED_ACCESS_TOKEN);
+                            this.logger.info("SilentFlowClient:acquireCachedToken - No access token found in cache for the given properties.");
                             throw ClientAuthError.createRefreshRequiredError();
                         }
                         else if (TimeUtils.wasClockTurnedBack(cacheRecord.accessToken.cachedAt) ||
                             TimeUtils.isTokenExpired(cacheRecord.accessToken.expiresOn, this.config.systemOptions.tokenRenewalOffsetSeconds)) {
                             // Must refresh due to expired access_token.
                             (_c = this.serverTelemetryManager) === null || _c === void 0 ? void 0 : _c.setCacheOutcome(CacheOutcome.CACHED_ACCESS_TOKEN_EXPIRED);
+                            this.logger.info("SilentFlowClient:acquireCachedToken - Cached access token is expired or will expire within " + this.config.systemOptions.tokenRenewalOffsetSeconds + " seconds.");
                             throw ClientAuthError.createRefreshRequiredError();
                         }
                         else if (cacheRecord.accessToken.refreshOn && TimeUtils.isTokenExpired(cacheRecord.accessToken.refreshOn, 0)) {
                             // Must refresh due to the refresh_in value.
                             (_d = this.serverTelemetryManager) === null || _d === void 0 ? void 0 : _d.setCacheOutcome(CacheOutcome.REFRESH_CACHED_ACCESS_TOKEN);
-                            throw ClientAuthError.createRefreshRequiredError();
-                        }
-                        else if (!StringUtils.isEmptyObj(request.claims)) {
-                            // Must refresh due to request parameters.
+                            this.logger.info("SilentFlowClient:acquireCachedToken - Cached access token's refreshOn property has been exceeded'.");
                             throw ClientAuthError.createRefreshRequiredError();
                         }
                         if (this.config.serverTelemetryManager) {
@@ -5620,7 +5846,7 @@ var SilentFlowClient = /** @class */ (function (_super) {
     return SilentFlowClient;
 }(BaseClient));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5628,11 +5854,10 @@ var SilentFlowClient = /** @class */ (function (_super) {
 function isOpenIdConfigResponse(response) {
     return (response.hasOwnProperty("authorization_endpoint") &&
         response.hasOwnProperty("token_endpoint") &&
-        response.hasOwnProperty("end_session_endpoint") &&
         response.hasOwnProperty("issuer"));
 }
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5646,7 +5871,7 @@ exports.ProtocolMode = void 0;
     ProtocolMode["OIDC"] = "OIDC";
 })(exports.ProtocolMode || (exports.ProtocolMode = {}));
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5713,7 +5938,6 @@ var AuthorityMetadataEntity = /** @class */ (function () {
             entity.hasOwnProperty("canonical_authority") &&
             entity.hasOwnProperty("authorization_endpoint") &&
             entity.hasOwnProperty("token_endpoint") &&
-            entity.hasOwnProperty("end_session_endpoint") &&
             entity.hasOwnProperty("issuer") &&
             entity.hasOwnProperty("aliasesFromNetwork") &&
             entity.hasOwnProperty("endpointsFromNetwork") &&
@@ -5722,7 +5946,7 @@ var AuthorityMetadataEntity = /** @class */ (function () {
     return AuthorityMetadataEntity;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5732,7 +5956,7 @@ function isCloudInstanceDiscoveryResponse(response) {
         response.hasOwnProperty("metadata"));
 }
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5747,18 +5971,22 @@ var RegionDiscovery = /** @class */ (function () {
      *
      * @returns Promise<string | null>
      */
-    RegionDiscovery.prototype.detectRegion = function (environmentRegion, regionDiscoveryMetadata) {
+    RegionDiscovery.prototype.detectRegion = function (environmentRegion, regionDiscoveryMetadata, proxyUrl) {
         return __awaiter(this, void 0, void 0, function () {
-            var autodetectedRegionName, localIMDSVersionResponse, currentIMDSVersion, currentIMDSVersionResponse;
+            var autodetectedRegionName, options, localIMDSVersionResponse, currentIMDSVersion, currentIMDSVersionResponse;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         autodetectedRegionName = environmentRegion;
                         if (!!autodetectedRegionName) return [3 /*break*/, 8];
+                        options = RegionDiscovery.IMDS_OPTIONS;
+                        if (proxyUrl) {
+                            options.proxyUrl = proxyUrl;
+                        }
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 6, , 7]);
-                        return [4 /*yield*/, this.getRegionFromIMDS(Constants.IMDS_VERSION)];
+                        return [4 /*yield*/, this.getRegionFromIMDS(Constants.IMDS_VERSION, options)];
                     case 2:
                         localIMDSVersionResponse = _a.sent();
                         if (localIMDSVersionResponse.status === ResponseCodes.httpSuccess) {
@@ -5766,14 +5994,14 @@ var RegionDiscovery = /** @class */ (function () {
                             regionDiscoveryMetadata.region_source = RegionDiscoverySources.IMDS;
                         }
                         if (!(localIMDSVersionResponse.status === ResponseCodes.httpBadRequest)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.getCurrentVersion()];
+                        return [4 /*yield*/, this.getCurrentVersion(options)];
                     case 3:
                         currentIMDSVersion = _a.sent();
                         if (!currentIMDSVersion) {
                             regionDiscoveryMetadata.region_source = RegionDiscoverySources.FAILED_AUTO_DETECTION;
                             return [2 /*return*/, null];
                         }
-                        return [4 /*yield*/, this.getRegionFromIMDS(currentIMDSVersion)];
+                        return [4 /*yield*/, this.getRegionFromIMDS(currentIMDSVersion, options)];
                     case 4:
                         currentIMDSVersionResponse = _a.sent();
                         if (currentIMDSVersionResponse.status === ResponseCodes.httpSuccess) {
@@ -5806,10 +6034,10 @@ var RegionDiscovery = /** @class */ (function () {
      * @param imdsEndpointUrl
      * @returns Promise<NetworkResponse<string>>
      */
-    RegionDiscovery.prototype.getRegionFromIMDS = function (version) {
+    RegionDiscovery.prototype.getRegionFromIMDS = function (version, options) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.networkInterface.sendGetRequestAsync(Constants.IMDS_ENDPOINT + "?api-version=" + version + "&format=text", RegionDiscovery.IMDS_OPTIONS, Constants.IMDS_TIMEOUT)];
+                return [2 /*return*/, this.networkInterface.sendGetRequestAsync(Constants.IMDS_ENDPOINT + "?api-version=" + version + "&format=text", options, Constants.IMDS_TIMEOUT)];
             });
         });
     };
@@ -5818,14 +6046,14 @@ var RegionDiscovery = /** @class */ (function () {
      *
      * @returns Promise<string | null>
      */
-    RegionDiscovery.prototype.getCurrentVersion = function () {
+    RegionDiscovery.prototype.getCurrentVersion = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             var response;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(Constants.IMDS_ENDPOINT + "?format=json", RegionDiscovery.IMDS_OPTIONS)];
+                        return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(Constants.IMDS_ENDPOINT + "?format=json", options)];
                     case 1:
                         response = _a.sent();
                         // When IMDS endpoint is called without the api version query param, bad request response comes back with latest version.
@@ -5842,11 +6070,15 @@ var RegionDiscovery = /** @class */ (function () {
         });
     };
     // Options for the IMDS endpoint request
-    RegionDiscovery.IMDS_OPTIONS = { headers: { "Metadata": "true" } };
+    RegionDiscovery.IMDS_OPTIONS = {
+        headers: {
+            Metadata: "true",
+        },
+    };
     return RegionDiscovery;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5857,7 +6089,7 @@ var RegionDiscovery = /** @class */ (function () {
  * endpoint. It will store the pertinent config data in this object for use during token calls.
  */
 var Authority = /** @class */ (function () {
-    function Authority(authority, networkInterface, cacheManager, authorityOptions) {
+    function Authority(authority, networkInterface, cacheManager, authorityOptions, proxyUrl) {
         this.canonicalAuthority = authority;
         this._canonicalAuthority.validateAsUri();
         this.networkInterface = networkInterface;
@@ -5865,6 +6097,7 @@ var Authority = /** @class */ (function () {
         this.authorityOptions = authorityOptions;
         this.regionDiscovery = new RegionDiscovery(networkInterface);
         this.regionDiscoveryMetadata = { region_used: undefined, region_source: undefined, region_outcome: undefined };
+        this.proxyUrl = proxyUrl || Constants.EMPTY_STRING;
     }
     Object.defineProperty(Authority.prototype, "authorityType", {
         // See above for AuthorityType
@@ -6000,6 +6233,10 @@ var Authority = /** @class */ (function () {
          */
         get: function () {
             if (this.discoveryComplete()) {
+                // ROPC policies may not have end_session_endpoint set
+                if (!this.metadata.end_session_endpoint) {
+                    throw ClientAuthError.createLogoutNotSupportedError();
+                }
                 var endpoint = this.replacePath(this.metadata.end_session_endpoint);
                 return this.replaceTenant(endpoint);
             }
@@ -6129,7 +6366,7 @@ var Authority = /** @class */ (function () {
                         metadata = _b.sent();
                         if (!metadata) return [3 /*break*/, 4];
                         if (!((_a = this.authorityOptions.azureRegionConfiguration) === null || _a === void 0 ? void 0 : _a.azureRegion)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.regionDiscovery.detectRegion(this.authorityOptions.azureRegionConfiguration.environmentRegion, this.regionDiscoveryMetadata)];
+                        return [4 /*yield*/, this.regionDiscovery.detectRegion(this.authorityOptions.azureRegionConfiguration.environmentRegion, this.regionDiscoveryMetadata, this.proxyUrl)];
                     case 2:
                         autodetectedRegionName = _b.sent();
                         azureRegion = this.authorityOptions.azureRegionConfiguration.azureRegion === Constants.AZURE_REGION_AUTO_DISCOVER_FLAG
@@ -6192,19 +6429,25 @@ var Authority = /** @class */ (function () {
      */
     Authority.prototype.getEndpointMetadataFromNetwork = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var response;
+            var options, response;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(this.defaultOpenIdConfigurationEndpoint)];
+                        options = {};
+                        if (this.proxyUrl) {
+                            options.proxyUrl = this.proxyUrl;
+                        }
+                        _a.label = 1;
                     case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(this.defaultOpenIdConfigurationEndpoint, options)];
+                    case 2:
                         response = _a.sent();
                         return [2 /*return*/, isOpenIdConfigResponse(response.body) ? response.body : null];
-                    case 2:
+                    case 3:
                         _a.sent();
                         return [2 /*return*/, null];
-                    case 3: return [2 /*return*/];
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -6274,16 +6517,20 @@ var Authority = /** @class */ (function () {
      */
     Authority.prototype.getCloudDiscoveryMetadataFromNetwork = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var instanceDiscoveryEndpoint, match, response, metadata;
+            var instanceDiscoveryEndpoint, options, match, response, metadata;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         instanceDiscoveryEndpoint = "" + Constants.AAD_INSTANCE_DISCOVERY_ENDPT + this.canonicalAuthority + "oauth2/v2.0/authorize";
+                        options = {};
+                        if (this.proxyUrl) {
+                            options.proxyUrl = this.proxyUrl;
+                        }
                         match = null;
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(instanceDiscoveryEndpoint)];
+                        return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(instanceDiscoveryEndpoint, options)];
                     case 2:
                         response = _a.sent();
                         metadata = isCloudInstanceDiscoveryResponse(response.body) ? response.body.metadata : [];
@@ -6298,7 +6545,7 @@ var Authority = /** @class */ (function () {
                         return [2 /*return*/, null];
                     case 4:
                         if (!match) {
-                            // Custom Domain scenario, host is trusted because Instance Discovery call succeeded 
+                            // Custom Domain scenario, host is trusted because Instance Discovery call succeeded
                             match = Authority.createCloudDiscoveryMetadataFromHost(this.hostnameAndPort);
                         }
                         return [2 /*return*/, match];
@@ -6316,6 +6563,19 @@ var Authority = /** @class */ (function () {
         });
         return matches.length > 0;
     };
+    /**
+     * helper function to populate the authority based on azureCloudOptions
+     * @param authorityString
+     * @param azureCloudOptions
+     */
+    Authority.generateAuthority = function (authorityString, azureCloudOptions) {
+        var authorityAzureCloudInstance;
+        if (azureCloudOptions && azureCloudOptions.azureCloudInstance !== exports.AzureCloudInstance.None) {
+            var tenant = azureCloudOptions.tenant ? azureCloudOptions.tenant : Constants.DEFAULT_COMMON_TENANT;
+            authorityAzureCloudInstance = azureCloudOptions.azureCloudInstance + "/" + tenant + "/";
+        }
+        return authorityAzureCloudInstance ? authorityAzureCloudInstance : authorityString;
+    };
     /**
      * Creates cloud discovery metadata object from a given host
      * @param host
@@ -6400,13 +6660,15 @@ var Authority = /** @class */ (function () {
         metadata.authorization_endpoint = Authority.buildRegionalAuthorityString(metadata.authorization_endpoint, azureRegion);
         // TODO: Enquire on whether we should leave the query string or remove it before releasing the feature
         metadata.token_endpoint = Authority.buildRegionalAuthorityString(metadata.token_endpoint, azureRegion, "allowestsrnonmsi=true");
-        metadata.end_session_endpoint = Authority.buildRegionalAuthorityString(metadata.end_session_endpoint, azureRegion);
+        if (metadata.end_session_endpoint) {
+            metadata.end_session_endpoint = Authority.buildRegionalAuthorityString(metadata.end_session_endpoint, azureRegion);
+        }
         return metadata;
     };
     return Authority;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6425,13 +6687,13 @@ var AuthorityFactory = /** @class */ (function () {
      * @param networkClient
      * @param protocolMode
      */
-    AuthorityFactory.createDiscoveredInstance = function (authorityUri, networkClient, cacheManager, authorityOptions) {
+    AuthorityFactory.createDiscoveredInstance = function (authorityUri, networkClient, cacheManager, authorityOptions, proxyUrl) {
         return __awaiter(this, void 0, void 0, function () {
             var acquireTokenAuthority, e_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        acquireTokenAuthority = AuthorityFactory.createInstance(authorityUri, networkClient, cacheManager, authorityOptions);
+                        acquireTokenAuthority = AuthorityFactory.createInstance(authorityUri, networkClient, cacheManager, authorityOptions, proxyUrl);
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
@@ -6457,17 +6719,17 @@ var AuthorityFactory = /** @class */ (function () {
      * @param networkInterface
      * @param protocolMode
      */
-    AuthorityFactory.createInstance = function (authorityUrl, networkInterface, cacheManager, authorityOptions) {
+    AuthorityFactory.createInstance = function (authorityUrl, networkInterface, cacheManager, authorityOptions, proxyUrl) {
         // Throw error if authority url is empty
         if (StringUtils.isEmpty(authorityUrl)) {
             throw ClientConfigurationError.createUrlEmptyError();
         }
-        return new Authority(authorityUrl, networkInterface, cacheManager, authorityOptions);
+        return new Authority(authorityUrl, networkInterface, cacheManager, authorityOptions, proxyUrl);
     };
     return AuthorityFactory;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6498,7 +6760,7 @@ var ServerTelemetryEntity = /** @class */ (function () {
     return ServerTelemetryEntity;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6526,7 +6788,7 @@ var ThrottlingEntity = /** @class */ (function () {
     return ThrottlingEntity;
 }());
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6543,7 +6805,66 @@ var StubbedNetworkModule = {
     }
 };
 
-/*! @azure/msal-common v5.0.1 2021-10-05 */
+/*! @azure/msal-common v6.1.0 2022-02-08 */
+
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+/**
+ * This is a helper class that parses supported HTTP response authentication headers to extract and return
+ * header challenge values that can be used outside the basic authorization flows.
+ */
+var AuthenticationHeaderParser = /** @class */ (function () {
+    function AuthenticationHeaderParser(headers) {
+        this.headers = headers;
+    }
+    /**
+     * This method parses the SHR nonce value out of either the Authentication-Info or WWW-Authenticate authentication headers.
+     * @returns
+     */
+    AuthenticationHeaderParser.prototype.getShrNonce = function () {
+        // Attempt to parse nonce from Authentiacation-Info
+        var authenticationInfo = this.headers[HeaderNames.AuthenticationInfo];
+        if (authenticationInfo) {
+            var authenticationInfoChallenges = this.parseChallenges(authenticationInfo);
+            if (authenticationInfoChallenges.nextnonce) {
+                return authenticationInfoChallenges.nextnonce;
+            }
+            throw ClientConfigurationError.createInvalidAuthenticationHeaderError(HeaderNames.AuthenticationInfo, "nextnonce challenge is missing.");
+        }
+        // Attempt to parse nonce from WWW-Authenticate
+        var wwwAuthenticate = this.headers[HeaderNames.WWWAuthenticate];
+        if (wwwAuthenticate) {
+            var wwwAuthenticateChallenges = this.parseChallenges(wwwAuthenticate);
+            if (wwwAuthenticateChallenges.nonce) {
+                return wwwAuthenticateChallenges.nonce;
+            }
+            throw ClientConfigurationError.createInvalidAuthenticationHeaderError(HeaderNames.WWWAuthenticate, "nonce challenge is missing.");
+        }
+        // If neither header is present, throw missing headers error
+        throw ClientConfigurationError.createMissingNonceAuthenticationHeadersError();
+    };
+    /**
+     * Parses an HTTP header's challenge set into a key/value map.
+     * @param header
+     * @returns
+     */
+    AuthenticationHeaderParser.prototype.parseChallenges = function (header) {
+        var schemeSeparator = header.indexOf(" ");
+        var challenges = header.substr(schemeSeparator + 1).split(",");
+        var challengeMap = {};
+        challenges.forEach(function (challenge) {
+            var _a = challenge.split("="), key = _a[0], value = _a[1];
+            // Remove escaped quotation marks (', ") from challenge string to keep only the challenge value
+            challengeMap[key] = unescape(value.replace(/['"]+/g, ""));
+        });
+        return challengeMap;
+    };
+    return AuthenticationHeaderParser;
+}());
+
+/*! @azure/msal-common v6.1.0 2022-02-08 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6759,7 +7080,7 @@ var HTTP_REQUEST_TYPE;
 /**
  * Temporary cache keys for MSAL, deleted after any request.
  */
-var TemporaryCacheKeys;
+exports.TemporaryCacheKeys = void 0;
 (function (TemporaryCacheKeys) {
     TemporaryCacheKeys["AUTHORITY"] = "authority";
     TemporaryCacheKeys["ACQUIRE_TOKEN_ACCOUNT"] = "acquireToken.account";
@@ -6774,7 +7095,7 @@ var TemporaryCacheKeys;
     TemporaryCacheKeys["INTERACTION_STATUS_KEY"] = "interaction.status";
     TemporaryCacheKeys["CCS_CREDENTIAL"] = "ccs.credential";
     TemporaryCacheKeys["CORRELATION_ID"] = "request.correlationId";
-})(TemporaryCacheKeys || (TemporaryCacheKeys = {}));
+})(exports.TemporaryCacheKeys || (exports.TemporaryCacheKeys = {}));
 /**
  * Cache keys stored in-memory
  */
@@ -6796,6 +7117,7 @@ exports.ApiId = void 0;
     ApiId[ApiId["ssoSilent"] = 863] = "ssoSilent";
     ApiId[ApiId["acquireTokenSilent_authCode"] = 864] = "acquireTokenSilent_authCode";
     ApiId[ApiId["handleRedirectPromise"] = 865] = "handleRedirectPromise";
+    ApiId[ApiId["acquireTokenByCode"] = 866] = "acquireTokenByCode";
     ApiId[ApiId["acquireTokenSilent_silentFlow"] = 61] = "acquireTokenSilent_silentFlow";
     ApiId[ApiId["logout"] = 961] = "logout";
     ApiId[ApiId["logoutPopup"] = 962] = "logoutPopup";
@@ -6808,6 +7130,7 @@ exports.InteractionType = void 0;
     InteractionType["Redirect"] = "redirect";
     InteractionType["Popup"] = "popup";
     InteractionType["Silent"] = "silent";
+    InteractionType["None"] = "none";
 })(exports.InteractionType || (exports.InteractionType = {}));
 /**
  * Types of interaction currently in progress.
@@ -6856,7 +7179,11 @@ exports.WrapperSKU = void 0;
 (function (WrapperSKU) {
     WrapperSKU["React"] = "@azure/msal-react";
     WrapperSKU["Angular"] = "@azure/msal-angular";
-})(exports.WrapperSKU || (exports.WrapperSKU = {}));
+})(exports.WrapperSKU || (exports.WrapperSKU = {}));
+// DatabaseStorage Constants
+var DB_NAME = "msal.db";
+var DB_VERSION = 1;
+var DB_TABLE_NAME = DB_NAME + ".keys";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7332,7 +7659,7 @@ var BrowserAuthErrorMessage = {
     },
     noTokenRequestCacheError: {
         code: "no_token_request_cache_error",
-        desc: "No token request in found in cache."
+        desc: "No token request found in cache."
     },
     unableToParseTokenRequestCacheError: {
         code: "unable_to_parse_token_request_cache_error",
@@ -7381,6 +7708,14 @@ var BrowserAuthErrorMessage = {
     signingKeyNotFoundInStorage: {
         code: "crypto_key_not_found",
         desc: "Cryptographic Key or Keypair not found in browser storage."
+    },
+    authCodeRequired: {
+        code: "auth_code_required",
+        desc: "An authorization code must be provided (as the `code` property on the request) to this flow."
+    },
+    databaseUnavailable: {
+        code: "database_unavailable",
+        desc: "IndexedDB, which is required for persistent cryptographic key storage, is unavailable. This may be caused by browser privacy features which block persistent storage in third-party contexts."
     }
 };
 /**
@@ -7614,6 +7949,18 @@ var BrowserAuthError = /** @class */ (function (_super) {
     BrowserAuthError.createSigningKeyNotFoundInStorageError = function (keyId) {
         return new BrowserAuthError(BrowserAuthErrorMessage.signingKeyNotFoundInStorage.code, BrowserAuthErrorMessage.signingKeyNotFoundInStorage.desc + " | No match found for KeyId: " + keyId);
     };
+    /**
+     * Create an error when an authorization code is required but not provided
+     */
+    BrowserAuthError.createAuthCodeRequiredError = function () {
+        return new BrowserAuthError(BrowserAuthErrorMessage.authCodeRequired.code, BrowserAuthErrorMessage.authCodeRequired.desc);
+    };
+    /**
+     * Create an error when IndexedDB is unavailable
+     */
+    BrowserAuthError.createDatabaseUnavailableError = function () {
+        return new BrowserAuthError(BrowserAuthErrorMessage.databaseUnavailable.code, BrowserAuthErrorMessage.databaseUnavailable.desc);
+    };
     return BrowserAuthError;
 }(AuthError));
 
@@ -7716,7 +8063,8 @@ var PUBLIC_EXPONENT = new Uint8Array([0x01, 0x00, 0x01]);
  * hashing and encoding. It also has helper functions to validate the availability of specific APIs.
  */
 var BrowserCrypto = /** @class */ (function () {
-    function BrowserCrypto() {
+    function BrowserCrypto(logger) {
+        this.logger = logger;
         if (!(this.hasCryptoAPI())) {
             throw BrowserAuthError.createCryptoNotAvailableError("Browser crypto or msCrypto object not available.");
         }
@@ -7975,10 +8323,10 @@ var BrowserCrypto = /** @class */ (function () {
  * Storage wrapper for IndexedDB storage in browsers: https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API
  */
 var DatabaseStorage = /** @class */ (function () {
-    function DatabaseStorage(dbName, tableName, version) {
-        this.dbName = dbName;
-        this.tableName = tableName;
-        this.version = version;
+    function DatabaseStorage() {
+        this.dbName = DB_NAME;
+        this.version = DB_VERSION;
+        this.tableName = DB_TABLE_NAME;
         this.dbOpen = false;
     }
     /**
@@ -7989,7 +8337,6 @@ var DatabaseStorage = /** @class */ (function () {
             var _this = this;
             return __generator$1(this, function (_a) {
                 return [2 /*return*/, new Promise(function (resolve, reject) {
-                        // TODO: Add timeouts?
                         var openDB = window.indexedDB.open(_this.dbName, _this.version);
                         openDB.addEventListener("upgradeneeded", function (e) {
                             var event = e;
@@ -8001,40 +8348,53 @@ var DatabaseStorage = /** @class */ (function () {
                             _this.dbOpen = true;
                             resolve();
                         });
-                        openDB.addEventListener("error", function (error) { return reject(error); });
+                        openDB.addEventListener("error", function () { return reject(BrowserAuthError.createDatabaseUnavailableError()); });
                     })];
             });
         });
     };
     /**
-     * Retrieves item from IndexedDB instance.
-     * @param key
+     * Opens database if it's not already open
      */
-    DatabaseStorage.prototype.get = function (key) {
+    DatabaseStorage.prototype.validateDbIsOpen = function () {
         return __awaiter$1(this, void 0, void 0, function () {
-            var _this = this;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!!this.dbOpen) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.open()];
+                    case 1: return [2 /*return*/, _a.sent()];
+                    case 2: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Retrieves item from IndexedDB instance.
+     * @param key
+     */
+    DatabaseStorage.prototype.getItem = function (key) {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.validateDbIsOpen()];
                     case 1:
                         _a.sent();
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, new Promise(function (resolve, reject) {
-                            // TODO: Add timeouts?
-                            if (!_this.db) {
-                                return reject(BrowserAuthError.createDatabaseNotOpenError());
-                            }
-                            var transaction = _this.db.transaction([_this.tableName], "readonly");
-                            var objectStore = transaction.objectStore(_this.tableName);
-                            var dbGet = objectStore.get(key);
-                            dbGet.addEventListener("success", function (e) {
-                                var event = e;
-                                resolve(event.target.result);
-                            });
-                            dbGet.addEventListener("error", function (e) { return reject(e); });
-                        })];
+                        return [2 /*return*/, new Promise(function (resolve, reject) {
+                                // TODO: Add timeouts?
+                                if (!_this.db) {
+                                    return reject(BrowserAuthError.createDatabaseNotOpenError());
+                                }
+                                var transaction = _this.db.transaction([_this.tableName], "readonly");
+                                var objectStore = transaction.objectStore(_this.tableName);
+                                var dbGet = objectStore.get(key);
+                                dbGet.addEventListener("success", function (e) {
+                                    var event = e;
+                                    resolve(event.target.result);
+                                });
+                                dbGet.addEventListener("error", function (e) { return reject(e); });
+                            })];
                 }
             });
         });
@@ -8044,31 +8404,25 @@ var DatabaseStorage = /** @class */ (function () {
      * @param key
      * @param payload
      */
-    DatabaseStorage.prototype.put = function (key, payload) {
+    DatabaseStorage.prototype.setItem = function (key, payload) {
         return __awaiter$1(this, void 0, void 0, function () {
             var _this = this;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (!!this.dbOpen) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.open()];
+                    case 0: return [4 /*yield*/, this.validateDbIsOpen()];
                     case 1:
                         _a.sent();
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, new Promise(function (resolve, reject) {
-                            // TODO: Add timeouts?
-                            if (!_this.db) {
-                                return reject(BrowserAuthError.createDatabaseNotOpenError());
-                            }
-                            var transaction = _this.db.transaction([_this.tableName], "readwrite");
-                            var objectStore = transaction.objectStore(_this.tableName);
-                            var dbPut = objectStore.put(payload, key);
-                            dbPut.addEventListener("success", function (e) {
-                                var event = e;
-                                resolve(event.target.result);
-                            });
-                            dbPut.addEventListener("error", function (e) { return reject(e); });
-                        })];
+                        return [2 /*return*/, new Promise(function (resolve, reject) {
+                                // TODO: Add timeouts?
+                                if (!_this.db) {
+                                    return reject(BrowserAuthError.createDatabaseNotOpenError());
+                                }
+                                var transaction = _this.db.transaction([_this.tableName], "readwrite");
+                                var objectStore = transaction.objectStore(_this.tableName);
+                                var dbPut = objectStore.put(payload, key);
+                                dbPut.addEventListener("success", function () { return resolve(); });
+                                dbPut.addEventListener("error", function (e) { return reject(e); });
+                            })];
                 }
             });
         });
@@ -8077,62 +8431,101 @@ var DatabaseStorage = /** @class */ (function () {
      * Removes item from IndexedDB under given key
      * @param key
      */
-    DatabaseStorage.prototype.delete = function (key) {
+    DatabaseStorage.prototype.removeItem = function (key) {
         return __awaiter$1(this, void 0, void 0, function () {
             var _this = this;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (!!this.dbOpen) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.open()];
+                    case 0: return [4 /*yield*/, this.validateDbIsOpen()];
                     case 1:
                         _a.sent();
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, new Promise(function (resolve, reject) {
-                            if (!_this.db) {
-                                return reject(BrowserAuthError.createDatabaseNotOpenError());
-                            }
-                            var transaction = _this.db.transaction([_this.tableName], "readwrite");
-                            var objectStore = transaction.objectStore(_this.tableName);
-                            var dbDelete = objectStore.delete(key);
-                            dbDelete.addEventListener("success", function (e) {
-                                var event = e;
-                                resolve(event.target.result === undefined);
-                            });
-                            dbDelete.addEventListener("error", function (e) { return reject(e); });
-                        })];
+                        return [2 /*return*/, new Promise(function (resolve, reject) {
+                                if (!_this.db) {
+                                    return reject(BrowserAuthError.createDatabaseNotOpenError());
+                                }
+                                var transaction = _this.db.transaction([_this.tableName], "readwrite");
+                                var objectStore = transaction.objectStore(_this.tableName);
+                                var dbDelete = objectStore.delete(key);
+                                dbDelete.addEventListener("success", function () { return resolve(); });
+                                dbDelete.addEventListener("error", function (e) { return reject(e); });
+                            })];
                 }
             });
         });
     };
-    DatabaseStorage.prototype.clear = function () {
+    /**
+     * Get all the keys from the storage object as an iterable array of strings.
+     */
+    DatabaseStorage.prototype.getKeys = function () {
         return __awaiter$1(this, void 0, void 0, function () {
             var _this = this;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (!!this.dbOpen) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.open()];
+                    case 0: return [4 /*yield*/, this.validateDbIsOpen()];
                     case 1:
                         _a.sent();
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, new Promise(function (resolve, reject) {
-                            if (!_this.db) {
-                                return reject(BrowserAuthError.createDatabaseNotOpenError());
-                            }
-                            var transaction = _this.db.transaction([_this.tableName], "readwrite");
-                            var objectStore = transaction.objectStore(_this.tableName);
-                            var dbDelete = objectStore.clear();
-                            dbDelete.addEventListener("success", function (e) {
-                                var event = e;
-                                resolve(event.target.result === undefined);
-                            });
-                            dbDelete.addEventListener("error", function (e) { return reject(e); });
-                        })];
+                        return [2 /*return*/, new Promise(function (resolve, reject) {
+                                if (!_this.db) {
+                                    return reject(BrowserAuthError.createDatabaseNotOpenError());
+                                }
+                                var transaction = _this.db.transaction([_this.tableName], "readonly");
+                                var objectStore = transaction.objectStore(_this.tableName);
+                                var dbGetKeys = objectStore.getAllKeys();
+                                dbGetKeys.addEventListener("success", function (e) {
+                                    var event = e;
+                                    resolve(event.target.result);
+                                });
+                                dbGetKeys.addEventListener("error", function (e) { return reject(e); });
+                            })];
+                }
+            });
+        });
+    };
+    /**
+     *
+     * Checks whether there is an object under the search key in the object store
+     */
+    DatabaseStorage.prototype.containsKey = function (key) {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.validateDbIsOpen()];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/, new Promise(function (resolve, reject) {
+                                if (!_this.db) {
+                                    return reject(BrowserAuthError.createDatabaseNotOpenError());
+                                }
+                                var transaction = _this.db.transaction([_this.tableName], "readonly");
+                                var objectStore = transaction.objectStore(_this.tableName);
+                                var dbContainsKey = objectStore.count(key);
+                                dbContainsKey.addEventListener("success", function (e) {
+                                    var event = e;
+                                    resolve(event.target.result === 1);
+                                });
+                                dbContainsKey.addEventListener("error", function (e) { return reject(e); });
+                            })];
                 }
             });
         });
     };
+    /**
+     * Deletes the MSAL database. The database is deleted rather than cleared to make it possible
+     * for client applications to downgrade to a previous MSAL version without worrying about forward compatibility issues
+     * with IndexedDB database versions.
+     */
+    DatabaseStorage.prototype.deleteDatabase = function () {
+        return __awaiter$1(this, void 0, void 0, function () {
+            return __generator$1(this, function (_a) {
+                return [2 /*return*/, new Promise(function (resolve, reject) {
+                        var deleteDbRequest = window.indexedDB.deleteDatabase(DB_NAME);
+                        deleteDbRequest.addEventListener("success", function () { return resolve(true); });
+                        deleteDbRequest.addEventListener("error", function () { return reject(false); });
+                    })];
+            });
+        });
+    };
     return DatabaseStorage;
 }());
 
@@ -8140,22 +8533,245 @@ var DatabaseStorage = /** @class */ (function () {
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-/**
- * This class implements MSAL's crypto interface, which allows it to perform base64 encoding and decoding, generating cryptographically random GUIDs and
- * implementing Proof Key for Code Exchange specs for the OAuth Authorization Code Flow using PKCE (rfc here: https://tools.ietf.org/html/rfc7636).
- */
-var CryptoOps = /** @class */ (function () {
-    function CryptoOps() {
-        // Browser crypto needs to be validated first before any other classes can be set.
-        this.browserCrypto = new BrowserCrypto();
-        this.b64Encode = new Base64Encode();
-        this.b64Decode = new Base64Decode();
-        this.guidGenerator = new GuidGenerator(this.browserCrypto);
-        this.pkceGenerator = new PkceGenerator(this.browserCrypto);
-        this.cache = new DatabaseStorage(CryptoOps.DB_NAME, CryptoOps.TABLE_NAME, CryptoOps.DB_VERSION);
+var MemoryStorage = /** @class */ (function () {
+    function MemoryStorage() {
+        this.cache = new Map();
     }
-    /**
-     * Creates a new random GUID - used to populate state and nonce.
+    MemoryStorage.prototype.getItem = function (key) {
+        return this.cache.get(key) || null;
+    };
+    MemoryStorage.prototype.setItem = function (key, value) {
+        this.cache.set(key, value);
+    };
+    MemoryStorage.prototype.removeItem = function (key) {
+        this.cache.delete(key);
+    };
+    MemoryStorage.prototype.getKeys = function () {
+        var cacheKeys = [];
+        this.cache.forEach(function (value, key) {
+            cacheKeys.push(key);
+        });
+        return cacheKeys;
+    };
+    MemoryStorage.prototype.containsKey = function (key) {
+        return this.cache.has(key);
+    };
+    MemoryStorage.prototype.clear = function () {
+        this.cache.clear();
+    };
+    return MemoryStorage;
+}());
+
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+/**
+ * This class allows MSAL to store artifacts asynchronously using the DatabaseStorage IndexedDB wrapper,
+ * backed up with the more volatile MemoryStorage object for cases in which IndexedDB may be unavailable.
+ */
+var AsyncMemoryStorage = /** @class */ (function () {
+    function AsyncMemoryStorage(logger) {
+        this.inMemoryCache = new MemoryStorage();
+        this.indexedDBCache = new DatabaseStorage();
+        this.logger = logger;
+    }
+    AsyncMemoryStorage.prototype.handleDatabaseAccessError = function (error) {
+        if (error instanceof BrowserAuthError && error.errorCode === BrowserAuthErrorMessage.databaseUnavailable.code) {
+            this.logger.error("Could not access persistent storage. This may be caused by browser privacy features which block persistent storage in third-party contexts.");
+        }
+    };
+    /**
+     * Get the item matching the given key. Tries in-memory cache first, then in the asynchronous
+     * storage object if item isn't found in-memory.
+     * @param key
+     */
+    AsyncMemoryStorage.prototype.getItem = function (key) {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var item, e_1;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        item = this.inMemoryCache.getItem(key);
+                        if (!!item) return [3 /*break*/, 4];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        this.logger.verbose("Queried item not found in in-memory cache, now querying persistent storage.");
+                        return [4 /*yield*/, this.indexedDBCache.getItem(key)];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        e_1 = _a.sent();
+                        this.handleDatabaseAccessError(e_1);
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/, item];
+                }
+            });
+        });
+    };
+    /**
+     * Sets the item in the in-memory cache and then tries to set it in the asynchronous
+     * storage object with the given key.
+     * @param key
+     * @param value
+     */
+    AsyncMemoryStorage.prototype.setItem = function (key, value) {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var e_2;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.inMemoryCache.setItem(key, value);
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.indexedDBCache.setItem(key, value)];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        e_2 = _a.sent();
+                        this.handleDatabaseAccessError(e_2);
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Removes the item matching the key from the in-memory cache, then tries to remove it from the asynchronous storage object.
+     * @param key
+     */
+    AsyncMemoryStorage.prototype.removeItem = function (key) {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var e_3;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.inMemoryCache.removeItem(key);
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.indexedDBCache.removeItem(key)];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        e_3 = _a.sent();
+                        this.handleDatabaseAccessError(e_3);
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Get all the keys from the in-memory cache as an iterable array of strings. If no keys are found, query the keys in the
+     * asynchronous storage object.
+     */
+    AsyncMemoryStorage.prototype.getKeys = function () {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var cacheKeys, e_4;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        cacheKeys = this.inMemoryCache.getKeys();
+                        if (!(cacheKeys.length === 0)) return [3 /*break*/, 4];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        this.logger.verbose("In-memory cache is empty, now querying persistent storage.");
+                        return [4 /*yield*/, this.indexedDBCache.getKeys()];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        e_4 = _a.sent();
+                        this.handleDatabaseAccessError(e_4);
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/, cacheKeys];
+                }
+            });
+        });
+    };
+    /**
+     * Returns true or false if the given key is present in the cache.
+     * @param key
+     */
+    AsyncMemoryStorage.prototype.containsKey = function (key) {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var containsKey, e_5;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        containsKey = this.inMemoryCache.containsKey(key);
+                        if (!!containsKey) return [3 /*break*/, 4];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        this.logger.verbose("Key not found in in-memory cache, now querying persistent storage.");
+                        return [4 /*yield*/, this.indexedDBCache.containsKey(key)];
+                    case 2: return [2 /*return*/, _a.sent()];
+                    case 3:
+                        e_5 = _a.sent();
+                        this.handleDatabaseAccessError(e_5);
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/, containsKey];
+                }
+            });
+        });
+    };
+    /**
+     * Clears in-memory Map and tries to delete the IndexedDB database.
+     */
+    AsyncMemoryStorage.prototype.clear = function () {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var e_6;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.inMemoryCache.clear();
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.indexedDBCache.deleteDatabase()];
+                    case 2:
+                        _a.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        e_6 = _a.sent();
+                        this.handleDatabaseAccessError(e_6);
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return AsyncMemoryStorage;
+}());
+
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+/**
+ * This class implements MSAL's crypto interface, which allows it to perform base64 encoding and decoding, generating cryptographically random GUIDs and
+ * implementing Proof Key for Code Exchange specs for the OAuth Authorization Code Flow using PKCE (rfc here: https://tools.ietf.org/html/rfc7636).
+ */
+var CryptoOps = /** @class */ (function () {
+    function CryptoOps(logger) {
+        this.logger = logger;
+        // Browser crypto needs to be validated first before any other classes can be set.
+        this.browserCrypto = new BrowserCrypto(this.logger);
+        this.b64Encode = new Base64Encode();
+        this.b64Decode = new Base64Decode();
+        this.guidGenerator = new GuidGenerator(this.browserCrypto);
+        this.pkceGenerator = new PkceGenerator(this.browserCrypto);
+        this.cache = {
+            asymmetricKeys: new AsyncMemoryStorage(this.logger),
+            symmetricKeys: new AsyncMemoryStorage(this.logger)
+        };
+    }
+    /**
+     * Creates a new random GUID - used to populate state and nonce.
      * @returns string (GUID)
      */
     CryptoOps.prototype.createNewGuid = function () {
@@ -8191,7 +8807,7 @@ var CryptoOps = /** @class */ (function () {
      */
     CryptoOps.prototype.getPublicKeyThumbprint = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var keyPair, publicKeyJwk, pubKeyThumprintObj, publicJwkString, publicJwkBuffer, publicJwkHash, privateKeyJwk, unextractablePrivateKey;
+            var keyPair, publicKeyJwk, pubKeyThumprintObj, publicJwkString, publicJwkHash, privateKeyJwk, unextractablePrivateKey;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.browserCrypto.generateKeyPair(CryptoOps.EXTRACTABLE, CryptoOps.POP_KEY_USAGES)];
@@ -8206,10 +8822,9 @@ var CryptoOps = /** @class */ (function () {
                             n: publicKeyJwk.n
                         };
                         publicJwkString = BrowserCrypto.getJwkString(pubKeyThumprintObj);
-                        return [4 /*yield*/, this.browserCrypto.sha256Digest(publicJwkString)];
+                        return [4 /*yield*/, this.hashString(publicJwkString)];
                     case 3:
-                        publicJwkBuffer = _a.sent();
-                        publicJwkHash = this.b64Encode.urlEncodeArr(new Uint8Array(publicJwkBuffer));
+                        publicJwkHash = _a.sent();
                         return [4 /*yield*/, this.browserCrypto.exportJwk(keyPair.privateKey)];
                     case 4:
                         privateKeyJwk = _a.sent();
@@ -8217,7 +8832,7 @@ var CryptoOps = /** @class */ (function () {
                     case 5:
                         unextractablePrivateKey = _a.sent();
                         // Store Keypair data in keystore
-                        return [4 /*yield*/, this.cache.put(publicJwkHash, {
+                        return [4 /*yield*/, this.cache.asymmetricKeys.setItem(publicJwkHash, {
                                 privateKey: unextractablePrivateKey,
                                 publicKey: keyPair.publicKey,
                                 requestMethod: request.resourceRequestMethod,
@@ -8237,8 +8852,17 @@ var CryptoOps = /** @class */ (function () {
      */
     CryptoOps.prototype.removeTokenBindingKey = function (kid) {
         return __awaiter$1(this, void 0, void 0, function () {
+            var keyFound;
             return __generator$1(this, function (_a) {
-                return [2 /*return*/, this.cache.delete(kid)];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.cache.asymmetricKeys.removeItem(kid)];
+                    case 1:
+                        _a.sent();
+                        return [4 /*yield*/, this.cache.asymmetricKeys.containsKey(kid)];
+                    case 2:
+                        keyFound = _a.sent();
+                        return [2 /*return*/, !keyFound];
+                }
             });
         });
     };
@@ -8247,8 +8871,22 @@ var CryptoOps = /** @class */ (function () {
      */
     CryptoOps.prototype.clearKeystore = function () {
         return __awaiter$1(this, void 0, void 0, function () {
-            return __generator$1(this, function (_a) {
-                return [2 /*return*/, this.cache.clear()];
+            var dataStoreNames, databaseStorage, _a;
+            return __generator$1(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        dataStoreNames = Object.keys(this.cache);
+                        databaseStorage = this.cache[dataStoreNames[0]];
+                        if (!databaseStorage) return [3 /*break*/, 2];
+                        return [4 /*yield*/, databaseStorage.deleteDatabase()];
+                    case 1:
+                        _a = _b.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        _a = false;
+                        _b.label = 3;
+                    case 3: return [2 /*return*/, _a];
+                }
             });
         });
     };
@@ -8262,7 +8900,7 @@ var CryptoOps = /** @class */ (function () {
             var cachedKeyPair, publicKeyJwk, publicKeyJwkString, header, encodedHeader, encodedPayload, tokenString, tokenBuffer, signatureBuffer, encodedSignature;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.cache.get(kid)];
+                    case 0: return [4 /*yield*/, this.cache.asymmetricKeys.getItem(kid)];
                     case 1:
                         cachedKeyPair = _a.sent();
                         if (!cachedKeyPair) {
@@ -8293,11 +8931,26 @@ var CryptoOps = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Returns the SHA-256 hash of an input string
+     * @param plainText
+     */
+    CryptoOps.prototype.hashString = function (plainText) {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var hashBuffer, hashBytes;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.browserCrypto.sha256Digest(plainText)];
+                    case 1:
+                        hashBuffer = _a.sent();
+                        hashBytes = new Uint8Array(hashBuffer);
+                        return [2 /*return*/, this.b64Encode.urlEncodeArr(hashBytes)];
+                }
+            });
+        });
+    };
     CryptoOps.POP_KEY_USAGES = ["sign", "verify"];
     CryptoOps.EXTRACTABLE = true;
-    CryptoOps.DB_VERSION = 1;
-    CryptoOps.DB_NAME = "msal.db";
-    CryptoOps.TABLE_NAME = CryptoOps.DB_NAME + ".keys";
     return CryptoOps;
 }());
 
@@ -8427,39 +9080,6 @@ var BrowserStorage = /** @class */ (function () {
     return BrowserStorage;
 }());
 
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-var MemoryStorage = /** @class */ (function () {
-    function MemoryStorage() {
-        this.cache = new Map();
-    }
-    MemoryStorage.prototype.getItem = function (key) {
-        return this.cache.get(key) || null;
-    };
-    MemoryStorage.prototype.setItem = function (key, value) {
-        this.cache.set(key, value);
-    };
-    MemoryStorage.prototype.removeItem = function (key) {
-        this.cache.delete(key);
-    };
-    MemoryStorage.prototype.getKeys = function () {
-        var cacheKeys = [];
-        this.cache.forEach(function (value, key) {
-            cacheKeys.push(key);
-        });
-        return cacheKeys;
-    };
-    MemoryStorage.prototype.containsKey = function (key) {
-        return this.cache.has(key);
-    };
-    MemoryStorage.prototype.clear = function () {
-        this.cache.clear();
-    };
-    return MemoryStorage;
-}());
-
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -9118,7 +9738,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
      */
     BrowserCacheManager.prototype.generateAuthorityKey = function (stateString) {
         var stateId = ProtocolUtils.parseRequestState(this.cryptoImpl, stateString).libraryState.id;
-        return this.generateCacheKey(TemporaryCacheKeys.AUTHORITY + "." + stateId);
+        return this.generateCacheKey(exports.TemporaryCacheKeys.AUTHORITY + "." + stateId);
     };
     /**
      * Create Nonce key to cache nonce
@@ -9126,7 +9746,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
      */
     BrowserCacheManager.prototype.generateNonceKey = function (stateString) {
         var stateId = ProtocolUtils.parseRequestState(this.cryptoImpl, stateString).libraryState.id;
-        return this.generateCacheKey(TemporaryCacheKeys.NONCE_IDTOKEN + "." + stateId);
+        return this.generateCacheKey(exports.TemporaryCacheKeys.NONCE_IDTOKEN + "." + stateId);
     };
     /**
      * Creates full cache key for the request state
@@ -9135,7 +9755,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
     BrowserCacheManager.prototype.generateStateKey = function (stateString) {
         // Use the library state id to key temp storage for uniqueness for multiple concurrent requests
         var stateId = ProtocolUtils.parseRequestState(this.cryptoImpl, stateString).libraryState.id;
-        return this.generateCacheKey(TemporaryCacheKeys.REQUEST_STATE + "." + stateId);
+        return this.generateCacheKey(exports.TemporaryCacheKeys.REQUEST_STATE + "." + stateId);
     };
     /**
      * Gets the cached authority based on the cached state. Returns empty if no cached state found.
@@ -9170,14 +9790,14 @@ var BrowserCacheManager = /** @class */ (function (_super) {
                 credential: account.homeAccountId,
                 type: CcsCredentialType.HOME_ACCOUNT_ID
             };
-            this.setTemporaryCache(TemporaryCacheKeys.CCS_CREDENTIAL, JSON.stringify(ccsCredential), true);
+            this.setTemporaryCache(exports.TemporaryCacheKeys.CCS_CREDENTIAL, JSON.stringify(ccsCredential), true);
         }
         else if (!StringUtils.isEmpty(loginHint)) {
             var ccsCredential = {
                 credential: loginHint,
                 type: CcsCredentialType.UPN
             };
-            this.setTemporaryCache(TemporaryCacheKeys.CCS_CREDENTIAL, JSON.stringify(ccsCredential), true);
+            this.setTemporaryCache(exports.TemporaryCacheKeys.CCS_CREDENTIAL, JSON.stringify(ccsCredential), true);
         }
     };
     /**
@@ -9201,11 +9821,11 @@ var BrowserCacheManager = /** @class */ (function (_super) {
             this.removeItem(this.generateNonceKey(state));
             this.removeItem(this.generateAuthorityKey(state));
         }
-        this.removeItem(this.generateCacheKey(TemporaryCacheKeys.REQUEST_PARAMS));
-        this.removeItem(this.generateCacheKey(TemporaryCacheKeys.ORIGIN_URI));
-        this.removeItem(this.generateCacheKey(TemporaryCacheKeys.URL_HASH));
-        this.removeItem(this.generateCacheKey(TemporaryCacheKeys.CORRELATION_ID));
-        this.removeItem(this.generateCacheKey(TemporaryCacheKeys.CCS_CREDENTIAL));
+        this.removeItem(this.generateCacheKey(exports.TemporaryCacheKeys.REQUEST_PARAMS));
+        this.removeItem(this.generateCacheKey(exports.TemporaryCacheKeys.ORIGIN_URI));
+        this.removeItem(this.generateCacheKey(exports.TemporaryCacheKeys.URL_HASH));
+        this.removeItem(this.generateCacheKey(exports.TemporaryCacheKeys.CORRELATION_ID));
+        this.removeItem(this.generateCacheKey(exports.TemporaryCacheKeys.CCS_CREDENTIAL));
         this.setInteractionInProgress(false);
     };
     /**
@@ -9234,7 +9854,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
         // Loop through all keys to find state key
         this.getKeys().forEach(function (key) {
             // If this key is not the state key, move on
-            if (key.indexOf(TemporaryCacheKeys.REQUEST_STATE) === -1) {
+            if (key.indexOf(exports.TemporaryCacheKeys.REQUEST_STATE) === -1) {
                 return;
             }
             // Retrieve state value, return if not a valid value
@@ -9250,11 +9870,12 @@ var BrowserCacheManager = /** @class */ (function (_super) {
             }
         });
         this.clearMsalCookies();
+        this.setInteractionInProgress(false);
     };
     BrowserCacheManager.prototype.cacheCodeRequest = function (authCodeRequest, browserCrypto) {
         this.logger.trace("BrowserCacheManager.cacheCodeRequest called");
         var encodedValue = browserCrypto.base64Encode(JSON.stringify(authCodeRequest));
-        this.setTemporaryCache(TemporaryCacheKeys.REQUEST_PARAMS, encodedValue, true);
+        this.setTemporaryCache(exports.TemporaryCacheKeys.REQUEST_PARAMS, encodedValue, true);
     };
     /**
      * Gets the token exchange parameters from the cache. Throws an error if nothing is found.
@@ -9262,7 +9883,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
     BrowserCacheManager.prototype.getCachedRequest = function (state, browserCrypto) {
         this.logger.trace("BrowserCacheManager.getCachedRequest called");
         // Get token request from cache and parse as TokenExchangeParameters.
-        var encodedTokenRequest = this.getTemporaryCache(TemporaryCacheKeys.REQUEST_PARAMS, true);
+        var encodedTokenRequest = this.getTemporaryCache(exports.TemporaryCacheKeys.REQUEST_PARAMS, true);
         if (!encodedTokenRequest) {
             throw BrowserAuthError.createNoTokenRequestCacheError();
         }
@@ -9270,7 +9891,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
         if (!parsedRequest) {
             throw BrowserAuthError.createUnableToParseTokenRequestCacheError();
         }
-        this.removeItem(this.generateCacheKey(TemporaryCacheKeys.REQUEST_PARAMS));
+        this.removeItem(this.generateCacheKey(exports.TemporaryCacheKeys.REQUEST_PARAMS));
         // Get cached authority and use if no authority is cached with request.
         if (StringUtils.isEmpty(parsedRequest.authority)) {
             var authorityCacheKey = this.generateAuthorityKey(state);
@@ -9292,18 +9913,22 @@ var BrowserCacheManager = /** @class */ (function (_super) {
         }
     };
     BrowserCacheManager.prototype.getInteractionInProgress = function () {
-        var key = Constants.CACHE_PREFIX + "." + TemporaryCacheKeys.INTERACTION_STATUS_KEY;
+        var key = Constants.CACHE_PREFIX + "." + exports.TemporaryCacheKeys.INTERACTION_STATUS_KEY;
         return this.getTemporaryCache(key, false);
     };
     BrowserCacheManager.prototype.setInteractionInProgress = function (inProgress) {
-        var clientId = this.getInteractionInProgress();
         // Ensure we don't overwrite interaction in progress for a different clientId
-        var key = Constants.CACHE_PREFIX + "." + TemporaryCacheKeys.INTERACTION_STATUS_KEY;
-        if (inProgress && !clientId) {
-            // No interaction is in progress
-            this.setTemporaryCache(key, this.clientId, false);
+        var key = Constants.CACHE_PREFIX + "." + exports.TemporaryCacheKeys.INTERACTION_STATUS_KEY;
+        if (inProgress) {
+            if (this.getInteractionInProgress()) {
+                throw BrowserAuthError.createInteractionInProgressError();
+            }
+            else {
+                // No interaction is in progress
+                this.setTemporaryCache(key, this.clientId, false);
+            }
         }
-        else if (!inProgress && clientId === this.clientId) {
+        else if (!inProgress && this.getInteractionInProgress() === this.clientId) {
             this.removeItem(key);
         }
     };
@@ -9340,6 +9965,25 @@ var BrowserCacheManager = /** @class */ (function (_super) {
         }
         return null;
     };
+    /**
+     * Updates a credential's cache key if the current cache key is outdated
+     */
+    BrowserCacheManager.prototype.updateCredentialCacheKey = function (currentCacheKey, credential) {
+        var updatedCacheKey = credential.generateCredentialKey();
+        if (currentCacheKey !== updatedCacheKey) {
+            var cacheItem = this.getItem(currentCacheKey);
+            if (cacheItem) {
+                this.removeItem(currentCacheKey);
+                this.setItem(updatedCacheKey, cacheItem);
+                this.logger.verbose("Updated an outdated " + credential.credentialType + " cache key");
+                return updatedCacheKey;
+            }
+            else {
+                this.logger.error("Attempted to update an outdated " + credential.credentialType + " cache key but no item matching the outdated key was found in storage");
+            }
+        }
+        return currentCacheKey;
+    };
     return BrowserCacheManager;
 }(CacheManager));
 var DEFAULT_BROWSER_CACHE_MANAGER = function (clientId, logger) {
@@ -9811,7 +10455,11 @@ function buildConfiguration(_a, isBrowserEnvironment) {
         postLogoutRedirectUri: "",
         navigateToLoginRequestUrl: true,
         clientCapabilities: [],
-        protocolMode: exports.ProtocolMode.AAD
+        protocolMode: exports.ProtocolMode.AAD,
+        azureCloudOptions: {
+            azureCloudInstance: exports.AzureCloudInstance.None,
+            tenant: ""
+        },
     };
     // Default cache options for browser
     var DEFAULT_CACHE_OPTIONS = {
@@ -9840,7 +10488,7 @@ function buildConfiguration(_a, isBrowserEnvironment) {
 
 /* eslint-disable header/header */
 var name = "@azure/msal-browser";
-var version = "2.18.0";
+var version = "2.22.0";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -9860,6 +10508,9 @@ exports.EventType = void 0;
     EventType["SSO_SILENT_START"] = "msal:ssoSilentStart";
     EventType["SSO_SILENT_SUCCESS"] = "msal:ssoSilentSuccess";
     EventType["SSO_SILENT_FAILURE"] = "msal:ssoSilentFailure";
+    EventType["ACQUIRE_TOKEN_BY_CODE_START"] = "msal:acquireTokenByCodeStart";
+    EventType["ACQUIRE_TOKEN_BY_CODE_SUCCESS"] = "msal:acquireTokenByCodeSuccess";
+    EventType["ACQUIRE_TOKEN_BY_CODE_FAILURE"] = "msal:acquireTokenByCodeFailure";
     EventType["HANDLE_REDIRECT_START"] = "msal:handleRedirectStart";
     EventType["HANDLE_REDIRECT_END"] = "msal:handleRedirectEnd";
     EventType["POPUP_OPENED"] = "msal:popupOpened";
@@ -10054,20 +10705,43 @@ var BaseInteractionClient = /** @class */ (function () {
      * @param request
      */
     BaseInteractionClient.prototype.initializeBaseRequest = function (request) {
-        this.logger.verbose("Initializing BaseAuthRequest");
-        var authority = request.authority || this.config.auth.authority;
-        var scopes = __spread(((request && request.scopes) || []));
-        // Set authenticationScheme to BEARER if not explicitly set in the request
-        if (!request.authenticationScheme) {
-            request.authenticationScheme = exports.AuthenticationScheme.BEARER;
-            this.logger.verbose("Authentication Scheme wasn't explicitly set in request, defaulting to \"Bearer\" request");
-        }
-        else {
-            this.logger.verbose("Authentication Scheme set to \"" + request.authenticationScheme + "\" as configured in Auth request");
-        }
-        var validatedRequest = __assign$1(__assign$1({}, request), { correlationId: this.correlationId, authority: authority,
-            scopes: scopes });
-        return validatedRequest;
+        return __awaiter$1(this, void 0, void 0, function () {
+            var authority, scopes, _a, validatedRequest;
+            return __generator$1(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        this.logger.verbose("Initializing BaseAuthRequest");
+                        authority = request.authority || this.config.auth.authority;
+                        scopes = __spread(((request && request.scopes) || []));
+                        // Set authenticationScheme to BEARER if not explicitly set in the request
+                        if (!request.authenticationScheme) {
+                            request.authenticationScheme = exports.AuthenticationScheme.BEARER;
+                            this.logger.verbose("Authentication Scheme wasn't explicitly set in request, defaulting to \"Bearer\" request");
+                        }
+                        else {
+                            if (request.authenticationScheme === exports.AuthenticationScheme.SSH) {
+                                if (!request.sshJwk) {
+                                    throw ClientConfigurationError.createMissingSshJwkError();
+                                }
+                                if (!request.sshKid) {
+                                    throw ClientConfigurationError.createMissingSshKidError();
+                                }
+                            }
+                            this.logger.verbose("Authentication Scheme set to \"" + request.authenticationScheme + "\" as configured in Auth request");
+                        }
+                        if (!(request.claims && !StringUtils.isEmpty(request.claims))) return [3 /*break*/, 2];
+                        _a = request;
+                        return [4 /*yield*/, this.browserCrypto.hashString(request.claims)];
+                    case 1:
+                        _a.requestedClaimsHash = _b.sent();
+                        _b.label = 2;
+                    case 2:
+                        validatedRequest = __assign$1(__assign$1({}, request), { correlationId: this.correlationId, authority: authority,
+                            scopes: scopes });
+                        return [2 /*return*/, validatedRequest];
+                }
+            });
+        });
     };
     /**
      *
@@ -10144,11 +10818,32 @@ var StandardInteractionClient = /** @class */ (function (_super) {
      */
     StandardInteractionClient.prototype.initializeLogoutRequest = function (logoutRequest) {
         this.logger.verbose("initializeLogoutRequest called", logoutRequest === null || logoutRequest === void 0 ? void 0 : logoutRequest.correlationId);
-        // Check if interaction is in progress. Throw error if true.
-        if (this.browserStorage.isInteractionInProgress()) {
-            throw BrowserAuthError.createInteractionInProgressError();
+        var validLogoutRequest = __assign$1({ correlationId: this.browserCrypto.createNewGuid() }, logoutRequest);
+        /**
+         * Set logout_hint to be login_hint from ID Token Claims if present
+         * and logoutHint attribute wasn't manually set in logout request
+         */
+        if (logoutRequest) {
+            // If logoutHint isn't set and an account was passed in, try to extract logoutHint from ID Token Claims
+            if (!logoutRequest.logoutHint) {
+                if (logoutRequest.account) {
+                    var logoutHint = this.getLogoutHintFromIdTokenClaims(logoutRequest.account);
+                    if (logoutHint) {
+                        this.logger.verbose("Setting logoutHint to login_hint ID Token Claim value for the account provided");
+                        validLogoutRequest.logoutHint = logoutHint;
+                    }
+                }
+                else {
+                    this.logger.verbose("logoutHint was not set and account was not passed into logout request, logoutHint will not be set");
+                }
+            }
+            else {
+                this.logger.verbose("logoutHint has already been set in logoutRequest");
+            }
+        }
+        else {
+            this.logger.verbose("logoutHint will not be set since no logout request was configured");
         }
-        var validLogoutRequest = __assign$1({ correlationId: this.browserCrypto.createNewGuid() }, logoutRequest);
         /*
          * Only set redirect uri if logout request isn't provided or the set uri isn't null.
          * Otherwise, use passed uri, config, or current page.
@@ -10175,17 +10870,37 @@ var StandardInteractionClient = /** @class */ (function (_super) {
         }
         return validLogoutRequest;
     };
+    /**
+     * Parses login_hint ID Token Claim out of AccountInfo object to be used as
+     * logout_hint in end session request.
+     * @param account
+     */
+    StandardInteractionClient.prototype.getLogoutHintFromIdTokenClaims = function (account) {
+        var idTokenClaims = account.idTokenClaims;
+        if (idTokenClaims) {
+            if (idTokenClaims.login_hint) {
+                return idTokenClaims.login_hint;
+            }
+            else {
+                this.logger.verbose("The ID Token Claims tied to the provided account do not contain a login_hint claim, logoutHint will not be added to logout request");
+            }
+        }
+        else {
+            this.logger.verbose("The provided account does not contain ID Token Claims, logoutHint will not be added to logout request");
+        }
+        return null;
+    };
     /**
      * Creates an Authorization Code Client with the given authority, or the default authority.
      * @param serverTelemetryManager
      * @param authorityUrl
      */
-    StandardInteractionClient.prototype.createAuthCodeClient = function (serverTelemetryManager, authorityUrl) {
+    StandardInteractionClient.prototype.createAuthCodeClient = function (serverTelemetryManager, authorityUrl, requestAzureCloudOptions) {
         return __awaiter$1(this, void 0, void 0, function () {
             var clientConfig;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl)];
+                    case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl, requestAzureCloudOptions)];
                     case 1:
                         clientConfig = _a.sent();
                         return [2 /*return*/, new AuthorizationCodeClient(clientConfig)];
@@ -10199,14 +10914,14 @@ var StandardInteractionClient = /** @class */ (function (_super) {
      * @param requestAuthority
      * @param requestCorrelationId
      */
-    StandardInteractionClient.prototype.getClientConfiguration = function (serverTelemetryManager, requestAuthority) {
+    StandardInteractionClient.prototype.getClientConfiguration = function (serverTelemetryManager, requestAuthority, requestAzureCloudOptions) {
         return __awaiter$1(this, void 0, void 0, function () {
             var discoveredAuthority;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.logger.verbose("getClientConfiguration called");
-                        return [4 /*yield*/, this.getDiscoveredAuthority(requestAuthority)];
+                        return [4 /*yield*/, this.getDiscoveredAuthority(requestAuthority, requestAzureCloudOptions)];
                     case 1:
                         discoveredAuthority = _a.sent();
                         return [2 /*return*/, {
@@ -10266,9 +10981,9 @@ var StandardInteractionClient = /** @class */ (function (_super) {
      * @param requestAuthority
      * @param requestCorrelationId
      */
-    StandardInteractionClient.prototype.getDiscoveredAuthority = function (requestAuthority) {
+    StandardInteractionClient.prototype.getDiscoveredAuthority = function (requestAuthority, requestAzureCloudOptions) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var authorityOptions;
+            var authorityOptions, userAuthority, builtAuthority;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -10277,63 +10992,55 @@ var StandardInteractionClient = /** @class */ (function (_super) {
                             protocolMode: this.config.auth.protocolMode,
                             knownAuthorities: this.config.auth.knownAuthorities,
                             cloudDiscoveryMetadata: this.config.auth.cloudDiscoveryMetadata,
-                            authorityMetadata: this.config.auth.authorityMetadata
+                            authorityMetadata: this.config.auth.authorityMetadata,
                         };
-                        if (!requestAuthority) return [3 /*break*/, 2];
-                        this.logger.verbose("Creating discovered authority with request authority");
-                        return [4 /*yield*/, AuthorityFactory.createDiscoveredInstance(requestAuthority, this.config.system.networkClient, this.browserStorage, authorityOptions)];
-                    case 1: return [2 /*return*/, _a.sent()];
-                    case 2:
+                        userAuthority = requestAuthority ? requestAuthority : this.config.auth.authority;
+                        builtAuthority = Authority.generateAuthority(userAuthority, requestAzureCloudOptions || this.config.auth.azureCloudOptions);
                         this.logger.verbose("Creating discovered authority with configured authority");
-                        return [4 /*yield*/, AuthorityFactory.createDiscoveredInstance(this.config.auth.authority, this.config.system.networkClient, this.browserStorage, authorityOptions)];
-                    case 3: return [2 /*return*/, _a.sent()];
+                        return [4 /*yield*/, AuthorityFactory.createDiscoveredInstance(builtAuthority, this.config.system.networkClient, this.browserStorage, authorityOptions)];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
-    /**
-     * Helper to validate app environment before making a request.
-     * @param request
-     * @param interactionType
-     */
-    StandardInteractionClient.prototype.preflightInteractiveRequest = function (request, interactionType) {
-        this.logger.verbose("preflightInteractiveRequest called, validating app environment", request === null || request === void 0 ? void 0 : request.correlationId);
-        // block the reload if it occurred inside a hidden iframe
-        BrowserUtils.blockReloadInHiddenIframes();
-        // Check if interaction is in progress. Throw error if true.
-        if (this.browserStorage.isInteractionInProgress(false)) {
-            throw BrowserAuthError.createInteractionInProgressError();
-        }
-        return this.initializeAuthorizationRequest(request, interactionType);
-    };
     /**
      * Helper to initialize required request parameters for interactive APIs and ssoSilent()
      * @param request
      * @param interactionType
      */
     StandardInteractionClient.prototype.initializeAuthorizationRequest = function (request, interactionType) {
-        this.logger.verbose("initializeAuthorizationRequest called");
-        var redirectUri = this.getRedirectUri(request.redirectUri);
-        var browserState = {
-            interactionType: interactionType
-        };
-        var state = ProtocolUtils.setRequestState(this.browserCrypto, (request && request.state) || "", browserState);
-        var validatedRequest = __assign$1(__assign$1({}, this.initializeBaseRequest(request)), { redirectUri: redirectUri, state: state, nonce: request.nonce || this.browserCrypto.createNewGuid(), responseMode: ResponseMode.FRAGMENT });
-        var account = request.account || this.browserStorage.getActiveAccount();
-        if (account) {
-            this.logger.verbose("Setting validated request account");
-            this.logger.verbosePii("Setting validated request account: " + account);
-            validatedRequest.account = account;
-        }
-        // Check for ADAL/MSAL v1 SSO
-        if (StringUtils.isEmpty(validatedRequest.loginHint) && !account) {
-            var legacyLoginHint = this.browserStorage.getLegacyLoginHint();
-            if (legacyLoginHint) {
-                validatedRequest.loginHint = legacyLoginHint;
-            }
-        }
-        this.browserStorage.updateCacheEntries(validatedRequest.state, validatedRequest.nonce, validatedRequest.authority, validatedRequest.loginHint || "", validatedRequest.account || null);
-        return validatedRequest;
+        return __awaiter$1(this, void 0, void 0, function () {
+            var redirectUri, browserState, state, validatedRequest, _a, account, legacyLoginHint;
+            return __generator$1(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        this.logger.verbose("initializeAuthorizationRequest called");
+                        redirectUri = this.getRedirectUri(request.redirectUri);
+                        browserState = {
+                            interactionType: interactionType
+                        };
+                        state = ProtocolUtils.setRequestState(this.browserCrypto, (request && request.state) || Constants.EMPTY_STRING, browserState);
+                        _a = [{}];
+                        return [4 /*yield*/, this.initializeBaseRequest(request)];
+                    case 1:
+                        validatedRequest = __assign$1.apply(void 0, [__assign$1.apply(void 0, _a.concat([_b.sent()])), { redirectUri: redirectUri, state: state, nonce: request.nonce || this.browserCrypto.createNewGuid(), responseMode: ResponseMode.FRAGMENT }]);
+                        account = request.account || this.browserStorage.getActiveAccount();
+                        if (account) {
+                            this.logger.verbose("Setting validated request account");
+                            this.logger.verbosePii("Setting validated request account: " + account);
+                            validatedRequest.account = account;
+                        }
+                        // Check for ADAL/MSAL v1 SSO
+                        if (StringUtils.isEmpty(validatedRequest.loginHint) && !account) {
+                            legacyLoginHint = this.browserStorage.getLegacyLoginHint();
+                            if (legacyLoginHint) {
+                                validatedRequest.loginHint = legacyLoginHint;
+                            }
+                        }
+                        return [2 /*return*/, validatedRequest];
+                }
+            });
+        });
     };
     return StandardInteractionClient;
 }(BaseInteractionClient));
@@ -10500,8 +11207,8 @@ var PopupUtils = /** @class */ (function () {
      * @param clientId
      * @param request
      */
-    PopupUtils.generatePopupName = function (clientId, request) {
-        return BrowserConstants.POPUP_NAME_PREFIX + "." + clientId + "." + request.scopes.join("-") + "." + request.authority + "." + request.correlationId;
+    PopupUtils.generatePopupName = function (clientId, scopes, authority, correlationId) {
+        return BrowserConstants.POPUP_NAME_PREFIX + "." + clientId + "." + scopes.join("-") + "." + authority + "." + correlationId;
     };
     /**
      * Generates the name for the popup based on the client id and request for logouts
@@ -10533,23 +11240,46 @@ var InteractionHandler = /** @class */ (function () {
      * Function to handle response parameters from hash.
      * @param locationHash
      */
-    InteractionHandler.prototype.handleCodeResponse = function (locationHash, state, authority, networkModule) {
+    InteractionHandler.prototype.handleCodeResponseFromHash = function (locationHash, state, authority, networkModule) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var stateKey, requestState, authCodeResponse, nonceKey, cachedNonce, cachedCcsCred, tokenResponse;
+            var stateKey, requestState, authCodeResponse;
+            return __generator$1(this, function (_a) {
+                this.browserRequestLogger.verbose("InteractionHandler.handleCodeResponse called");
+                // Check that location hash isn't empty.
+                if (StringUtils.isEmpty(locationHash)) {
+                    throw BrowserAuthError.createEmptyHashError(locationHash);
+                }
+                stateKey = this.browserStorage.generateStateKey(state);
+                requestState = this.browserStorage.getTemporaryCache(stateKey);
+                if (!requestState) {
+                    throw ClientAuthError.createStateNotFoundError("Cached State");
+                }
+                authCodeResponse = this.authModule.handleFragmentResponse(locationHash, requestState);
+                return [2 /*return*/, this.handleCodeResponseFromServer(authCodeResponse, state, authority, networkModule)];
+            });
+        });
+    };
+    /**
+     * Process auth code response from AAD
+     * @param authCodeResponse
+     * @param state
+     * @param authority
+     * @param networkModule
+     * @returns
+     */
+    InteractionHandler.prototype.handleCodeResponseFromServer = function (authCodeResponse, state, authority, networkModule, validateNonce) {
+        if (validateNonce === void 0) { validateNonce = true; }
+        return __awaiter$1(this, void 0, void 0, function () {
+            var stateKey, requestState, nonceKey, cachedNonce, cachedCcsCred, tokenResponse;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.browserRequestLogger.verbose("InteractionHandler.handleCodeResponse called");
-                        // Check that location hash isn't empty.
-                        if (StringUtils.isEmpty(locationHash)) {
-                            throw BrowserAuthError.createEmptyHashError(locationHash);
-                        }
+                        this.browserRequestLogger.trace("InteractionHandler.handleCodeResponseFromServer called");
                         stateKey = this.browserStorage.generateStateKey(state);
                         requestState = this.browserStorage.getTemporaryCache(stateKey);
                         if (!requestState) {
                             throw ClientAuthError.createStateNotFoundError("Cached State");
                         }
-                        authCodeResponse = this.authModule.handleFragmentResponse(locationHash, requestState);
                         nonceKey = this.browserStorage.generateNonceKey(requestState);
                         cachedNonce = this.browserStorage.getTemporaryCache(nonceKey);
                         // Assign code to request
@@ -10560,7 +11290,10 @@ var InteractionHandler = /** @class */ (function () {
                         _a.sent();
                         _a.label = 2;
                     case 2:
-                        authCodeResponse.nonce = cachedNonce || undefined;
+                        // Nonce validation not needed when redirect not involved (e.g. hybrid spa, renewing token via rt)
+                        if (validateNonce) {
+                            authCodeResponse.nonce = cachedNonce || undefined;
+                        }
                         authCodeResponse.state = requestState;
                         // Add CCS parameters if available
                         if (authCodeResponse.client_info) {
@@ -10608,7 +11341,7 @@ var InteractionHandler = /** @class */ (function () {
      */
     InteractionHandler.prototype.checkCcsCredentials = function () {
         // Look up ccs credential in temp cache
-        var cachedCcsCred = this.browserStorage.getTemporaryCache(TemporaryCacheKeys.CCS_CREDENTIAL, true);
+        var cachedCcsCred = this.browserStorage.getTemporaryCache(exports.TemporaryCacheKeys.CCS_CREDENTIAL, true);
         if (cachedCcsCred) {
             try {
                 return JSON.parse(cachedCcsCred);
@@ -10646,8 +11379,6 @@ var PopupHandler = /** @class */ (function (_super) {
     PopupHandler.prototype.initiateAuthRequest = function (requestUrl, params) {
         // Check that request url is not empty.
         if (!StringUtils.isEmpty(requestUrl)) {
-            // Set interaction status in the library.
-            this.browserStorage.setInteractionInProgress(true);
             this.browserRequestLogger.infoPii("Navigate to: " + requestUrl);
             // Open the popup window to requestUrl.
             return this.popupUtils.openPopup(requestUrl, params);
@@ -10698,20 +11429,19 @@ var PopupClient = /** @class */ (function (_super) {
      */
     PopupClient.prototype.acquireToken = function (request) {
         try {
-            var validRequest = this.preflightInteractiveRequest(request, exports.InteractionType.Popup);
-            var popupName = PopupUtils.generatePopupName(this.config.auth.clientId, validRequest);
+            var popupName = PopupUtils.generatePopupName(this.config.auth.clientId, request.scopes || OIDC_DEFAULT_SCOPES, request.authority || this.config.auth.authority, this.correlationId);
             var popupWindowAttributes = request.popupWindowAttributes || {};
             // asyncPopups flag is true. Acquires token without first opening popup. Popup will be opened later asynchronously.
             if (this.config.system.asyncPopups) {
                 this.logger.verbose("asyncPopups set to true, acquiring token");
                 // Passes on popup position and dimensions if in request
-                return this.acquireTokenPopupAsync(validRequest, popupName, popupWindowAttributes);
+                return this.acquireTokenPopupAsync(request, popupName, popupWindowAttributes);
             }
             else {
                 // asyncPopups flag is set to false. Opens popup before acquiring token.
                 this.logger.verbose("asyncPopup set to false, opening popup before acquiring token");
                 var popup = PopupUtils.openSizedPopup("about:blank", popupName, popupWindowAttributes, this.logger);
-                return this.acquireTokenPopupAsync(validRequest, popupName, popupWindowAttributes, popup);
+                return this.acquireTokenPopupAsync(request, popupName, popupWindowAttributes, popup);
             }
         }
         catch (e) {
@@ -10757,26 +11487,30 @@ var PopupClient = /** @class */ (function (_super) {
      *
      * @returns A promise that is fulfilled when this function has completed, or rejected if an error was raised.
      */
-    PopupClient.prototype.acquireTokenPopupAsync = function (validRequest, popupName, popupWindowAttributes, popup) {
+    PopupClient.prototype.acquireTokenPopupAsync = function (request, popupName, popupWindowAttributes, popup) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var serverTelemetryManager, authCodeRequest, authClient, navigateUrl, interactionHandler, popupParameters, popupWindow, hash, state, result, e_1;
+            var serverTelemetryManager, validRequest, authCodeRequest, authClient, navigateUrl, interactionHandler, popupParameters, popupWindow, hash, state, result, e_1;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.logger.verbose("acquireTokenPopupAsync called");
                         serverTelemetryManager = this.initializeServerTelemetryManager(exports.ApiId.acquireTokenPopup);
-                        _a.label = 1;
+                        return [4 /*yield*/, this.initializeAuthorizationRequest(request, exports.InteractionType.Popup)];
                     case 1:
-                        _a.trys.push([1, 7, , 8]);
-                        return [4 /*yield*/, this.initializeAuthorizationCodeRequest(validRequest)];
+                        validRequest = _a.sent();
+                        this.browserStorage.updateCacheEntries(validRequest.state, validRequest.nonce, validRequest.authority, validRequest.loginHint || "", validRequest.account || null);
+                        _a.label = 2;
                     case 2:
-                        authCodeRequest = _a.sent();
-                        return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, validRequest.authority)];
+                        _a.trys.push([2, 8, , 9]);
+                        return [4 /*yield*/, this.initializeAuthorizationCodeRequest(validRequest)];
                     case 3:
+                        authCodeRequest = _a.sent();
+                        return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, validRequest.authority, validRequest.azureCloudOptions)];
+                    case 4:
                         authClient = _a.sent();
                         this.logger.verbose("Auth code client created");
                         return [4 /*yield*/, authClient.getAuthCodeUrl(validRequest)];
-                    case 4:
+                    case 5:
                         navigateUrl = _a.sent();
                         interactionHandler = new PopupHandler(authClient, this.browserStorage, authCodeRequest, this.logger);
                         popupParameters = {
@@ -10787,16 +11521,16 @@ var PopupClient = /** @class */ (function (_super) {
                         popupWindow = interactionHandler.initiateAuthRequest(navigateUrl, popupParameters);
                         this.eventHandler.emitEvent(exports.EventType.POPUP_OPENED, exports.InteractionType.Popup, { popupWindow: popupWindow }, null);
                         return [4 /*yield*/, interactionHandler.monitorPopupForHash(popupWindow)];
-                    case 5:
+                    case 6:
                         hash = _a.sent();
                         state = this.validateAndExtractStateFromHash(hash, exports.InteractionType.Popup, validRequest.correlationId);
                         // Remove throttle if it exists
                         ThrottlingUtils.removeThrottle(this.browserStorage, this.config.auth.clientId, authCodeRequest);
-                        return [4 /*yield*/, interactionHandler.handleCodeResponse(hash, state, authClient.authority, this.networkClient)];
-                    case 6:
+                        return [4 /*yield*/, interactionHandler.handleCodeResponseFromHash(hash, state, authClient.authority, this.networkClient)];
+                    case 7:
                         result = _a.sent();
                         return [2 /*return*/, result];
-                    case 7:
+                    case 8:
                         e_1 = _a.sent();
                         if (popup) {
                             // Close the synchronous popup if an error is thrown before the window unload event is registered
@@ -10808,7 +11542,7 @@ var PopupClient = /** @class */ (function (_super) {
                         serverTelemetryManager.cacheFailedRequest(e_1);
                         this.browserStorage.cleanRequestByState(validRequest.state);
                         throw e_1;
-                    case 8: return [2 /*return*/];
+                    case 9: return [2 /*return*/];
                 }
             });
         });
@@ -10839,7 +11573,6 @@ var PopupClient = /** @class */ (function (_super) {
                     case 2:
                         // Clear cache on logout
                         _a.sent();
-                        this.browserStorage.setInteractionInProgress(true);
                         return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, requestAuthority)];
                     case 3:
                         authClient = _a.sent();
@@ -10873,7 +11606,7 @@ var PopupClient = /** @class */ (function (_super) {
                             };
                             absoluteUrl = UrlString.getAbsoluteUrl(mainWindowRedirectUri, BrowserUtils.getCurrentUri());
                             this.logger.verbose("Redirecting main window to url specified in the request");
-                            this.logger.verbosePii("Redirecing main window to: " + absoluteUrl);
+                            this.logger.verbosePii("Redirecting main window to: " + absoluteUrl);
                             this.navigationClient.navigateInternal(absoluteUrl, navigationOptions);
                         }
                         else {
@@ -10930,11 +11663,10 @@ var RedirectHandler = /** @class */ (function (_super) {
                         // Cache start page, returns to this page after redirectUri if navigateToLoginRequestUrl is true
                         if (params.redirectStartPage) {
                             this.browserRequestLogger.verbose("RedirectHandler.initiateAuthRequest: redirectStartPage set, caching start page");
-                            this.browserStorage.setTemporaryCache(TemporaryCacheKeys.ORIGIN_URI, params.redirectStartPage, true);
+                            this.browserStorage.setTemporaryCache(exports.TemporaryCacheKeys.ORIGIN_URI, params.redirectStartPage, true);
                         }
                         // Set interaction status in the library.
-                        this.browserStorage.setInteractionInProgress(true);
-                        this.browserStorage.setTemporaryCache(TemporaryCacheKeys.CORRELATION_ID, this.authCodeRequest.correlationId, true);
+                        this.browserStorage.setTemporaryCache(exports.TemporaryCacheKeys.CORRELATION_ID, this.authCodeRequest.correlationId, true);
                         this.browserStorage.cacheCodeRequest(this.authCodeRequest, this.browserCrypto);
                         this.browserRequestLogger.infoPii("RedirectHandler.initiateAuthRequest: Navigate to: " + requestUrl);
                         navigationOptions = {
@@ -10976,7 +11708,7 @@ var RedirectHandler = /** @class */ (function (_super) {
      * Handle authorization code response in the window.
      * @param hash
      */
-    RedirectHandler.prototype.handleCodeResponse = function (locationHash, state, authority, networkModule, clientId) {
+    RedirectHandler.prototype.handleCodeResponseFromHash = function (locationHash, state, authority, networkModule, clientId) {
         return __awaiter$1(this, void 0, void 0, function () {
             var stateKey, requestState, authCodeResponse, nonceKey, cachedNonce, cachedCcsCred, tokenResponse;
             return __generator$1(this, function (_a) {
@@ -11051,22 +11783,24 @@ var RedirectClient = /** @class */ (function (_super) {
             var validRequest, serverTelemetryManager, authCodeRequest, authClient, interactionHandler, navigateUrl, redirectStartPage, e_1;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        validRequest = this.preflightInteractiveRequest(request, exports.InteractionType.Redirect);
-                        serverTelemetryManager = this.initializeServerTelemetryManager(exports.ApiId.acquireTokenRedirect);
-                        _a.label = 1;
+                    case 0: return [4 /*yield*/, this.initializeAuthorizationRequest(request, exports.InteractionType.Redirect)];
                     case 1:
-                        _a.trys.push([1, 6, , 7]);
-                        return [4 /*yield*/, this.initializeAuthorizationCodeRequest(validRequest)];
+                        validRequest = _a.sent();
+                        this.browserStorage.updateCacheEntries(validRequest.state, validRequest.nonce, validRequest.authority, validRequest.loginHint || "", validRequest.account || null);
+                        serverTelemetryManager = this.initializeServerTelemetryManager(exports.ApiId.acquireTokenRedirect);
+                        _a.label = 2;
                     case 2:
-                        authCodeRequest = _a.sent();
-                        return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, validRequest.authority)];
+                        _a.trys.push([2, 7, , 8]);
+                        return [4 /*yield*/, this.initializeAuthorizationCodeRequest(validRequest)];
                     case 3:
+                        authCodeRequest = _a.sent();
+                        return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, validRequest.authority, validRequest.azureCloudOptions)];
+                    case 4:
                         authClient = _a.sent();
                         this.logger.verbose("Auth code client created");
                         interactionHandler = new RedirectHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.browserCrypto);
                         return [4 /*yield*/, authClient.getAuthCodeUrl(validRequest)];
-                    case 4:
+                    case 5:
                         navigateUrl = _a.sent();
                         redirectStartPage = this.getRedirectStartPage(request.redirectStartPage);
                         this.logger.verbosePii("Redirect start page: " + redirectStartPage);
@@ -11076,10 +11810,10 @@ var RedirectClient = /** @class */ (function (_super) {
                                 redirectStartPage: redirectStartPage,
                                 onRedirectNavigate: request.onRedirectNavigate
                             })];
-                    case 5: 
+                    case 6: 
                     // Show the UI once the url has been created. Response will come back in the hash, which will be handled in the handleRedirectCallback function.
                     return [2 /*return*/, _a.sent()];
-                    case 6:
+                    case 7:
                         e_1 = _a.sent();
                         if (e_1 instanceof AuthError) {
                             e_1.setCorrelationId(this.correlationId);
@@ -11087,7 +11821,7 @@ var RedirectClient = /** @class */ (function (_super) {
                         serverTelemetryManager.cacheFailedRequest(e_1);
                         this.browserStorage.cleanRequestByState(validRequest.state);
                         throw e_1;
-                    case 7: return [2 /*return*/];
+                    case 8: return [2 /*return*/];
                 }
             });
         });
@@ -11122,7 +11856,6 @@ var RedirectClient = /** @class */ (function (_super) {
                         state = void 0;
                         try {
                             state = this.validateAndExtractStateFromHash(responseHash, exports.InteractionType.Redirect);
-                            BrowserUtils.clearHash(window);
                             this.logger.verbose("State extracted from hash");
                         }
                         catch (e) {
@@ -11130,7 +11863,7 @@ var RedirectClient = /** @class */ (function (_super) {
                             this.browserStorage.cleanRequestByInteractionType(exports.InteractionType.Redirect);
                             return [2 /*return*/, null];
                         }
-                        loginRequestUrl = this.browserStorage.getTemporaryCache(TemporaryCacheKeys.ORIGIN_URI, true) || "";
+                        loginRequestUrl = this.browserStorage.getTemporaryCache(exports.TemporaryCacheKeys.ORIGIN_URI, true) || "";
                         loginRequestUrlNormalized = UrlString.removeHashFromUrl(loginRequestUrl);
                         currentUrlNormalized = UrlString.removeHashFromUrl(window.location.href);
                         if (!(loginRequestUrlNormalized === currentUrlNormalized && this.config.auth.navigateToLoginRequestUrl)) return [3 /*break*/, 3];
@@ -11149,12 +11882,12 @@ var RedirectClient = /** @class */ (function (_super) {
                         this.logger.verbose("NavigateToLoginRequestUrl set to false, handling hash");
                         return [2 /*return*/, this.handleHash(responseHash, state, serverTelemetryManager)];
                     case 4:
-                        if (!!BrowserUtils.isInIframe()) return [3 /*break*/, 9];
+                        if (!(!BrowserUtils.isInIframe() || this.config.system.allowRedirectInIframe)) return [3 /*break*/, 9];
                         /*
                          * Returned from authority using redirect - need to perform navigation before processing response
                          * Cache the hash to be retrieved after the next redirect
                          */
-                        this.browserStorage.setTemporaryCache(TemporaryCacheKeys.URL_HASH, responseHash, true);
+                        this.browserStorage.setTemporaryCache(exports.TemporaryCacheKeys.URL_HASH, responseHash, true);
                         navigationOptions = {
                             apiId: exports.ApiId.handleRedirectPromise,
                             timeout: this.config.system.redirectNavigationTimeout,
@@ -11164,7 +11897,7 @@ var RedirectClient = /** @class */ (function (_super) {
                         if (!(!loginRequestUrl || loginRequestUrl === "null")) return [3 /*break*/, 6];
                         homepage = BrowserUtils.getHomepage();
                         // Cache the homepage under ORIGIN_URI to ensure cached hash is processed on homepage
-                        this.browserStorage.setTemporaryCache(TemporaryCacheKeys.ORIGIN_URI, homepage, true);
+                        this.browserStorage.setTemporaryCache(exports.TemporaryCacheKeys.ORIGIN_URI, homepage, true);
                         this.logger.warning("Unable to get valid login request url from cache, redirecting to home page");
                         return [4 /*yield*/, this.navigationClient.navigateInternal(homepage, navigationOptions)];
                     case 5:
@@ -11206,12 +11939,13 @@ var RedirectClient = /** @class */ (function (_super) {
         this.logger.verbose("getRedirectResponseHash called");
         // Get current location hash from window or cache.
         var isResponseHash = UrlString.hashContainsKnownProperties(hash);
-        var cachedHash = this.browserStorage.getTemporaryCache(TemporaryCacheKeys.URL_HASH, true);
-        this.browserStorage.removeItem(this.browserStorage.generateCacheKey(TemporaryCacheKeys.URL_HASH));
         if (isResponseHash) {
+            BrowserUtils.clearHash(window);
             this.logger.verbose("Hash contains known properties, returning response hash");
             return hash;
         }
+        var cachedHash = this.browserStorage.getTemporaryCache(exports.TemporaryCacheKeys.URL_HASH, true);
+        this.browserStorage.removeItem(this.browserStorage.generateCacheKey(exports.TemporaryCacheKeys.URL_HASH));
         this.logger.verbose("Hash does not contain known properties, returning cached hash");
         return cachedHash;
     };
@@ -11237,7 +11971,7 @@ var RedirectClient = /** @class */ (function (_super) {
                         authClient = _a.sent();
                         this.logger.verbose("Auth code client created");
                         interactionHandler = new RedirectHandler(authClient, this.browserStorage, cachedRequest, this.logger, this.browserCrypto);
-                        return [4 /*yield*/, interactionHandler.handleCodeResponse(hash, state, authClient.authority, this.networkClient, this.config.auth.clientId)];
+                        return [4 /*yield*/, interactionHandler.handleCodeResponseFromHash(hash, state, authClient.authority, this.networkClient, this.config.auth.clientId)];
                     case 2: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -11503,24 +12237,27 @@ var SilentIframeClient = /** @class */ (function (_super) {
                         if (request.prompt && request.prompt !== PromptValue.NONE) {
                             throw BrowserAuthError.createSilentPromptValueError(request.prompt);
                         }
-                        silentRequest = this.initializeAuthorizationRequest(__assign$1(__assign$1({}, request), { prompt: PromptValue.NONE }), exports.InteractionType.Silent);
-                        serverTelemetryManager = this.initializeServerTelemetryManager(this.apiId);
-                        _a.label = 1;
+                        return [4 /*yield*/, this.initializeAuthorizationRequest(__assign$1(__assign$1({}, request), { prompt: PromptValue.NONE }), exports.InteractionType.Silent)];
                     case 1:
-                        _a.trys.push([1, 6, , 7]);
-                        return [4 /*yield*/, this.initializeAuthorizationCodeRequest(silentRequest)];
+                        silentRequest = _a.sent();
+                        this.browserStorage.updateCacheEntries(silentRequest.state, silentRequest.nonce, silentRequest.authority, silentRequest.loginHint || "", silentRequest.account || null);
+                        serverTelemetryManager = this.initializeServerTelemetryManager(this.apiId);
+                        _a.label = 2;
                     case 2:
-                        authCodeRequest = _a.sent();
-                        return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, silentRequest.authority)];
+                        _a.trys.push([2, 7, , 8]);
+                        return [4 /*yield*/, this.initializeAuthorizationCodeRequest(silentRequest)];
                     case 3:
+                        authCodeRequest = _a.sent();
+                        return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, silentRequest.authority, silentRequest.azureCloudOptions)];
+                    case 4:
                         authClient = _a.sent();
                         this.logger.verbose("Auth code client created");
                         return [4 /*yield*/, authClient.getAuthCodeUrl(silentRequest)];
-                    case 4:
+                    case 5:
                         navigateUrl = _a.sent();
                         return [4 /*yield*/, this.silentTokenHelper(navigateUrl, authCodeRequest, authClient, this.logger)];
-                    case 5: return [2 /*return*/, _a.sent()];
-                    case 6:
+                    case 6: return [2 /*return*/, _a.sent()];
+                    case 7:
                         e_1 = _a.sent();
                         if (e_1 instanceof AuthError) {
                             e_1.setCorrelationId(this.correlationId);
@@ -11528,7 +12265,7 @@ var SilentIframeClient = /** @class */ (function (_super) {
                         serverTelemetryManager.cacheFailedRequest(e_1);
                         this.browserStorage.cleanRequestByState(silentRequest.state);
                         throw e_1;
-                    case 7: return [2 /*return*/];
+                    case 8: return [2 /*return*/];
                 }
             });
         });
@@ -11561,7 +12298,7 @@ var SilentIframeClient = /** @class */ (function (_super) {
                         hash = _a.sent();
                         state = this.validateAndExtractStateFromHash(hash, exports.InteractionType.Silent, authCodeRequest.correlationId);
                         // Handle response from hash string
-                        return [2 /*return*/, silentHandler.handleCodeResponse(hash, state, authClient.authority, this.networkClient)];
+                        return [2 /*return*/, silentHandler.handleCodeResponseFromHash(hash, state, authClient.authority, this.networkClient)];
                 }
             });
         });
@@ -11584,16 +12321,19 @@ var SilentRefreshClient = /** @class */ (function (_super) {
      */
     SilentRefreshClient.prototype.acquireToken = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var silentRequest, serverTelemetryManager, refreshTokenClient;
+            var silentRequest, _a, serverTelemetryManager, refreshTokenClient;
             var _this = this;
-            return __generator$1(this, function (_a) {
-                switch (_a.label) {
+            return __generator$1(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        silentRequest = __assign$1(__assign$1({}, request), this.initializeBaseRequest(request));
-                        serverTelemetryManager = this.initializeServerTelemetryManager(exports.ApiId.acquireTokenSilent_silentFlow);
-                        return [4 /*yield*/, this.createRefreshTokenClient(serverTelemetryManager, silentRequest.authority)];
+                        _a = [__assign$1({}, request)];
+                        return [4 /*yield*/, this.initializeBaseRequest(request)];
                     case 1:
-                        refreshTokenClient = _a.sent();
+                        silentRequest = __assign$1.apply(void 0, _a.concat([_b.sent()]));
+                        serverTelemetryManager = this.initializeServerTelemetryManager(exports.ApiId.acquireTokenSilent_silentFlow);
+                        return [4 /*yield*/, this.createRefreshTokenClient(serverTelemetryManager, silentRequest.authority, silentRequest.azureCloudOptions)];
+                    case 2:
+                        refreshTokenClient = _b.sent();
                         this.logger.verbose("Refresh token client created");
                         // Send request to renew token. Auth module will throw errors if token cannot be renewed.
                         return [2 /*return*/, refreshTokenClient.acquireTokenByRefreshToken(silentRequest).catch(function (e) {
@@ -11619,12 +12359,12 @@ var SilentRefreshClient = /** @class */ (function (_super) {
      * @param serverTelemetryManager
      * @param authorityUrl
      */
-    SilentRefreshClient.prototype.createRefreshTokenClient = function (serverTelemetryManager, authorityUrl) {
+    SilentRefreshClient.prototype.createRefreshTokenClient = function (serverTelemetryManager, authorityUrl, azureCloudOptions) {
         return __awaiter$1(this, void 0, void 0, function () {
             var clientConfig;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl)];
+                    case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl, azureCloudOptions)];
                     case 1:
                         clientConfig = _a.sent();
                         return [2 /*return*/, new RefreshTokenClient(clientConfig)];
@@ -11667,13 +12407,14 @@ var TokenCache = /** @class */ (function () {
             this.loadAccessToken(request, response, request.account.homeAccountId, request.account.environment, request.account.tenantId, options);
         }
         else if (request.authority) {
+            var authorityUrl = Authority.generateAuthority(request.authority, request.azureCloudOptions);
             var authorityOptions = {
                 protocolMode: this.config.auth.protocolMode,
                 knownAuthorities: this.config.auth.knownAuthorities,
                 cloudDiscoveryMetadata: this.config.auth.cloudDiscoveryMetadata,
-                authorityMetadata: this.config.auth.authorityMetadata
+                authorityMetadata: this.config.auth.authorityMetadata,
             };
-            var authority = new Authority(request.authority, this.config.system.networkClient, this.storage, authorityOptions);
+            var authority = new Authority(authorityUrl, this.config.system.networkClient, this.storage, authorityOptions);
             // "clientInfo" from options takes precedence over "clientInfo" in response
             if (options.clientInfo) {
                 this.logger.trace("TokenCache - homeAccountId from options");
@@ -11752,6 +12493,91 @@ var TokenCache = /** @class */ (function () {
     return TokenCache;
 }());
 
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+var HybridSpaAuthorizationCodeClient = /** @class */ (function (_super) {
+    __extends$1(HybridSpaAuthorizationCodeClient, _super);
+    function HybridSpaAuthorizationCodeClient(config) {
+        var _this = _super.call(this, config) || this;
+        _this.includeRedirectUri = false;
+        return _this;
+    }
+    return HybridSpaAuthorizationCodeClient;
+}(AuthorizationCodeClient));
+
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+var SilentAuthCodeClient = /** @class */ (function (_super) {
+    __extends$1(SilentAuthCodeClient, _super);
+    function SilentAuthCodeClient(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, apiId, correlationId) {
+        var _this = _super.call(this, config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, correlationId) || this;
+        _this.apiId = apiId;
+        return _this;
+    }
+    /**
+     * Acquires a token silently by redeeming an authorization code against the /token endpoint
+     * @param request
+     */
+    SilentAuthCodeClient.prototype.acquireToken = function (request) {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var silentRequest, serverTelemetryManager, authCodeRequest, clientConfig, authClient, silentHandler, e_1;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.logger.trace("SilentAuthCodeClient.acquireToken called");
+                        // Auth code payload is required
+                        if (!request.code) {
+                            throw BrowserAuthError.createAuthCodeRequiredError();
+                        }
+                        return [4 /*yield*/, this.initializeAuthorizationRequest(request, exports.InteractionType.Silent)];
+                    case 1:
+                        silentRequest = _a.sent();
+                        this.browserStorage.updateCacheEntries(silentRequest.state, silentRequest.nonce, silentRequest.authority, silentRequest.loginHint || "", silentRequest.account || null);
+                        serverTelemetryManager = this.initializeServerTelemetryManager(this.apiId);
+                        _a.label = 2;
+                    case 2:
+                        _a.trys.push([2, 4, , 5]);
+                        authCodeRequest = __assign$1(__assign$1({}, silentRequest), { code: request.code });
+                        return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, silentRequest.authority)];
+                    case 3:
+                        clientConfig = _a.sent();
+                        authClient = new HybridSpaAuthorizationCodeClient(clientConfig);
+                        this.logger.verbose("Auth code client created");
+                        silentHandler = new SilentHandler(authClient, this.browserStorage, authCodeRequest, this.logger, this.config.system.navigateFrameWait);
+                        // Handle auth code parameters from request
+                        return [2 /*return*/, silentHandler.handleCodeResponseFromServer({
+                                code: request.code,
+                                msgraph_host: request.msGraphHost,
+                                cloud_graph_host_name: request.cloudGraphHostName,
+                                cloud_instance_host_name: request.cloudInstanceHostName
+                            }, silentRequest.state, authClient.authority, this.networkClient, false)];
+                    case 4:
+                        e_1 = _a.sent();
+                        if (e_1 instanceof AuthError) {
+                            e_1.setCorrelationId(this.correlationId);
+                        }
+                        serverTelemetryManager.cacheFailedRequest(e_1);
+                        this.browserStorage.cleanRequestByState(silentRequest.state);
+                        throw e_1;
+                    case 5: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Currently Unsupported
+     */
+    SilentAuthCodeClient.prototype.logout = function () {
+        // Synchronous so we must reject
+        return Promise.reject(BrowserAuthError.createSilentLogoutUnsupportedError());
+    };
+    return SilentAuthCodeClient;
+}(StandardInteractionClient));
+
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -11795,8 +12621,10 @@ var ClientApplication = /** @class */ (function () {
         this.navigationClient = this.config.system.navigationClient;
         // Initialize redirectResponse Map
         this.redirectResponse = new Map();
+        // Initial hybrid spa map
+        this.hybridAuthCodeResponses = new Map();
         // Initialize the crypto class.
-        this.browserCrypto = this.isBrowserEnvironment ? new CryptoOps() : DEFAULT_CRYPTO_IMPLEMENTATION;
+        this.browserCrypto = this.isBrowserEnvironment ? new CryptoOps(this.logger) : DEFAULT_CRYPTO_IMPLEMENTATION;
         this.eventHandler = new EventHandler(this.logger, this.browserCrypto);
         // Initialize the browser storage class.
         this.browserStorage = this.isBrowserEnvironment ?
@@ -11826,7 +12654,7 @@ var ClientApplication = /** @class */ (function () {
                     if (typeof response === "undefined") {
                         this.eventHandler.emitEvent(exports.EventType.HANDLE_REDIRECT_START, exports.InteractionType.Redirect);
                         this.logger.verbose("handleRedirectPromise has been called for the first time, storing the promise");
-                        correlationId = this.browserStorage.getTemporaryCache(TemporaryCacheKeys.CORRELATION_ID, true) || "";
+                        correlationId = this.browserStorage.getTemporaryCache(exports.TemporaryCacheKeys.CORRELATION_ID, true) || "";
                         redirectClient = new RedirectClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, correlationId);
                         response = redirectClient.handleRedirectPromise(hash)
                             .then(function (result) {
@@ -11883,8 +12711,8 @@ var ClientApplication = /** @class */ (function () {
             var _this = this;
             return __generator$1(this, function (_a) {
                 // Preflight request
-                this.preflightBrowserEnvironmentCheck(exports.InteractionType.Redirect);
                 this.logger.verbose("acquireTokenRedirect called");
+                this.preflightBrowserEnvironmentCheck(exports.InteractionType.Redirect);
                 isLoggedIn = this.getAllAccounts().length > 0;
                 if (isLoggedIn) {
                     this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_START, exports.InteractionType.Redirect, request);
@@ -11918,8 +12746,8 @@ var ClientApplication = /** @class */ (function () {
     ClientApplication.prototype.acquireTokenPopup = function (request) {
         var _this = this;
         try {
-            this.preflightBrowserEnvironmentCheck(exports.InteractionType.Popup);
             this.logger.verbose("acquireTokenPopup called", request.correlationId);
+            this.preflightBrowserEnvironmentCheck(exports.InteractionType.Popup);
         }
         catch (e) {
             // Since this function is syncronous we need to reject
@@ -11999,6 +12827,77 @@ var ClientApplication = /** @class */ (function () {
             });
         });
     };
+    /**
+     * This function redeems an authorization code (passed as code) from the eSTS token endpoint.
+     * This authorization code should be acquired server-side using a confidential client to acquire a spa_code.
+     * This API is not indended for normal authorization code acquisition and redemption.
+     *
+     * Redemption of this authorization code will not require PKCE, as it was acquired by a confidential client.
+     *
+     * @param request {@link AuthorizationCodeRequest}
+     * @returns A promise that is fulfilled when this function has completed, or rejected if an error was raised.
+     */
+    ClientApplication.prototype.acquireTokenByCode = function (request) {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var response;
+            var _this = this;
+            return __generator$1(this, function (_a) {
+                this.preflightBrowserEnvironmentCheck(exports.InteractionType.Silent);
+                this.logger.trace("acquireTokenByCode called", request.correlationId);
+                this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_BY_CODE_START, exports.InteractionType.Silent, request);
+                try {
+                    if (!request.code) {
+                        throw BrowserAuthError.createAuthCodeRequiredError();
+                    }
+                    response = this.hybridAuthCodeResponses.get(request.code);
+                    if (!response) {
+                        this.logger.verbose("Initiating new acquireTokenByCode request", request.correlationId);
+                        response = this.acquireTokenByCodeAsync(request)
+                            .then(function (result) {
+                            _this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_BY_CODE_SUCCESS, exports.InteractionType.Silent, result);
+                            _this.hybridAuthCodeResponses.delete(request.code);
+                            return result;
+                        })
+                            .catch(function (error) {
+                            _this.hybridAuthCodeResponses.delete(request.code);
+                            throw error;
+                        });
+                        this.hybridAuthCodeResponses.set(request.code, response);
+                    }
+                    else {
+                        this.logger.verbose("Existing acquireTokenByCode request found", request.correlationId);
+                    }
+                    return [2 /*return*/, response];
+                }
+                catch (e) {
+                    this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_BY_CODE_FAILURE, exports.InteractionType.Silent, null, e);
+                    throw e;
+                }
+                return [2 /*return*/];
+            });
+        });
+    };
+    /**
+     * Creates a SilentAuthCodeClient to redeem an authorization code.
+     * @param request
+     * @returns Result of the operation to redeem the authorization code
+     */
+    ClientApplication.prototype.acquireTokenByCodeAsync = function (request) {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var silentAuthCodeClient, silentTokenResult;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.logger.trace("acquireTokenByCodeAsync called", request.correlationId);
+                        silentAuthCodeClient = new SilentAuthCodeClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, exports.ApiId.acquireTokenByCode, request.correlationId);
+                        return [4 /*yield*/, silentAuthCodeClient.acquireToken(request)];
+                    case 1:
+                        silentTokenResult = _a.sent();
+                        return [2 /*return*/, silentTokenResult];
+                }
+            });
+        });
+    };
     /**
      * Use this function to obtain a token before every call to the API / resource provider
      *
@@ -12025,7 +12924,7 @@ var ClientApplication = /** @class */ (function () {
                         var isInvalidGrantError = (e.errorCode === BrowserConstants.INVALID_GRANT_ERROR);
                         if (isServerError && isInvalidGrantError && !isInteractionRequiredError) {
                             _this.logger.verbose("Refresh token expired or invalid, attempting acquire token by iframe", request.correlationId);
-                            var silentIframeClient = new SilentIframeClient(_this.config, _this.browserStorage, _this.browserCrypto, _this.logger, _this.eventHandler, _this.navigationClient, exports.ApiId.acquireTokenSilent_authCode);
+                            var silentIframeClient = new SilentIframeClient(_this.config, _this.browserStorage, _this.browserCrypto, _this.logger, _this.eventHandler, _this.navigationClient, exports.ApiId.acquireTokenSilent_authCode, request.correlationId);
                             return silentIframeClient.acquireToken(request);
                         }
                         throw e;
@@ -12183,6 +13082,21 @@ var ClientApplication = /** @class */ (function () {
             !this.config.cache.storeAuthStateInCookie) {
             throw BrowserConfigurationAuthError.createInMemoryRedirectUnavailableError();
         }
+        if (interactionType === exports.InteractionType.Redirect || interactionType === exports.InteractionType.Popup) {
+            this.preflightInteractiveRequest();
+        }
+    };
+    /**
+     * Helper to validate app environment before making a request.
+     * @param request
+     * @param interactionType
+     */
+    ClientApplication.prototype.preflightInteractiveRequest = function () {
+        this.logger.verbose("preflightInteractiveRequest called, validating app environment");
+        // block the reload if it occurred inside a hidden iframe
+        BrowserUtils.blockReloadInHiddenIframes();
+        // Set interaction in progress temporary cache or throw if alread set.
+        this.browserStorage.setInteractionInProgress(true);
     };
     /**
      * Adds event callbacks to array
@@ -12245,6 +13159,12 @@ var ClientApplication = /** @class */ (function () {
     ClientApplication.prototype.setNavigationClient = function (navigationClient) {
         this.navigationClient = navigationClient;
     };
+    /**
+     * Returns the configuration object
+     */
+    ClientApplication.prototype.getConfiguration = function () {
+        return this.config;
+    };
     return ClientApplication;
 }());
 
@@ -12268,7 +13188,7 @@ var SilentCacheClient = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         serverTelemetryManager = this.initializeServerTelemetryManager(exports.ApiId.acquireTokenSilent_silentFlow);
-                        return [4 /*yield*/, this.createSilentFlowClient(serverTelemetryManager, silentRequest.authority)];
+                        return [4 /*yield*/, this.createSilentFlowClient(serverTelemetryManager, silentRequest.authority, silentRequest.azureCloudOptions)];
                     case 1:
                         silentAuthClient = _a.sent();
                         this.logger.verbose("Silent auth client created");
@@ -12303,12 +13223,12 @@ var SilentCacheClient = /** @class */ (function (_super) {
      * @param serverTelemetryManager
      * @param authorityUrl
      */
-    SilentCacheClient.prototype.createSilentFlowClient = function (serverTelemetryManager, authorityUrl) {
+    SilentCacheClient.prototype.createSilentFlowClient = function (serverTelemetryManager, authorityUrl, azureCloudOptions) {
         return __awaiter$1(this, void 0, void 0, function () {
             var clientConfig;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl)];
+                    case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl, azureCloudOptions)];
                     case 1:
                         clientConfig = _a.sent();
                         return [2 /*return*/, new SilentFlowClient(clientConfig)];
@@ -12317,7 +13237,17 @@ var SilentCacheClient = /** @class */ (function (_super) {
         });
     };
     SilentCacheClient.prototype.initializeSilentRequest = function (request, account) {
-        return __assign$1(__assign$1(__assign$1({}, request), this.initializeBaseRequest(request)), { account: account, forceRefresh: request.forceRefresh || false });
+        return __awaiter$1(this, void 0, void 0, function () {
+            var _a;
+            return __generator$1(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = [__assign$1({}, request)];
+                        return [4 /*yield*/, this.initializeBaseRequest(request)];
+                    case 1: return [2 /*return*/, __assign$1.apply(void 0, [__assign$1.apply(void 0, _a.concat([_b.sent()])), { account: account, forceRefresh: request.forceRefresh || false }])];
+                }
+            });
+        });
     };
     return SilentCacheClient;
 }(StandardInteractionClient));
@@ -12408,10 +13338,12 @@ var PublicClientApplication = /** @class */ (function (_super) {
                     authority: request.authority || "",
                     scopes: request.scopes,
                     homeAccountIdentifier: account.homeAccountId,
+                    claims: request.claims,
                     authenticationScheme: request.authenticationScheme,
                     resourceRequestMethod: request.resourceRequestMethod,
                     resourceRequestUri: request.resourceRequestUri,
-                    shrClaims: request.shrClaims
+                    shrClaims: request.shrClaims,
+                    sshKid: request.sshKid
                 };
                 silentRequestKey = JSON.stringify(thumbprint);
                 cachedResponse = this.activeSilentTokenRequests.get(silentRequestKey);
@@ -12447,28 +13379,33 @@ var PublicClientApplication = /** @class */ (function (_super) {
             var silentCacheClient, silentRequest;
             var _this = this;
             return __generator$1(this, function (_a) {
-                silentCacheClient = new SilentCacheClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient);
-                silentRequest = silentCacheClient.initializeSilentRequest(request, account);
-                this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_START, exports.InteractionType.Silent, request);
-                return [2 /*return*/, silentCacheClient.acquireToken(silentRequest).catch(function () { return __awaiter$1(_this, void 0, void 0, function () {
-                        var tokenRenewalResult, tokenRenewalError_1;
-                        return __generator$1(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    _a.trys.push([0, 2, , 3]);
-                                    return [4 /*yield*/, this.acquireTokenByRefreshToken(silentRequest)];
-                                case 1:
-                                    tokenRenewalResult = _a.sent();
-                                    this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Silent, tokenRenewalResult);
-                                    return [2 /*return*/, tokenRenewalResult];
-                                case 2:
-                                    tokenRenewalError_1 = _a.sent();
-                                    this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Silent, null, tokenRenewalError_1);
-                                    throw tokenRenewalError_1;
-                                case 3: return [2 /*return*/];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0:
+                        silentCacheClient = new SilentCacheClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, request.correlationId);
+                        return [4 /*yield*/, silentCacheClient.initializeSilentRequest(request, account)];
+                    case 1:
+                        silentRequest = _a.sent();
+                        this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_START, exports.InteractionType.Silent, request);
+                        return [2 /*return*/, silentCacheClient.acquireToken(silentRequest).catch(function () { return __awaiter$1(_this, void 0, void 0, function () {
+                                var tokenRenewalResult, tokenRenewalError_1;
+                                return __generator$1(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            _a.trys.push([0, 2, , 3]);
+                                            return [4 /*yield*/, this.acquireTokenByRefreshToken(silentRequest)];
+                                        case 1:
+                                            tokenRenewalResult = _a.sent();
+                                            this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Silent, tokenRenewalResult);
+                                            return [2 /*return*/, tokenRenewalResult];
+                                        case 2:
+                                            tokenRenewalError_1 = _a.sent();
+                                            this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Silent, null, tokenRenewalError_1);
+                                            throw tokenRenewalError_1;
+                                        case 3: return [2 /*return*/];
+                                    }
+                                });
+                            }); })];
+                }
             });
         });
     };
@@ -12489,6 +13426,9 @@ var stubbedPublicClientApplication = {
     acquireTokenSilent: function () {
         return Promise.reject(BrowserConfigurationAuthError.createStubPcaInstanceCalledError());
     },
+    acquireTokenByCode: function () {
+        return Promise.reject(BrowserConfigurationAuthError.createStubPcaInstanceCalledError());
+    },
     getAllAccounts: function () {
         return [];
     },
@@ -12554,6 +13494,9 @@ var stubbedPublicClientApplication = {
     },
     setNavigationClient: function () {
         return;
+    },
+    getConfiguration: function () {
+        throw BrowserConfigurationAuthError.createStubPcaInstanceCalledError();
     }
 };
 
@@ -12626,8 +13569,10 @@ var EventMessageUtils = /** @class */ (function () {
  * Licensed under the MIT License.
  */
 var SignedHttpRequest = /** @class */ (function () {
-    function SignedHttpRequest(shrParameters) {
-        this.cryptoOps = new CryptoOps();
+    function SignedHttpRequest(shrParameters, shrOptions) {
+        var loggerOptions = (shrOptions && shrOptions.loggerOptions) || {};
+        this.logger = new Logger(loggerOptions, name, version);
+        this.cryptoOps = new CryptoOps(this.logger);
         this.popTokenGenerator = new PopTokenGenerator(this.cryptoOps);
         this.shrParameters = shrParameters;
     }
@@ -12670,7 +13615,10 @@ var SignedHttpRequest = /** @class */ (function () {
     SignedHttpRequest.prototype.removeKeys = function (publicKeyThumbprint) {
         return __awaiter$1(this, void 0, void 0, function () {
             return __generator$1(this, function (_a) {
-                return [2 /*return*/, this.cryptoOps.removeTokenBindingKey(publicKeyThumbprint)];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.cryptoOps.removeTokenBindingKey(publicKeyThumbprint)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -12680,23 +13628,37 @@ var SignedHttpRequest = /** @class */ (function () {
 exports.AccountEntity = AccountEntity;
 exports.AuthError = AuthError;
 exports.AuthErrorMessage = AuthErrorMessage;
+exports.AuthenticationHeaderParser = AuthenticationHeaderParser;
 exports.BrowserAuthError = BrowserAuthError;
 exports.BrowserAuthErrorMessage = BrowserAuthErrorMessage;
+exports.BrowserCacheManager = BrowserCacheManager;
 exports.BrowserConfigurationAuthError = BrowserConfigurationAuthError;
 exports.BrowserConfigurationAuthErrorMessage = BrowserConfigurationAuthErrorMessage;
+exports.BrowserConstants = BrowserConstants;
 exports.BrowserUtils = BrowserUtils;
 exports.ClientAuthError = ClientAuthError;
 exports.ClientAuthErrorMessage = ClientAuthErrorMessage;
 exports.ClientConfigurationError = ClientConfigurationError;
 exports.ClientConfigurationErrorMessage = ClientConfigurationErrorMessage;
+exports.DEFAULT_IFRAME_TIMEOUT_MS = DEFAULT_IFRAME_TIMEOUT_MS;
+exports.EventHandler = EventHandler;
 exports.EventMessageUtils = EventMessageUtils;
 exports.InteractionRequiredAuthError = InteractionRequiredAuthError;
 exports.InteractionRequiredAuthErrorMessage = InteractionRequiredAuthErrorMessage;
 exports.Logger = Logger;
 exports.NavigationClient = NavigationClient;
+exports.OIDC_DEFAULT_SCOPES = OIDC_DEFAULT_SCOPES;
+exports.PopupClient = PopupClient;
+exports.PopupUtils = PopupUtils;
 exports.PublicClientApplication = PublicClientApplication;
+exports.RedirectClient = RedirectClient;
+exports.RedirectHandler = RedirectHandler;
 exports.ServerError = ServerError;
 exports.SignedHttpRequest = SignedHttpRequest;
+exports.SilentCacheClient = SilentCacheClient;
+exports.SilentIframeClient = SilentIframeClient;
+exports.SilentRefreshClient = SilentRefreshClient;
+exports.StandardInteractionClient = StandardInteractionClient;
 exports.StringUtils = StringUtils;
 exports.UrlString = UrlString;
 exports.stubbedPublicClientApplication = stubbedPublicClientApplication;