@azure/msal-browser 2.37.0 → 2.38.0

package/dist/index.cjs.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v2.37.0 2023-05-01 */
+/*! @azure/msal-browser v2.38.0 2023-07-05 */
 'use strict';
 'use strict';
 
@@ -117,7 +117,7 @@ function __spread() {
     return ar;
 }
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -204,7 +204,7 @@ function __spreadArrays() {
     return r;
 }
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -568,6 +568,7 @@ var CacheOutcome;
     CacheOutcome["NO_CACHED_ACCESS_TOKEN"] = "2";
     CacheOutcome["CACHED_ACCESS_TOKEN_EXPIRED"] = "3";
     CacheOutcome["REFRESH_CACHED_ACCESS_TOKEN"] = "4";
+    CacheOutcome["CLAIMS_REQUESTED_CACHE_SKIPPED"] = "5";
 })(CacheOutcome || (CacheOutcome = {}));
 var JsonTypes;
 (function (JsonTypes) {
@@ -576,7 +577,7 @@ var JsonTypes;
     JsonTypes["Pop"] = "pop";
 })(JsonTypes || (JsonTypes = {}));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -632,7 +633,7 @@ var AuthError = /** @class */ (function (_super) {
     return AuthError;
 }(Error));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -707,7 +708,7 @@ var DEFAULT_CRYPTO_IMPLEMENTATION = {
     }
 };
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1222,7 +1223,7 @@ var ClientAuthError = /** @class */ (function (_super) {
     return ClientAuthError;
 }(AuthError));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1347,7 +1348,7 @@ var StringUtils = /** @class */ (function () {
     return StringUtils;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1537,12 +1538,12 @@ var Logger = /** @class */ (function () {
     return Logger;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 /* eslint-disable header/header */
 var name$1 = "@azure/msal-common";
-var version$1 = "13.0.0";
+var version$1 = "13.2.0";
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1563,7 +1564,7 @@ exports.AzureCloudInstance = void 0;
     AzureCloudInstance["AzureUsGovernment"] = "https://login.microsoftonline.us";
 })(exports.AzureCloudInstance || (exports.AzureCloudInstance = {}));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1664,6 +1665,10 @@ var ClientConfigurationErrorMessage = {
     invalidAuthenticationHeader: {
         code: "invalid_authentication_header",
         desc: "Invalid authentication header provided"
+    },
+    authorityMismatch: {
+        code: "authority_mismatch",
+        desc: "Authority mismatch error. Authority provided in login request or PublicClientApplication config does not match the environment of the provided account. Please use a matching account or make an interactive request to login to this authority."
     }
 };
 /**
@@ -1815,10 +1820,16 @@ var ClientConfigurationError = /** @class */ (function (_super) {
     ClientConfigurationError.createInvalidAuthenticationHeaderError = function (invalidHeaderName, details) {
         return new ClientConfigurationError(ClientConfigurationErrorMessage.invalidAuthenticationHeader.code, ClientConfigurationErrorMessage.invalidAuthenticationHeader.desc + ". Invalid header: " + invalidHeaderName + ". Details: " + details);
     };
+    /**
+     * Create an error when the authority provided in request does not match authority provided in account or MSAL.js configuration.
+     */
+    ClientConfigurationError.createAuthorityMismatchError = function () {
+        return new ClientConfigurationError(ClientConfigurationErrorMessage.authorityMismatch.code, ClientConfigurationErrorMessage.authorityMismatch.desc);
+    };
     return ClientConfigurationError;
 }(ClientAuthError));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2017,7 +2028,7 @@ var ScopeSet = /** @class */ (function () {
     return ScopeSet;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2055,7 +2066,7 @@ function buildClientInfoFromHomeAccountId(homeAccountId) {
     };
 }
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -2071,7 +2082,7 @@ var AuthorityType;
     AuthorityType[AuthorityType["Ciam"] = 3] = "Ciam";
 })(AuthorityType || (AuthorityType = {}));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2310,7 +2321,7 @@ var AccountEntity = /** @class */ (function () {
     return AccountEntity;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2362,7 +2373,7 @@ var AuthToken = /** @class */ (function () {
     return AuthToken;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3410,7 +3421,7 @@ var DefaultStorageClass = /** @class */ (function (_super) {
     return DefaultStorageClass;
 }(CacheManager));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3430,6 +3441,9 @@ var DEFAULT_LOGGER_IMPLEMENTATION = {
     logLevel: exports.LogLevel.Info,
     correlationId: Constants.EMPTY_STRING
 };
+var DEFAULT_CACHE_OPTIONS = {
+    claimsBasedCachingEnabled: true
+};
 var DEFAULT_NETWORK_IMPLEMENTATION = {
     sendGetRequestAsync: function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -3478,12 +3492,13 @@ var DEFAULT_TELEMETRY_OPTIONS = {
  * @returns Configuration
  */
 function buildClientConfiguration(_a) {
-    var userAuthOptions = _a.authOptions, userSystemOptions = _a.systemOptions, userLoggerOption = _a.loggerOptions, storageImplementation = _a.storageInterface, networkImplementation = _a.networkInterface, cryptoImplementation = _a.cryptoInterface, clientCredentials = _a.clientCredentials, libraryInfo = _a.libraryInfo, telemetry = _a.telemetry, serverTelemetryManager = _a.serverTelemetryManager, persistencePlugin = _a.persistencePlugin, serializableCache = _a.serializableCache;
+    var userAuthOptions = _a.authOptions, userSystemOptions = _a.systemOptions, userLoggerOption = _a.loggerOptions, userCacheOptions = _a.cacheOptions, storageImplementation = _a.storageInterface, networkImplementation = _a.networkInterface, cryptoImplementation = _a.cryptoInterface, clientCredentials = _a.clientCredentials, libraryInfo = _a.libraryInfo, telemetry = _a.telemetry, serverTelemetryManager = _a.serverTelemetryManager, persistencePlugin = _a.persistencePlugin, serializableCache = _a.serializableCache;
     var loggerOptions = __assign(__assign({}, DEFAULT_LOGGER_IMPLEMENTATION), userLoggerOption);
     return {
         authOptions: buildAuthOptions(userAuthOptions),
         systemOptions: __assign(__assign({}, DEFAULT_SYSTEM_OPTIONS), userSystemOptions),
         loggerOptions: loggerOptions,
+        cacheOptions: __assign(__assign({}, DEFAULT_CACHE_OPTIONS), userCacheOptions),
         storageInterface: storageImplementation || new DefaultStorageClass(userAuthOptions.clientId, DEFAULT_CRYPTO_IMPLEMENTATION, new Logger(loggerOptions)),
         networkInterface: networkImplementation || DEFAULT_NETWORK_IMPLEMENTATION,
         cryptoInterface: cryptoImplementation || DEFAULT_CRYPTO_IMPLEMENTATION,
@@ -3503,7 +3518,7 @@ function buildAuthOptions(authOptions) {
     return __assign({ clientCapabilities: [], azureCloudOptions: DEFAULT_AZURE_CLOUD_OPTIONS, skipAuthorityMetadataCache: false }, authOptions);
 }
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3523,7 +3538,7 @@ var ServerError = /** @class */ (function (_super) {
     return ServerError;
 }(AuthError));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3619,7 +3634,7 @@ var ThrottlingUtils = /** @class */ (function () {
     return ThrottlingUtils;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3668,7 +3683,7 @@ var NetworkManager = /** @class */ (function () {
     return NetworkManager;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3679,7 +3694,7 @@ var CcsCredentialType;
     CcsCredentialType["UPN"] = "UPN";
 })(CcsCredentialType || (CcsCredentialType = {}));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3770,7 +3785,7 @@ var RequestValidator = /** @class */ (function () {
     return RequestValidator;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4148,7 +4163,7 @@ var RequestParameterBuilder = /** @class */ (function () {
     return RequestParameterBuilder;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4250,7 +4265,7 @@ var BaseClient = /** @class */ (function () {
     return BaseClient;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4388,7 +4403,7 @@ var CredentialEntity = /** @class */ (function () {
     return CredentialEntity;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4452,7 +4467,7 @@ var IdTokenEntity = /** @class */ (function (_super) {
     return IdTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4502,7 +4517,7 @@ var TimeUtils = /** @class */ (function () {
     return TimeUtils;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4616,7 +4631,7 @@ var AccessTokenEntity = /** @class */ (function (_super) {
     return AccessTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4683,7 +4698,7 @@ var RefreshTokenEntity = /** @class */ (function (_super) {
     return RefreshTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4762,7 +4777,7 @@ var InteractionRequiredAuthError = /** @class */ (function (_super) {
     return InteractionRequiredAuthError;
 }(AuthError));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4778,7 +4793,7 @@ var CacheRecord = /** @class */ (function () {
     return CacheRecord;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4849,7 +4864,7 @@ var ProtocolUtils = /** @class */ (function () {
     return ProtocolUtils;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5083,7 +5098,7 @@ var UrlString = /** @class */ (function () {
     return UrlString;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5312,7 +5327,7 @@ var IntFields = new Set([
     "status",
 ]);
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5421,7 +5436,7 @@ var PopTokenGenerator = /** @class */ (function () {
     return PopTokenGenerator;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5491,7 +5506,7 @@ var AppMetadataEntity = /** @class */ (function () {
     return AppMetadataEntity;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5527,7 +5542,7 @@ var AppMetadataEntity = /** @class */ (function () {
     return TokenCacheContext;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5814,7 +5829,7 @@ var ResponseHandler = /** @class */ (function () {
     return ResponseHandler;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6244,7 +6259,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                         return [4 /*yield*/, popTokenGenerator.generateCnf(request)];
                     case 1:
                         reqCnfData = _b.sent();
-                        parameterBuilder.addPopToken(reqCnfData.reqCnfHash);
+                        parameterBuilder.addPopToken(reqCnfData.reqCnfString);
                         _b.label = 2;
                     case 2: return [2 /*return*/, parameterBuilder.createQueryString()];
                 }
@@ -6292,7 +6307,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
     return AuthorizationCodeClient;
 }(BaseClient));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6566,7 +6581,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
     return RefreshTokenClient;
 }(BaseClient));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6610,11 +6625,11 @@ var SilentFlowClient = /** @class */ (function (_super) {
      * @param request
      */
     SilentFlowClient.prototype.acquireCachedToken = function (request) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function () {
             var environment, cacheRecord;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
                         // Cannot renew token if no request object is given.
                         if (!request) {
@@ -6626,6 +6641,12 @@ var SilentFlowClient = /** @class */ (function (_super) {
                             this.logger.info("SilentFlowClient:acquireCachedToken - Skipping cache because forceRefresh is true.");
                             throw ClientAuthError.createRefreshRequiredError();
                         }
+                        else if (!this.config.cacheOptions.claimsBasedCachingEnabled && !StringUtils.isEmptyObj(request.claims)) {
+                            // Must refresh due to presence of claims in request preventing cache lookup
+                            (_b = this.serverTelemetryManager) === null || _b === void 0 ? void 0 : _b.setCacheOutcome(CacheOutcome.CLAIMS_REQUESTED_CACHE_SKIPPED);
+                            this.logger.info("SilentFlowClient:acquireCachedToken - Skipping cache because claims-based caching is disabled and claims were requested.");
+                            throw ClientAuthError.createRefreshRequiredError();
+                        }
                         // 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();
@@ -6634,20 +6655,20 @@ var SilentFlowClient = /** @class */ (function (_super) {
                         cacheRecord = this.cacheManager.readCacheRecord(request.account, 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);
+                            (_c = this.serverTelemetryManager) === null || _c === void 0 ? void 0 : _c.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);
+                            (_d = this.serverTelemetryManager) === null || _d === void 0 ? void 0 : _d.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);
+                            (_e = this.serverTelemetryManager) === null || _e === void 0 ? void 0 : _e.setCacheOutcome(CacheOutcome.REFRESH_CACHED_ACCESS_TOKEN);
                             this.logger.info("SilentFlowClient:acquireCachedToken - Cached access token's refreshOn property has been exceeded'.");
                             throw ClientAuthError.createRefreshRequiredError();
                         }
@@ -6655,7 +6676,7 @@ var SilentFlowClient = /** @class */ (function (_super) {
                             this.config.serverTelemetryManager.incrementCacheHits();
                         }
                         return [4 /*yield*/, this.generateResultFromCacheRecord(cacheRecord, request)];
-                    case 1: return [2 /*return*/, _e.sent()];
+                    case 1: return [2 /*return*/, _f.sent()];
                 }
             });
         });
@@ -6690,7 +6711,7 @@ var SilentFlowClient = /** @class */ (function (_super) {
     return SilentFlowClient;
 }(BaseClient));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6702,7 +6723,7 @@ function isOpenIdConfigResponse(response) {
         response.hasOwnProperty("jwks_uri"));
 }
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6711,7 +6732,7 @@ var rawMetdataJSON = { "endpointMetadata": { "https://login.microsoftonline.com/
 var EndpointMetadata = rawMetdataJSON.endpointMetadata;
 var InstanceDiscoveryMetadata = rawMetdataJSON.instanceDiscoveryMetadata;
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6725,7 +6746,7 @@ exports.ProtocolMode = void 0;
     ProtocolMode["OIDC"] = "OIDC";
 })(exports.ProtocolMode || (exports.ProtocolMode = {}));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6802,7 +6823,7 @@ var AuthorityMetadataEntity = /** @class */ (function () {
     return AuthorityMetadataEntity;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6812,7 +6833,7 @@ function isCloudInstanceDiscoveryResponse(response) {
         response.hasOwnProperty("metadata"));
 }
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6822,7 +6843,7 @@ function isCloudInstanceDiscoveryErrorResponse(response) {
         response.hasOwnProperty("error_description"));
 }
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6954,7 +6975,7 @@ var RegionDiscovery = /** @class */ (function () {
     return RegionDiscovery;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6977,23 +6998,31 @@ var Authority = /** @class */ (function () {
         this.correlationId = correlationId;
         this.regionDiscovery = new RegionDiscovery(networkInterface, this.performanceClient, this.correlationId);
     }
+    /**
+     * Get {@link AuthorityType}
+     * @param authorityUri {@link IUri}
+     * @private
+     */
+    Authority.prototype.getAuthorityType = function (authorityUri) {
+        // CIAM auth url pattern is being standardized as: <tenant>.ciamlogin.com
+        if (authorityUri.HostNameAndPort.endsWith(Constants.CIAM_AUTH_URL)) {
+            return AuthorityType.Ciam;
+        }
+        var pathSegments = authorityUri.PathSegments;
+        if (pathSegments.length) {
+            switch (pathSegments[0].toLowerCase()) {
+                case Constants.ADFS:
+                    return AuthorityType.Adfs;
+                case Constants.DSTS:
+                    return AuthorityType.Dsts;
+            }
+        }
+        return AuthorityType.Default;
+    };
     Object.defineProperty(Authority.prototype, "authorityType", {
         // See above for AuthorityType
         get: function () {
-            // CIAM auth url pattern is being standardized as: <tenant>.ciamlogin.com
-            if (this.canonicalAuthorityUrlComponents.HostNameAndPort.endsWith(Constants.CIAM_AUTH_URL)) {
-                return AuthorityType.Ciam;
-            }
-            var pathSegments = this.canonicalAuthorityUrlComponents.PathSegments;
-            if (pathSegments.length) {
-                switch (pathSegments[0].toLowerCase()) {
-                    case Constants.ADFS:
-                        return AuthorityType.Adfs;
-                    case Constants.DSTS:
-                        return AuthorityType.Dsts;
-                }
-            }
-            return AuthorityType.Default;
+            return this.getAuthorityType(this.canonicalAuthorityUrlComponents);
         },
         enumerable: false,
         configurable: true
@@ -7075,8 +7104,7 @@ var Authority = /** @class */ (function () {
          */
         get: function () {
             if (this.discoveryComplete()) {
-                var endpoint = this.replacePath(this.metadata.authorization_endpoint);
-                return this.replaceTenant(endpoint);
+                return this.replacePath(this.metadata.authorization_endpoint);
             }
             else {
                 throw ClientAuthError.createEndpointDiscoveryIncompleteError("Discovery incomplete.");
@@ -7091,8 +7119,7 @@ var Authority = /** @class */ (function () {
          */
         get: function () {
             if (this.discoveryComplete()) {
-                var endpoint = this.replacePath(this.metadata.token_endpoint);
-                return this.replaceTenant(endpoint);
+                return this.replacePath(this.metadata.token_endpoint);
             }
             else {
                 throw ClientAuthError.createEndpointDiscoveryIncompleteError("Discovery incomplete.");
@@ -7104,8 +7131,7 @@ var Authority = /** @class */ (function () {
     Object.defineProperty(Authority.prototype, "deviceCodeEndpoint", {
         get: function () {
             if (this.discoveryComplete()) {
-                var endpoint = this.replacePath(this.metadata.token_endpoint.replace("/token", "/devicecode"));
-                return this.replaceTenant(endpoint);
+                return this.replacePath(this.metadata.token_endpoint.replace("/token", "/devicecode"));
             }
             else {
                 throw ClientAuthError.createEndpointDiscoveryIncompleteError("Discovery incomplete.");
@@ -7124,8 +7150,7 @@ var Authority = /** @class */ (function () {
                 if (!this.metadata.end_session_endpoint) {
                     throw ClientAuthError.createLogoutNotSupportedError();
                 }
-                var endpoint = this.replacePath(this.metadata.end_session_endpoint);
-                return this.replaceTenant(endpoint);
+                return this.replacePath(this.metadata.end_session_endpoint);
             }
             else {
                 throw ClientAuthError.createEndpointDiscoveryIncompleteError("Discovery incomplete.");
@@ -7140,8 +7165,7 @@ var Authority = /** @class */ (function () {
          */
         get: function () {
             if (this.discoveryComplete()) {
-                var endpoint = this.replacePath(this.metadata.issuer);
-                return this.replaceTenant(endpoint);
+                return this.replacePath(this.metadata.issuer);
             }
             else {
                 throw ClientAuthError.createEndpointDiscoveryIncompleteError("Discovery incomplete.");
@@ -7156,8 +7180,7 @@ var Authority = /** @class */ (function () {
          */
         get: function () {
             if (this.discoveryComplete()) {
-                var endpoint = this.replacePath(this.metadata.jwks_uri);
-                return this.replaceTenant(endpoint);
+                return this.replacePath(this.metadata.jwks_uri);
             }
             else {
                 throw ClientAuthError.createEndpointDiscoveryIncompleteError("Discovery incomplete.");
@@ -7166,6 +7189,17 @@ var Authority = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    /**
+     * Returns a flag indicating that tenant name can be replaced in authority {@link IUri}
+     * @param authorityUri {@link IUri}
+     * @private
+     */
+    Authority.prototype.canReplaceTenant = function (authorityUri) {
+        return authorityUri.PathSegments.length === 1
+            && !Authority.reservedTenantDomains.has(authorityUri.PathSegments[0])
+            && this.getAuthorityType(authorityUri) === AuthorityType.Default
+            && this.protocolMode === exports.ProtocolMode.AAD;
+    };
     /**
      * Replaces tenant in url path with current tenant. Defaults to common.
      * @param urlString
@@ -7178,17 +7212,31 @@ var Authority = /** @class */ (function () {
      * @param urlString
      */
     Authority.prototype.replacePath = function (urlString) {
+        var _this = this;
         var endpoint = urlString;
         var cachedAuthorityUrl = new UrlString(this.metadata.canonical_authority);
-        var cachedAuthorityParts = cachedAuthorityUrl.getUrlComponents().PathSegments;
+        var cachedAuthorityUrlComponents = cachedAuthorityUrl.getUrlComponents();
+        var cachedAuthorityParts = cachedAuthorityUrlComponents.PathSegments;
         var currentAuthorityParts = this.canonicalAuthorityUrlComponents.PathSegments;
         currentAuthorityParts.forEach(function (currentPart, index) {
             var cachedPart = cachedAuthorityParts[index];
+            if (index === 0 && _this.canReplaceTenant(cachedAuthorityUrlComponents)) {
+                var tenantId = (new UrlString(_this.metadata.authorization_endpoint)).getUrlComponents().PathSegments[0];
+                /**
+                 * Check if AAD canonical authority contains tenant domain name, for example "testdomain.onmicrosoft.com",
+                 * by comparing its first path segment to the corresponding authorization endpoint path segment, which is
+                 * always resolved with tenant id by OIDC.
+                 */
+                if (cachedPart !== tenantId) {
+                    _this.logger.verbose("Replacing tenant domain name " + cachedPart + " with id " + tenantId);
+                    cachedPart = tenantId;
+                }
+            }
             if (currentPart !== cachedPart) {
                 endpoint = endpoint.replace("/" + cachedPart + "/", "/" + currentPart + "/");
             }
         });
-        return endpoint;
+        return this.replaceTenant(endpoint);
     };
     Object.defineProperty(Authority.prototype, "defaultOpenIdConfigurationEndpoint", {
         /**
@@ -7368,42 +7416,35 @@ var Authority = /** @class */ (function () {
     };
     /**
      * Update the retrieved metadata with regional information.
+     * User selected Azure region will be used if configured.
      */
     Authority.prototype.updateMetadataWithRegionalInformation = function (metadata) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function () {
-            var autodetectedRegionName, azureRegion;
-            return __generator(this, function (_h) {
-                switch (_h.label) {
+            var userConfiguredAzureRegion, autodetectedRegionName;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.addQueueMeasurement(exports.PerformanceEvents.AuthorityUpdateMetadataWithRegionalInformation, this.correlationId);
-                        (_b = this.performanceClient) === null || _b === void 0 ? void 0 : _b.setPreQueueTime(exports.PerformanceEvents.RegionDiscoveryDetectRegion, this.correlationId);
-                        return [4 /*yield*/, this.regionDiscovery.detectRegion((_c = this.authorityOptions.azureRegionConfiguration) === null || _c === void 0 ? void 0 : _c.environmentRegion, this.regionDiscoveryMetadata)];
-                    case 1:
-                        autodetectedRegionName = _h.sent();
-                        azureRegion = ((_d = this.authorityOptions.azureRegionConfiguration) === null || _d === void 0 ? void 0 : _d.azureRegion) === Constants.AZURE_REGION_AUTO_DISCOVER_FLAG
-                            ? autodetectedRegionName
-                            : (_e = this.authorityOptions.azureRegionConfiguration) === null || _e === void 0 ? void 0 : _e.azureRegion;
-                        if (((_f = this.authorityOptions.azureRegionConfiguration) === null || _f === void 0 ? void 0 : _f.azureRegion) === Constants.AZURE_REGION_AUTO_DISCOVER_FLAG) {
-                            this.regionDiscoveryMetadata.region_outcome = autodetectedRegionName ?
-                                RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_SUCCESSFUL :
-                                RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_FAILED;
-                        }
-                        else {
-                            if (autodetectedRegionName) {
-                                this.regionDiscoveryMetadata.region_outcome = (((_g = this.authorityOptions.azureRegionConfiguration) === null || _g === void 0 ? void 0 : _g.azureRegion) === autodetectedRegionName) ?
-                                    RegionDiscoveryOutcomes.CONFIGURED_MATCHES_DETECTED :
-                                    RegionDiscoveryOutcomes.CONFIGURED_NOT_DETECTED;
-                            }
-                            else {
-                                this.regionDiscoveryMetadata.region_outcome = RegionDiscoveryOutcomes.CONFIGURED_NO_AUTO_DETECTION;
-                            }
+                        userConfiguredAzureRegion = (_b = this.authorityOptions.azureRegionConfiguration) === null || _b === void 0 ? void 0 : _b.azureRegion;
+                        if (!userConfiguredAzureRegion) return [3 /*break*/, 2];
+                        if (userConfiguredAzureRegion !== Constants.AZURE_REGION_AUTO_DISCOVER_FLAG) {
+                            this.regionDiscoveryMetadata.region_outcome = RegionDiscoveryOutcomes.CONFIGURED_NO_AUTO_DETECTION;
+                            this.regionDiscoveryMetadata.region_used = userConfiguredAzureRegion;
+                            return [2 /*return*/, Authority.replaceWithRegionalInformation(metadata, userConfiguredAzureRegion)];
                         }
-                        if (azureRegion) {
-                            this.regionDiscoveryMetadata.region_used = azureRegion;
-                            return [2 /*return*/, Authority.replaceWithRegionalInformation(metadata, azureRegion)];
+                        (_c = this.performanceClient) === null || _c === void 0 ? void 0 : _c.setPreQueueTime(exports.PerformanceEvents.RegionDiscoveryDetectRegion, this.correlationId);
+                        return [4 /*yield*/, this.regionDiscovery.detectRegion((_d = this.authorityOptions.azureRegionConfiguration) === null || _d === void 0 ? void 0 : _d.environmentRegion, this.regionDiscoveryMetadata)];
+                    case 1:
+                        autodetectedRegionName = _e.sent();
+                        if (autodetectedRegionName) {
+                            this.regionDiscoveryMetadata.region_outcome = RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_SUCCESSFUL;
+                            this.regionDiscoveryMetadata.region_used = autodetectedRegionName;
+                            return [2 /*return*/, Authority.replaceWithRegionalInformation(metadata, autodetectedRegionName)];
                         }
-                        return [2 /*return*/, metadata];
+                        this.regionDiscoveryMetadata.region_outcome = RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_FAILED;
+                        _e.label = 2;
+                    case 2: return [2 /*return*/, metadata];
                 }
             });
         });
@@ -7716,10 +7757,18 @@ var Authority = /** @class */ (function () {
         }
         return ciamAuthority;
     };
+    // Reserved tenant domain names that will not be replaced with tenant id
+    Authority.reservedTenantDomains = (new Set([
+        "{tenant}",
+        "{tenantid}",
+        AADAuthorityConstants.COMMON,
+        AADAuthorityConstants.CONSUMERS,
+        AADAuthorityConstants.ORGANIZATIONS
+    ]));
     return Authority;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7783,7 +7832,7 @@ var AuthorityFactory = /** @class */ (function () {
     return AuthorityFactory;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7814,7 +7863,7 @@ var ServerTelemetryEntity = /** @class */ (function () {
     return ServerTelemetryEntity;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7842,7 +7891,7 @@ var ThrottlingEntity = /** @class */ (function () {
     return ThrottlingEntity;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7859,7 +7908,7 @@ var StubbedNetworkModule = {
     }
 };
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7904,7 +7953,7 @@ var JoseHeaderError = /** @class */ (function (_super) {
     return JoseHeaderError;
 }(AuthError));
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7944,7 +7993,7 @@ var JoseHeader = /** @class */ (function () {
     return JoseHeader;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8003,7 +8052,7 @@ var AuthenticationHeaderParser = /** @class */ (function () {
     return AuthenticationHeaderParser;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8165,7 +8214,7 @@ var ServerTelemetryManager = /** @class */ (function () {
     return ServerTelemetryManager;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8568,7 +8617,7 @@ var PerformanceClient = /** @class */ (function () {
     return PerformanceClient;
 }());
 
-/*! @azure/msal-common v13.0.0 2023-05-01 */
+/*! @azure/msal-common v13.2.0 2023-07-05 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -10786,14 +10835,15 @@ var DEFAULT_BROWSER_CACHE_MANAGER = function (clientId, logger) {
         temporaryCacheLocation: exports.BrowserCacheLocation.MemoryStorage,
         storeAuthStateInCookie: false,
         secureCookies: false,
-        cacheMigrationEnabled: false
+        cacheMigrationEnabled: false,
+        claimsBasedCachingEnabled: true
     };
     return new BrowserCacheManager(clientId, cacheOptions, DEFAULT_CRYPTO_IMPLEMENTATION, logger);
 };
 
 /* eslint-disable header/header */
 var name = "@azure/msal-browser";
-var version = "2.37.0";
+var version = "2.38.0";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -11258,7 +11308,7 @@ var BaseInteractionClient = /** @class */ (function () {
      * Initializer function for all request APIs
      * @param request
      */
-    BaseInteractionClient.prototype.initializeBaseRequest = function (request) {
+    BaseInteractionClient.prototype.initializeBaseRequest = function (request, account) {
         return __awaiter$1(this, void 0, void 0, function () {
             var authority, scopes, validatedRequest, _a;
             return __generator$1(this, function (_b) {
@@ -11267,6 +11317,12 @@ var BaseInteractionClient = /** @class */ (function () {
                         this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.InitializeBaseRequest, request.correlationId);
                         this.logger.verbose("Initializing BaseAuthRequest");
                         authority = request.authority || this.config.auth.authority;
+                        if (!account) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.validateRequestAuthority(authority, account)];
+                    case 1:
+                        _b.sent();
+                        _b.label = 2;
+                    case 2:
                         scopes = __spread(((request && request.scopes) || []));
                         validatedRequest = __assign$1(__assign$1({}, request), { correlationId: this.correlationId, authority: authority,
                             scopes: scopes });
@@ -11286,13 +11342,13 @@ var BaseInteractionClient = /** @class */ (function () {
                             }
                             this.logger.verbose("Authentication Scheme set to \"" + validatedRequest.authenticationScheme + "\" as configured in Auth request");
                         }
-                        if (!(request.claims && !StringUtils.isEmpty(request.claims))) return [3 /*break*/, 2];
+                        if (!(this.config.cache.claimsBasedCachingEnabled && request.claims && !StringUtils.isEmptyObj(request.claims))) return [3 /*break*/, 4];
                         _a = validatedRequest;
                         return [4 /*yield*/, this.browserCrypto.hashString(request.claims)];
-                    case 1:
+                    case 3:
                         _a.requestedClaimsHash = _b.sent();
-                        _b.label = 2;
-                    case 2: return [2 /*return*/, validatedRequest];
+                        _b.label = 4;
+                    case 4: return [2 /*return*/, validatedRequest];
                 }
             });
         });
@@ -11309,6 +11365,26 @@ var BaseInteractionClient = /** @class */ (function () {
         var redirectUri = requestRedirectUri || this.config.auth.redirectUri || BrowserUtils.getCurrentUri();
         return UrlString.getAbsoluteUrl(redirectUri, BrowserUtils.getCurrentUri());
     };
+    /*
+     * If authority provided in the request does not match environment/authority specified
+     * in the account or MSAL config, we throw an error.
+     */
+    BaseInteractionClient.prototype.validateRequestAuthority = function (authority, account) {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var discoveredAuthority;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getDiscoveredAuthority(authority)];
+                    case 1:
+                        discoveredAuthority = _a.sent();
+                        if (!discoveredAuthority.isAlias(account.environment)) {
+                            throw ClientConfigurationError.createAuthorityMismatchError();
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     /**
      *
      * @param apiId
@@ -11530,6 +11606,9 @@ var StandardInteractionClient = /** @class */ (function (_super) {
                                     logLevel: logger.logLevel,
                                     correlationId: this.correlationId
                                 },
+                                cacheOptions: {
+                                    claimsBasedCachingEnabled: this.config.cache.claimsBasedCachingEnabled
+                                },
                                 cryptoInterface: this.browserCrypto,
                                 networkInterface: this.networkClient,
                                 storageInterface: this.browserStorage,
@@ -11973,6 +12052,7 @@ exports.EventType = void 0;
     EventType["LOGOUT_SUCCESS"] = "msal:logoutSuccess";
     EventType["LOGOUT_FAILURE"] = "msal:logoutFailure";
     EventType["LOGOUT_END"] = "msal:logoutEnd";
+    EventType["RESTORE_FROM_BFCACHE"] = "msal:restoreFromBFCache";
 })(exports.EventType || (exports.EventType = {}));
 
 /*
@@ -12153,7 +12233,7 @@ var SilentCacheClient = /** @class */ (function (_super) {
                         this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.InitializeSilentRequest, this.correlationId);
                         this.performanceClient.setPreQueueTime(exports.PerformanceEvents.InitializeBaseRequest, this.correlationId);
                         _a = [__assign$1({}, request)];
-                        return [4 /*yield*/, this.initializeBaseRequest(request)];
+                        return [4 /*yield*/, this.initializeBaseRequest(request, account)];
                     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 }])];
                 }
             });
@@ -12427,7 +12507,7 @@ var NativeInteractionClient = /** @class */ (function (_super) {
                         result = _a.sent();
                         // cache accounts and tokens in the appropriate storage
                         this.cacheAccount(accountEntity);
-                        this.cacheNativeTokens(response, request, homeAccountIdentifier, idTokenObj, result.accessToken, result.tenantId, reqTimestamp);
+                        this.cacheNativeTokens(response, request, homeAccountIdentifier, accountEntity, idTokenObj, result.accessToken, result.tenantId, reqTimestamp);
                         return [2 /*return*/, result];
                 }
             });
@@ -12583,10 +12663,8 @@ var NativeInteractionClient = /** @class */ (function (_super) {
      * @param tenantId
      * @param reqTimestamp
      */
-    NativeInteractionClient.prototype.cacheNativeTokens = function (response, request, homeAccountIdentifier, idTokenObj, responseAccessToken, tenantId, reqTimestamp) {
-        // cache idToken in inmemory storage
-        var idTokenEntity = IdTokenEntity.createIdTokenEntity(homeAccountIdentifier, request.authority, response.id_token || Constants.EMPTY_STRING, request.clientId, idTokenObj.claims.tid || Constants.EMPTY_STRING);
-        this.nativeStorageManager.setIdTokenCredential(idTokenEntity);
+    NativeInteractionClient.prototype.cacheNativeTokens = function (response, request, homeAccountIdentifier, accountEntity, idTokenObj, responseAccessToken, tenantId, reqTimestamp) {
+        var cachedIdToken = IdTokenEntity.createIdTokenEntity(homeAccountIdentifier, request.authority, response.id_token || Constants.EMPTY_STRING, request.clientId, idTokenObj.claims.tid || Constants.EMPTY_STRING);
         // cache accessToken in inmemory storage
         var expiresIn = (request.tokenType === exports.AuthenticationScheme.POP)
             ? Constants.SHR_NONCE_VALIDITY
@@ -12595,8 +12673,11 @@ var NativeInteractionClient = /** @class */ (function (_super) {
                 : response.expires_in) || 0;
         var tokenExpirationSeconds = reqTimestamp + expiresIn;
         var responseScopes = this.generateScopes(response, request);
-        var accessTokenEntity = AccessTokenEntity.createAccessTokenEntity(homeAccountIdentifier, request.authority, responseAccessToken, request.clientId, tenantId, responseScopes.printScopes(), tokenExpirationSeconds, 0, this.browserCrypto);
-        this.nativeStorageManager.setAccessTokenCredential(accessTokenEntity);
+        var cachedAccessToken = AccessTokenEntity.createAccessTokenEntity(homeAccountIdentifier, request.authority, responseAccessToken, request.clientId, idTokenObj
+            ? idTokenObj.claims.tid || Constants.EMPTY_STRING
+            : tenantId, responseScopes.printScopes(), tokenExpirationSeconds, 0, this.browserCrypto);
+        var nativeCacheRecord = new CacheRecord(accountEntity, cachedIdToken, cachedAccessToken);
+        this.nativeStorageManager.saveCacheRecord(nativeCacheRecord);
     };
     NativeInteractionClient.prototype.addTelemetryFromNativeResponse = function (response) {
         var mats = this.getMATSFromResponse(response);
@@ -12680,6 +12761,12 @@ var NativeInteractionClient = /** @class */ (function (_super) {
                     case 0:
                         this.logger.trace("NativeInteractionClient - initializeNativeRequest called");
                         authority = request.authority || this.config.auth.authority;
+                        if (!request.account) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.validateRequestAuthority(authority, request.account)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2:
                         canonicalAuthority = new UrlString(authority);
                         canonicalAuthority.validateAsUri();
                         scopes = request.scopes, remainingProperties = __rest(request, ["scopes"]);
@@ -12712,7 +12799,7 @@ var NativeInteractionClient = /** @class */ (function (_super) {
                         };
                         validatedRequest = __assign$1(__assign$1({}, remainingProperties), { accountId: this.accountId, clientId: this.config.auth.clientId, authority: canonicalAuthority.urlString, scope: scopeSet.printScopes(), redirectUri: this.getRedirectUri(request.redirectUri), prompt: getPrompt(), correlationId: this.correlationId, tokenType: request.authenticationScheme, windowTitleSubstring: document.title, extraParameters: __assign$1(__assign$1(__assign$1({}, request.extraQueryParameters), request.tokenQueryParameters), { telemetry: NativeConstants.MATS_TELEMETRY }), extendedExpiryToken: false // Make this configurable?
                          });
-                        if (!(request.authenticationScheme === exports.AuthenticationScheme.POP)) return [3 /*break*/, 2];
+                        if (!(request.authenticationScheme === exports.AuthenticationScheme.POP)) return [3 /*break*/, 4];
                         shrParameters = {
                             resourceRequestUri: request.resourceRequestUri,
                             resourceRequestMethod: request.resourceRequestMethod,
@@ -12721,13 +12808,13 @@ var NativeInteractionClient = /** @class */ (function (_super) {
                         };
                         popTokenGenerator = new PopTokenGenerator(this.browserCrypto);
                         return [4 /*yield*/, popTokenGenerator.generateCnf(shrParameters)];
-                    case 1:
+                    case 3:
                         reqCnfData = _a.sent();
-                        // to reduce the URL length, it is recommended to send the hash of the req_cnf instead of the whole string
-                        validatedRequest.reqCnf = reqCnfData.reqCnfHash;
+                        // to reduce the URL length, it is recommended to send the short form of the req_cnf 
+                        validatedRequest.reqCnf = reqCnfData.reqCnfString;
                         validatedRequest.keyId = reqCnfData.kid;
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, validatedRequest];
+                        _a.label = 4;
+                    case 4: return [2 /*return*/, validatedRequest];
                 }
             });
         });
@@ -13029,6 +13116,7 @@ var RedirectClient = /** @class */ (function (_super) {
                             if (event.persisted) {
                                 _this.logger.verbose("Page was restored from back/forward cache. Clearing temporary cache.");
                                 _this.browserStorage.cleanRequestByState(validRequest.state);
+                                _this.eventHandler.emitEvent(exports.EventType.RESTORE_FROM_BFCACHE, exports.InteractionType.Redirect);
                             }
                         };
                         _a.label = 2;
@@ -13220,7 +13308,7 @@ var RedirectClient = /** @class */ (function (_super) {
                             if (!this.nativeMessageHandler) {
                                 throw BrowserAuthError.createNativeConnectionNotEstablishedError();
                             }
-                            nativeInteractionClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, exports.ApiId.acquireTokenPopup, this.performanceClient, this.nativeMessageHandler, serverParams.accountId, this.browserStorage, cachedRequest.correlationId);
+                            nativeInteractionClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, exports.ApiId.acquireTokenPopup, this.performanceClient, this.nativeMessageHandler, serverParams.accountId, this.nativeStorage, cachedRequest.correlationId);
                             userRequestState = ProtocolUtils.parseRequestState(this.browserCrypto, state).userRequestState;
                             return [2 /*return*/, nativeInteractionClient.acquireToken(__assign$1(__assign$1({}, cachedRequest), { state: userRequestState, prompt: undefined // Server should handle the prompt, ideally native broker can do this part silently
                                  })).finally(function () {
@@ -13921,7 +14009,8 @@ function buildConfiguration(_a, isBrowserEnvironment) {
         storeAuthStateInCookie: false,
         secureCookies: false,
         // Default cache migration to true if cache location is localStorage since entries are preserved across tabs/windows. Migration has little to no benefit in sessionStorage and memoryStorage
-        cacheMigrationEnabled: userInputCache && userInputCache.cacheLocation === exports.BrowserCacheLocation.LocalStorage ? true : false
+        cacheMigrationEnabled: userInputCache && userInputCache.cacheLocation === exports.BrowserCacheLocation.LocalStorage ? true : false,
+        claimsBasedCachingEnabled: true
     };
     // Default logger options for browser
     var DEFAULT_LOGGER_OPTIONS = {
@@ -14274,7 +14363,7 @@ var SilentRefreshClient = /** @class */ (function (_super) {
                         this.performanceClient.addQueueMeasurement(exports.PerformanceEvents.SilentRefreshClientAcquireToken, request.correlationId);
                         this.performanceClient.setPreQueueTime(exports.PerformanceEvents.InitializeBaseRequest, request.correlationId);
                         _a = [__assign$1({}, request)];
-                        return [4 /*yield*/, this.initializeBaseRequest(request)];
+                        return [4 /*yield*/, this.initializeBaseRequest(request, request.account)];
                     case 1:
                         silentRequest = __assign$1.apply(void 0, _a.concat([_b.sent()]));
                         acquireTokenMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.SilentRefreshClientAcquireToken, silentRequest.correlationId);
@@ -16606,7 +16695,8 @@ var ClientApplication = /** @class */ (function () {
             temporaryCacheLocation: exports.BrowserCacheLocation.MemoryStorage,
             storeAuthStateInCookie: false,
             secureCookies: false,
-            cacheMigrationEnabled: false
+            cacheMigrationEnabled: false,
+            claimsBasedCachingEnabled: true
         };
         this.nativeInternalStorage = new BrowserCacheManager(this.config.auth.clientId, nativeCacheOptions, this.browserCrypto, this.logger);
         // Initialize the token cache
@@ -17974,6 +18064,7 @@ var EventMessageUtils = /** @class */ (function () {
             case exports.EventType.LOGIN_FAILURE:
             case exports.EventType.ACQUIRE_TOKEN_SUCCESS:
             case exports.EventType.ACQUIRE_TOKEN_FAILURE:
+            case exports.EventType.RESTORE_FROM_BFCACHE:
                 if (message.interactionType === exports.InteractionType.Redirect || message.interactionType === exports.InteractionType.Popup) {
                     if (currentStatus && currentStatus !== exports.InteractionStatus.Login && currentStatus !== exports.InteractionStatus.AcquireToken) {
                         // Prevent this event from clearing any status other than login or acquireToken