@azure/msal-browser 2.27.0 → 2.28.2

package/dist/index.cjs.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v2.27.0 2022-07-05 */
+/*! @azure/msal-browser v2.28.2 2022-09-06 */
 'use strict';
 'use strict';
 
@@ -44,6 +44,18 @@ var __assign$1 = function() {
     return __assign$1.apply(this, arguments);
 };
 
+function __rest(s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+}
+
 function __awaiter$1(thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -105,7 +117,7 @@ function __spread() {
     return ar;
 }
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -192,7 +204,7 @@ function __spreadArrays() {
     return r;
 }
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -242,7 +254,8 @@ var Constants = {
     REGIONAL_AUTH_PUBLIC_CLOUD_SUFFIX: "login.microsoft.com",
     KNOWN_PUBLIC_CLOUDS: ["login.microsoftonline.com", "login.windows.net", "login.microsoft.com", "sts.windows.net"],
     TOKEN_RESPONSE_TYPE: "token",
-    ID_TOKEN_RESPONSE_TYPE: "id_token"
+    ID_TOKEN_RESPONSE_TYPE: "id_token",
+    SHR_NONCE_VALIDITY: 240
 };
 var OIDC_DEFAULT_SCOPES = [
     Constants.OPENID_SCOPE,
@@ -274,6 +287,7 @@ var PersistentCacheKeys;
     PersistentCacheKeys["ERROR"] = "error";
     PersistentCacheKeys["ERROR_DESC"] = "error.description";
     PersistentCacheKeys["ACTIVE_ACCOUNT"] = "active-account";
+    PersistentCacheKeys["ACTIVE_ACCOUNT_FILTERS"] = "active-account-filters"; // new cache entry for active_account for a more robust version for browser
 })(PersistentCacheKeys || (PersistentCacheKeys = {}));
 /**
  * String constants related to AAD Authority
@@ -567,7 +581,7 @@ var JsonTypes;
     JsonTypes["Jwk"] = "JWK";
 })(JsonTypes || (JsonTypes = {}));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -580,6 +594,10 @@ var AuthErrorMessage = {
     unexpectedError: {
         code: "unexpected_error",
         desc: "Unexpected error in authentication."
+    },
+    postRequestFailed: {
+        code: "post_request_failed",
+        desc: "Post request failed from the network, could be a 4xx/5xx or a network unavailability. Please check the exact error code for details."
     }
 };
 /**
@@ -608,10 +626,18 @@ var AuthError = /** @class */ (function (_super) {
     AuthError.createUnexpectedError = function (errDesc) {
         return new AuthError(AuthErrorMessage.unexpectedError.code, AuthErrorMessage.unexpectedError.desc + ": " + errDesc);
     };
+    /**
+     * Creates an error for post request failures.
+     * @param errDesc
+     * @returns
+     */
+    AuthError.createPostRequestFailed = function (errDesc) {
+        return new AuthError(AuthErrorMessage.postRequestFailed.code, AuthErrorMessage.postRequestFailed.desc + ": " + errDesc);
+    };
     return AuthError;
 }(Error));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -686,7 +712,7 @@ var DEFAULT_CRYPTO_IMPLEMENTATION = {
     }
 };
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1158,7 +1184,7 @@ var ClientAuthError = /** @class */ (function (_super) {
     return ClientAuthError;
 }(AuthError));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1283,7 +1309,7 @@ var StringUtils = /** @class */ (function () {
     return StringUtils;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1463,12 +1489,12 @@ var Logger = /** @class */ (function () {
     return Logger;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 /* eslint-disable header/header */
 var name$1 = "@azure/msal-common";
-var version$1 = "7.1.0";
+var version$1 = "7.4.0";
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1489,7 +1515,7 @@ exports.AzureCloudInstance = void 0;
     AzureCloudInstance["AzureUsGovernment"] = "https://login.microsoftonline.us";
 })(exports.AzureCloudInstance || (exports.AzureCloudInstance = {}));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1648,7 +1674,7 @@ var CredentialEntity = /** @class */ (function () {
     return CredentialEntity;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1903,7 +1929,7 @@ var ClientConfigurationError = /** @class */ (function (_super) {
     return ClientConfigurationError;
 }(ClientAuthError));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2087,7 +2113,7 @@ var ScopeSet = /** @class */ (function () {
     return ScopeSet;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2107,7 +2133,7 @@ function buildClientInfo(rawClientInfo, crypto) {
         return JSON.parse(decodedClientInfo);
     }
     catch (e) {
-        throw ClientAuthError.createClientInfoDecodingError(e);
+        throw ClientAuthError.createClientInfoDecodingError(e.message);
     }
 }
 /**
@@ -2125,7 +2151,7 @@ function buildClientInfoFromHomeAccountId(homeAccountId) {
     };
 }
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -2139,7 +2165,7 @@ var AuthorityType;
     AuthorityType[AuthorityType["Adfs"] = 1] = "Adfs";
 })(AuthorityType || (AuthorityType = {}));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2374,7 +2400,7 @@ var AccountEntity = /** @class */ (function () {
     return AccountEntity;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2412,7 +2438,7 @@ var AuthToken = /** @class */ (function () {
     return AuthToken;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2443,6 +2469,7 @@ var CacheManager = /** @class */ (function () {
                 var accountInfo = accountEntity.getAccountInfo();
                 var idToken = _this.readIdTokenFromCache(_this.clientId, accountInfo);
                 if (idToken && !accountInfo.idTokenClaims) {
+                    accountInfo.idToken = idToken.secret;
                     accountInfo.idTokenClaims = new AuthToken(idToken.secret, _this.cryptoImpl).claims;
                 }
                 return accountInfo;
@@ -2534,7 +2561,7 @@ var CacheManager = /** @class */ (function () {
      * @param realm
      */
     CacheManager.prototype.getAccountsFilteredBy = function (accountFilter) {
-        return this.getAccountsFilteredByInternal(accountFilter ? accountFilter.homeAccountId : Constants.EMPTY_STRING, accountFilter ? accountFilter.environment : Constants.EMPTY_STRING, accountFilter ? accountFilter.realm : Constants.EMPTY_STRING);
+        return this.getAccountsFilteredByInternal(accountFilter ? accountFilter.homeAccountId : Constants.EMPTY_STRING, accountFilter ? accountFilter.environment : Constants.EMPTY_STRING, accountFilter ? accountFilter.realm : Constants.EMPTY_STRING, accountFilter ? accountFilter.nativeAccountId : Constants.EMPTY_STRING);
     };
     /**
      * retrieve accounts matching all provided filters; if no filter is set, get all accounts
@@ -2543,7 +2570,7 @@ var CacheManager = /** @class */ (function () {
      * @param environment
      * @param realm
      */
-    CacheManager.prototype.getAccountsFilteredByInternal = function (homeAccountId, environment, realm) {
+    CacheManager.prototype.getAccountsFilteredByInternal = function (homeAccountId, environment, realm, nativeAccountId) {
         var _this = this;
         var allCacheKeys = this.getKeys();
         var matchingAccounts = {};
@@ -2561,6 +2588,9 @@ var CacheManager = /** @class */ (function () {
             if (!!realm && !_this.matchRealm(entity, realm)) {
                 return;
             }
+            if (!!nativeAccountId && !_this.matchNativeAccountId(entity, nativeAccountId)) {
+                return;
+            }
             matchingAccounts[cacheKey] = entity;
         });
         return matchingAccounts;
@@ -2889,6 +2919,26 @@ var CacheManager = /** @class */ (function () {
         var accountKey = AccountEntity.generateAccountCacheKey(account);
         return this.getAccount(accountKey);
     };
+    /**
+     * Retrieve AccountEntity from cache
+     * @param nativeAccountId
+     * @returns AccountEntity or Null
+     */
+    CacheManager.prototype.readAccountFromCacheWithNativeAccountId = function (nativeAccountId) {
+        // fetch account from memory
+        var accountFilter = {
+            nativeAccountId: nativeAccountId
+        };
+        var accountCache = this.getAccountsFilteredBy(accountFilter);
+        var accounts = Object.keys(accountCache).map(function (key) { return accountCache[key]; });
+        if (accounts.length < 1) {
+            return null;
+        }
+        else if (accounts.length > 1) {
+            throw ClientAuthError.createMultipleMatchingAccountsInCacheError();
+        }
+        return accountCache[0];
+    };
     /**
      * Retrieve IdTokenEntity from cache
      * @param clientId
@@ -3063,6 +3113,15 @@ var CacheManager = /** @class */ (function () {
     CacheManager.prototype.matchRealm = function (entity, realm) {
         return !!(entity.realm && realm === entity.realm);
     };
+    /**
+     * helper to match nativeAccountId
+     * @param entity
+     * @param nativeAccountId
+     * @returns boolean indicating the match result
+     */
+    CacheManager.prototype.matchNativeAccountId = function (entity, nativeAccountId) {
+        return !!(entity.nativeAccountId && nativeAccountId === entity.nativeAccountId);
+    };
     /**
      * Returns true if the target scopes are a subset of the current entity's scopes, false otherwise.
      * @param entity
@@ -3254,7 +3313,7 @@ var DefaultStorageClass = /** @class */ (function (_super) {
     return DefaultStorageClass;
 }(CacheManager));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3337,7 +3396,7 @@ function buildClientConfiguration(_a) {
         telemetry: __assign(__assign({}, DEFAULT_TELEMETRY_OPTIONS), telemetry),
         serverTelemetryManager: serverTelemetryManager || null,
         persistencePlugin: persistencePlugin || null,
-        serializableCache: serializableCache || null
+        serializableCache: serializableCache || null,
     };
 }
 /**
@@ -3348,7 +3407,7 @@ function buildAuthOptions(authOptions) {
     return __assign({ clientCapabilities: [], azureCloudOptions: DEFAULT_AZURE_CLOUD_OPTIONS, skipAuthorityMetadataCache: false }, authOptions);
 }
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3368,7 +3427,7 @@ var ServerError = /** @class */ (function (_super) {
     return ServerError;
 }(AuthError));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3464,7 +3523,7 @@ var ThrottlingUtils = /** @class */ (function () {
     return ThrottlingUtils;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3513,7 +3572,7 @@ var NetworkManager = /** @class */ (function () {
     return NetworkManager;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3524,7 +3583,7 @@ var CcsCredentialType;
     CcsCredentialType["UPN"] = "UPN";
 })(CcsCredentialType || (CcsCredentialType = {}));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3534,7 +3593,7 @@ var CcsCredentialType;
  * Base application class which will construct requests to send to and handle responses from the Microsoft STS using the authorization code flow.
  */
 var BaseClient = /** @class */ (function () {
-    function BaseClient(configuration) {
+    function BaseClient(configuration, performanceClient) {
         // Set the configuration
         this.config = buildClientConfiguration(configuration);
         // Initialize the logger
@@ -3551,6 +3610,8 @@ var BaseClient = /** @class */ (function () {
         this.serverTelemetryManager = this.config.serverTelemetryManager;
         // set Authority
         this.authority = this.config.authOptions.authority;
+        // set performance telemetry client
+        this.performanceClient = performanceClient;
     }
     /**
      * Creates default headers for requests to token endpoint
@@ -3613,7 +3674,7 @@ var BaseClient = /** @class */ (function () {
     return BaseClient;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3699,7 +3760,7 @@ var RequestValidator = /** @class */ (function () {
     return RequestValidator;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4077,7 +4138,7 @@ var RequestParameterBuilder = /** @class */ (function () {
     return RequestParameterBuilder;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4141,7 +4202,7 @@ var IdTokenEntity = /** @class */ (function (_super) {
     return IdTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4191,7 +4252,7 @@ var TimeUtils = /** @class */ (function () {
     return TimeUtils;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4305,7 +4366,7 @@ var AccessTokenEntity = /** @class */ (function (_super) {
     return AccessTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4372,7 +4433,7 @@ var RefreshTokenEntity = /** @class */ (function (_super) {
     return RefreshTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4447,7 +4508,7 @@ var InteractionRequiredAuthError = /** @class */ (function (_super) {
     return InteractionRequiredAuthError;
 }(AuthError));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4463,7 +4524,7 @@ var CacheRecord = /** @class */ (function () {
     return CacheRecord;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4534,7 +4595,7 @@ var ProtocolUtils = /** @class */ (function () {
     return ProtocolUtils;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4697,6 +4758,21 @@ var UrlString = /** @class */ (function () {
         }
         return Constants.EMPTY_STRING;
     };
+    /**
+     * Parses query string from given string. Returns empty string if no query symbol is found.
+     * @param queryString
+     */
+    UrlString.parseQueryString = function (queryString) {
+        var queryIndex1 = queryString.indexOf("?");
+        var queryIndex2 = queryString.indexOf("/?");
+        if (queryIndex2 > -1) {
+            return queryString.substring(queryIndex2 + 2);
+        }
+        else if (queryIndex1 > -1) {
+            return queryString.substring(queryIndex1 + 1);
+        }
+        return Constants.EMPTY_STRING;
+    };
     UrlString.constructAuthorityUriFromObject = function (urlObject) {
         return new UrlString(urlObject.Protocol + "//" + urlObject.HostNameAndPort + "/" + urlObject.PathSegments.join("/"));
     };
@@ -4718,6 +4794,24 @@ var UrlString = /** @class */ (function () {
         }
         return deserializedHash;
     };
+    /**
+     * Returns URL query string as server auth code response object.
+     */
+    UrlString.getDeserializedQueryString = function (query) {
+        // Check if given query is empty
+        if (StringUtils.isEmpty(query)) {
+            return {};
+        }
+        // Strip the ? symbol if present
+        var parsedQueryString = UrlString.parseQueryString(query);
+        // If ? symbol was not present, above will return empty string, so give original query value
+        var deserializedQueryString = StringUtils.queryStringToObject(StringUtils.isEmpty(parsedQueryString) ? query : parsedQueryString);
+        // Check if deserialization didn't work
+        if (!deserializedQueryString) {
+            throw ClientAuthError.createHashNotDeserializedError(JSON.stringify(deserializedQueryString));
+        }
+        return deserializedQueryString;
+    };
     /**
      * Check if the hash of the URL string contains known properties
      */
@@ -4735,7 +4829,7 @@ var UrlString = /** @class */ (function () {
     return UrlString;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4836,7 +4930,7 @@ var PopTokenGenerator = /** @class */ (function () {
     return PopTokenGenerator;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4906,7 +5000,7 @@ var AppMetadataEntity = /** @class */ (function () {
     return AppMetadataEntity;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4942,7 +5036,7 @@ var AppMetadataEntity = /** @class */ (function () {
     return TokenCacheContext;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5003,7 +5097,7 @@ var ResponseHandler = /** @class */ (function () {
      * @param serverTokenResponse
      * @param authority
      */
-    ResponseHandler.prototype.handleServerTokenResponse = function (serverTokenResponse, authority, reqTimestamp, request, authCodePayload, userAssertionHash, handlingRefreshTokenResponse) {
+    ResponseHandler.prototype.handleServerTokenResponse = function (serverTokenResponse, authority, reqTimestamp, request, authCodePayload, userAssertionHash, handlingRefreshTokenResponse, forceCacheRefreshTokenResponse) {
         return __awaiter(this, void 0, void 0, function () {
             var idTokenObj, requestStateObj, cacheRecord, cacheContext, key, account;
             return __generator(this, function (_a) {
@@ -5040,14 +5134,15 @@ var ResponseHandler = /** @class */ (function () {
                         /*
                          * When saving a refreshed tokens to the cache, it is expected that the account that was used is present in the cache.
                          * If not present, we should return null, as it's the case that another application called removeAccount in between
-                         * the calls to getAllAccounts and acquireTokenSilent. We should not overwrite that removal.
+                         * the calls to getAllAccounts and acquireTokenSilent. We should not overwrite that removal, unless explicitly flagged by
+                         * the developer, as in the case of refresh token flow used in ADAL Node to MSAL Node migration.
                          */
-                        if (handlingRefreshTokenResponse && cacheRecord.account) {
+                        if (handlingRefreshTokenResponse && !forceCacheRefreshTokenResponse && cacheRecord.account) {
                             key = cacheRecord.account.generateAccountKey();
                             account = this.cacheStorage.getAccount(key);
                             if (!account) {
                                 this.logger.warning("Account used to refresh tokens not in persistence, refreshed tokens will not be stored in the cache");
-                                return [2 /*return*/, ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, idTokenObj, requestStateObj)];
+                                return [2 /*return*/, ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, idTokenObj, requestStateObj, undefined)];
                             }
                         }
                         return [4 /*yield*/, this.cacheStorage.saveCacheRecord(cacheRecord)];
@@ -5212,7 +5307,7 @@ var ResponseHandler = /** @class */ (function () {
     return ResponseHandler;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5313,7 +5408,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
             throw ClientConfigurationError.createEmptyLogoutRequestError();
         }
         var queryString = this.createLogoutUrlQueryString(logoutRequest);
-        // Construct logout URI.
+        // Construct logout URI
         return UrlString.appendQueryString(this.authority.endSessionEndpoint, queryString);
     };
     /**
@@ -5500,7 +5595,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
      */
     AuthorizationCodeClient.prototype.createAuthCodeUrlQueryString = function (request) {
         return __awaiter(this, void 0, void 0, function () {
-            var parameterBuilder, requestScopes, correlationId, accountSid, clientInfo, clientInfo, popTokenGenerator, reqCnfData;
+            var parameterBuilder, requestScopes, correlationId, accountSid, accountLoginHintClaim, clientInfo, clientInfo, clientInfo, popTokenGenerator, reqCnfData;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -5530,7 +5625,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                         if (request.domainHint) {
                             parameterBuilder.addDomainHint(request.domainHint);
                         }
-                        // Add sid or loginHint with preference for sid -> loginHint -> username of AccountInfo object
+                        // Add sid or loginHint with preference for login_hint claim (in request) -> sid -> loginHint (upn/email) -> username of AccountInfo object
                         if (request.prompt !== PromptValue.SELECT_ACCOUNT) {
                             // AAD will throw if prompt=select_account is passed with an account hint
                             if (request.sid && request.prompt === PromptValue.NONE) {
@@ -5540,9 +5635,24 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                             }
                             else if (request.account) {
                                 accountSid = this.extractAccountSid(request.account);
-                                // If account and loginHint are provided, we will check account first for sid before adding loginHint
-                                if (accountSid && request.prompt === PromptValue.NONE) {
-                                    // SessionId is only used in silent calls
+                                accountLoginHintClaim = this.extractLoginHint(request.account);
+                                // If login_hint claim is present, use it over sid/username
+                                if (accountLoginHintClaim) {
+                                    this.logger.verbose("createAuthCodeUrlQueryString: login_hint claim present on account");
+                                    parameterBuilder.addLoginHint(accountLoginHintClaim);
+                                    try {
+                                        clientInfo = buildClientInfoFromHomeAccountId(request.account.homeAccountId);
+                                        parameterBuilder.addCcsOid(clientInfo);
+                                    }
+                                    catch (e) {
+                                        this.logger.verbose("createAuthCodeUrlQueryString: Could not parse home account ID for CCS Header");
+                                    }
+                                }
+                                else if (accountSid && request.prompt === PromptValue.NONE) {
+                                    /*
+                                     * If account and loginHint are provided, we will check account first for sid before adding loginHint
+                                     * SessionId is only used in silent calls
+                                     */
                                     this.logger.verbose("createAuthCodeUrlQueryString: Prompt is none, adding sid from account");
                                     parameterBuilder.addSid(accountSid);
                                     try {
@@ -5550,7 +5660,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                                         parameterBuilder.addCcsOid(clientInfo);
                                     }
                                     catch (e) {
-                                        this.logger.verbose("Could not parse home account ID for CCS Header: " + e);
+                                        this.logger.verbose("createAuthCodeUrlQueryString: Could not parse home account ID for CCS Header");
                                     }
                                 }
                                 else if (request.loginHint) {
@@ -5567,7 +5677,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                                         parameterBuilder.addCcsOid(clientInfo);
                                     }
                                     catch (e) {
-                                        this.logger.verbose("Could not parse home account ID for CCS Header: " + e);
+                                        this.logger.verbose("createAuthCodeUrlQueryString: Could not parse home account ID for CCS Header");
                                     }
                                 }
                             }
@@ -5638,16 +5748,135 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
      * @param account
      */
     AuthorizationCodeClient.prototype.extractAccountSid = function (account) {
-        if (account.idTokenClaims) {
-            var tokenClaims = account.idTokenClaims;
-            return tokenClaims.sid || null;
-        }
-        return null;
+        var _a;
+        return ((_a = account.idTokenClaims) === null || _a === void 0 ? void 0 : _a.sid) || null;
+    };
+    AuthorizationCodeClient.prototype.extractLoginHint = function (account) {
+        var _a;
+        return ((_a = account.idTokenClaims) === null || _a === void 0 ? void 0 : _a.login_hint) || null;
     };
     return AuthorizationCodeClient;
 }(BaseClient));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+/**
+ * Enumeration of operations that are instrumented by have their performance measured by the PerformanceClient.
+ *
+ * @export
+ * @enum {number}
+ */
+exports.PerformanceEvents = void 0;
+(function (PerformanceEvents) {
+    /**
+     * acquireTokenByCode API (msal-browser and msal-node).
+     * Used to acquire tokens by trading an authorization code against the token endpoint.
+     */
+    PerformanceEvents["AcquireTokenByCode"] = "acquireTokenByCode";
+    /**
+     * acquireTokenByRefreshToken API (msal-browser and msal-node).
+     * Used to renew an access token using a refresh token against the token endpoint.
+     */
+    PerformanceEvents["AcquireTokenByRefreshToken"] = "acquireTokenByRefreshToken";
+    /**
+     * acquireTokenSilent API (msal-browser and msal-node).
+     * Used to silently acquire a new access token (from the cache or the network).
+     */
+    PerformanceEvents["AcquireTokenSilent"] = "acquireTokenSilent";
+    /**
+     * acquireTokenSilentAsync (msal-browser).
+     * Internal API for acquireTokenSilent.
+     */
+    PerformanceEvents["AcquireTokenSilentAsync"] = "acquireTokenSilentAsync";
+    /**
+     * acquireTokenPopup (msal-browser).
+     * Used to acquire a new access token interactively through pop ups
+     */
+    PerformanceEvents["AcquireTokenPopup"] = "acquireTokenPopup";
+    /**
+     * getPublicKeyThumbprint API in CryptoOpts class (msal-browser).
+     * Used to generate a public/private keypair and generate a public key thumbprint for pop requests.
+     */
+    PerformanceEvents["CryptoOptsGetPublicKeyThumbprint"] = "cryptoOptsGetPublicKeyThumbprint";
+    /**
+     * signJwt API in CryptoOpts class (msal-browser).
+     * Used to signed a pop token.
+     */
+    PerformanceEvents["CryptoOptsSignJwt"] = "cryptoOptsSignJwt";
+    /**
+     * acquireToken API in the SilentCacheClient class (msal-browser).
+     * Used to read access tokens from the cache.
+     */
+    PerformanceEvents["SilentCacheClientAcquireToken"] = "silentCacheClientAcquireToken";
+    /**
+     * acquireToken API in the SilentIframeClient class (msal-browser).
+     * Used to acquire a new set of tokens from the authorize endpoint in a hidden iframe.
+     */
+    PerformanceEvents["SilentIframeClientAcquireToken"] = "silentIframeClientAcquireToken";
+    /**
+     * acquireToken API in SilentRereshClient (msal-browser).
+     * Used to acquire a new set of tokens from the token endpoint using a refresh token.
+     */
+    PerformanceEvents["SilentRefreshClientAcquireToken"] = "silentRefreshClientAcquireToken";
+    /**
+     * ssoSilent API (msal-browser).
+     * Used to silently acquire an authorization code and set of tokens using a hidden iframe.
+     */
+    PerformanceEvents["SsoSilent"] = "ssoSilent";
+    /**
+     * getDiscoveredAuthority API in StandardInteractionClient class (msal-browser).
+     * Used to load authority metadata for a request.
+     */
+    PerformanceEvents["StandardInteractionClientGetDiscoveredAuthority"] = "standardInteractionClientGetDiscoveredAuthority";
+    /**
+     * acquireToken APIs in msal-browser.
+     * Used to make an /authorize endpoint call with native brokering enabled.
+     */
+    PerformanceEvents["FetchAccountIdWithNativeBroker"] = "fetchAccountIdWithNativeBroker";
+    /**
+     * acquireToken API in NativeInteractionClient class (msal-browser).
+     * Used to acquire a token from Native component when native brokering is enabled.
+     */
+    PerformanceEvents["NativeInteractionClientAcquireToken"] = "nativeInteractionClientAcquireToken";
+    /**
+     * Time spent on the network for refresh token acquisition
+     */
+    PerformanceEvents["RefreshTokenClientExecuteTokenRequest"] = "refreshTokenClientExecuteTokenRequest";
+    /**
+     * Time spent creating default headers for requests to token endpoint
+     */
+    PerformanceEvents["BaseClientCreateTokenRequestHeaders"] = "baseClientCreateTokenRequestHeaders";
+    /**
+     * Used to measure the time taken for completing embedded-broker handshake (PW-Broker).
+     */
+    PerformanceEvents["BrokerHandhshake"] = "brokerHandshake";
+    /**
+     * acquireTokenByRefreshToken API in BrokerClientApplication (PW-Broker) .
+     */
+    PerformanceEvents["AcquireTokenByRefreshTokenInBroker"] = "acquireTokenByRefreshTokenInBroker";
+    /**
+     * acquireToken API in BrokerClientApplication.
+     * Used to acquire a token on behalf of the embedded application (PW-Broker).
+     */
+    PerformanceEvents["AcquireTokenByBroker"] = "acquireTokenByBroker";
+})(exports.PerformanceEvents || (exports.PerformanceEvents = {}));
+/**
+ * State of the performance event.
+ *
+ * @export
+ * @enum {number}
+ */
+var PerformanceEventStatus;
+(function (PerformanceEventStatus) {
+    PerformanceEventStatus[PerformanceEventStatus["NotStarted"] = 0] = "NotStarted";
+    PerformanceEventStatus[PerformanceEventStatus["InProgress"] = 1] = "InProgress";
+    PerformanceEventStatus[PerformanceEventStatus["Completed"] = 2] = "Completed";
+})(PerformanceEventStatus || (PerformanceEventStatus = {}));
+
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5658,8 +5887,8 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
  */
 var RefreshTokenClient = /** @class */ (function (_super) {
     __extends(RefreshTokenClient, _super);
-    function RefreshTokenClient(configuration) {
-        return _super.call(this, configuration) || this;
+    function RefreshTokenClient(configuration, performanceClient) {
+        return _super.call(this, configuration, performanceClient) || this;
     }
     RefreshTokenClient.prototype.acquireToken = function (request) {
         return __awaiter(this, void 0, void 0, function () {
@@ -5673,7 +5902,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                         response = _a.sent();
                         responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin);
                         responseHandler.validateTokenResponse(response.body);
-                        return [2 /*return*/, responseHandler.handleServerTokenResponse(response.body, this.authority, reqTimestamp, request, undefined, undefined, true)];
+                        return [2 /*return*/, responseHandler.handleServerTokenResponse(response.body, this.authority, reqTimestamp, request, undefined, undefined, true, request.forceCache)];
                 }
             });
         });
@@ -5745,13 +5974,16 @@ var RefreshTokenClient = /** @class */ (function (_super) {
      * @param authority
      */
     RefreshTokenClient.prototype.executeTokenRequest = function (request, authority) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var requestBody, queryParameters, headers, thumbprint, endpoint;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.createTokenRequestBody(request)];
+            var acquireTokenMeasurement, requestBody, queryParameters, headers, thumbprint, endpoint;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        acquireTokenMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.RefreshTokenClientExecuteTokenRequest, request.correlationId);
+                        return [4 /*yield*/, this.createTokenRequestBody(request)];
                     case 1:
-                        requestBody = _a.sent();
+                        requestBody = _b.sent();
                         queryParameters = this.createTokenQueryParameters(request);
                         headers = this.createTokenRequestHeaders(request.ccsCredential);
                         thumbprint = {
@@ -5766,7 +5998,19 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                             sshKid: request.sshKid
                         };
                         endpoint = UrlString.appendQueryString(authority.tokenEndpoint, queryParameters);
-                        return [2 /*return*/, this.executePostToTokenEndpoint(endpoint, requestBody, headers, thumbprint)];
+                        return [2 /*return*/, this.executePostToTokenEndpoint(endpoint, requestBody, headers, thumbprint)
+                                .then(function (result) {
+                                acquireTokenMeasurement === null || acquireTokenMeasurement === void 0 ? void 0 : acquireTokenMeasurement.endMeasurement({
+                                    success: true
+                                });
+                                return result;
+                            })
+                                .catch(function (error) {
+                                acquireTokenMeasurement === null || acquireTokenMeasurement === void 0 ? void 0 : acquireTokenMeasurement.endMeasurement({
+                                    success: false
+                                });
+                                throw error;
+                            })];
                 }
             });
         });
@@ -5787,11 +6031,14 @@ var RefreshTokenClient = /** @class */ (function (_super) {
      * @param request
      */
     RefreshTokenClient.prototype.createTokenRequestBody = function (request) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var parameterBuilder, correlationId, clientAssertion, popTokenGenerator, reqCnfData, clientInfo;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var correlationId, acquireTokenMeasurement, parameterBuilder, clientAssertion, popTokenGenerator, reqCnfData, clientInfo;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
+                        correlationId = request.correlationId;
+                        acquireTokenMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.BaseClientCreateTokenRequestHeaders, correlationId);
                         parameterBuilder = new RequestParameterBuilder();
                         parameterBuilder.addClientId(this.config.authOptions.clientId);
                         parameterBuilder.addScopes(request.scopes);
@@ -5803,7 +6050,6 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                         if (this.serverTelemetryManager) {
                             parameterBuilder.addServerTelemetry(this.serverTelemetryManager);
                         }
-                        correlationId = request.correlationId || this.config.cryptoInterface.createNewGuid();
                         parameterBuilder.addCorrelationId(correlationId);
                         parameterBuilder.addRefreshToken(request.refreshToken);
                         if (this.config.clientCredentials.clientSecret) {
@@ -5818,7 +6064,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                         popTokenGenerator = new PopTokenGenerator(this.cryptoUtils);
                         return [4 /*yield*/, popTokenGenerator.generateCnf(request)];
                     case 1:
-                        reqCnfData = _a.sent();
+                        reqCnfData = _b.sent();
                         // SPA PoP requires full Base64Url encoded req_cnf string (unhashed)
                         parameterBuilder.addPopToken(reqCnfData.reqCnfString);
                         return [3 /*break*/, 3];
@@ -5828,10 +6074,13 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                                 parameterBuilder.addSshJwk(request.sshJwk);
                             }
                             else {
+                                acquireTokenMeasurement === null || acquireTokenMeasurement === void 0 ? void 0 : acquireTokenMeasurement.endMeasurement({
+                                    success: false
+                                });
                                 throw ClientConfigurationError.createMissingSshJwkError();
                             }
                         }
-                        _a.label = 3;
+                        _b.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);
@@ -5852,6 +6101,9 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                                     break;
                             }
                         }
+                        acquireTokenMeasurement === null || acquireTokenMeasurement === void 0 ? void 0 : acquireTokenMeasurement.endMeasurement({
+                            success: true
+                        });
                         return [2 /*return*/, parameterBuilder.createQueryString()];
                 }
             });
@@ -5860,7 +6112,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
     return RefreshTokenClient;
 }(BaseClient));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5868,8 +6120,8 @@ var RefreshTokenClient = /** @class */ (function (_super) {
  */
 var SilentFlowClient = /** @class */ (function (_super) {
     __extends(SilentFlowClient, _super);
-    function SilentFlowClient(configuration) {
-        return _super.call(this, configuration) || this;
+    function SilentFlowClient(configuration, performanceClient) {
+        return _super.call(this, configuration, performanceClient) || this;
     }
     /**
      * Retrieves a token from cache if it is still valid, or uses the cached refresh token to renew
@@ -5888,7 +6140,7 @@ var SilentFlowClient = /** @class */ (function (_super) {
                     case 2:
                         e_1 = _a.sent();
                         if (e_1 instanceof ClientAuthError && e_1.errorCode === ClientAuthErrorMessage.tokenRefreshRequired.code) {
-                            refreshTokenClient = new RefreshTokenClient(this.config);
+                            refreshTokenClient = new RefreshTokenClient(this.config, this.performanceClient);
                             return [2 /*return*/, refreshTokenClient.acquireTokenByRefreshToken(request)];
                         }
                         else {
@@ -5976,7 +6228,7 @@ var SilentFlowClient = /** @class */ (function (_super) {
     return SilentFlowClient;
 }(BaseClient));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5988,7 +6240,7 @@ function isOpenIdConfigResponse(response) {
         response.hasOwnProperty("jwks_uri"));
 }
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5997,7 +6249,7 @@ var rawMetdataJSON = { "endpointMetadata": { "https://login.microsoftonline.com/
 var EndpointMetadata = rawMetdataJSON.endpointMetadata;
 var InstanceDiscoveryMetadata = rawMetdataJSON.instanceDiscoveryMetadata;
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6011,7 +6263,7 @@ exports.ProtocolMode = void 0;
     ProtocolMode["OIDC"] = "OIDC";
 })(exports.ProtocolMode || (exports.ProtocolMode = {}));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6088,7 +6340,7 @@ var AuthorityMetadataEntity = /** @class */ (function () {
     return AuthorityMetadataEntity;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6098,7 +6350,7 @@ function isCloudInstanceDiscoveryResponse(response) {
         response.hasOwnProperty("metadata"));
 }
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6220,7 +6472,7 @@ var RegionDiscovery = /** @class */ (function () {
     return RegionDiscovery;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6882,7 +7134,7 @@ var Authority = /** @class */ (function () {
     return Authority;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6943,7 +7195,7 @@ var AuthorityFactory = /** @class */ (function () {
     return AuthorityFactory;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6974,7 +7226,7 @@ var ServerTelemetryEntity = /** @class */ (function () {
     return ServerTelemetryEntity;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7002,7 +7254,7 @@ var ThrottlingEntity = /** @class */ (function () {
     return ThrottlingEntity;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7019,7 +7271,7 @@ var StubbedNetworkModule = {
     }
 };
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7064,7 +7316,7 @@ var JoseHeaderError = /** @class */ (function (_super) {
     return JoseHeaderError;
 }(AuthError));
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7104,7 +7356,7 @@ var JoseHeader = /** @class */ (function () {
     return JoseHeader;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7163,7 +7415,7 @@ var AuthenticationHeaderParser = /** @class */ (function () {
     return AuthenticationHeaderParser;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7325,138 +7577,41 @@ var ServerTelemetryManager = /** @class */ (function () {
     return ServerTelemetryManager;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
+
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-/**
- * Enumeration of operations that are instrumented by have their performance measured by the PerformanceClient.
- *
- * @export
- * @enum {number}
- */
-exports.PerformanceEvents = void 0;
-(function (PerformanceEvents) {
-    /**
-     * acquireTokenByCode API (msal-browser and msal-node).
-     * Used to acquire tokens by trading an authorization code against the token endpoint.
-     */
-    PerformanceEvents["AcquireTokenByCode"] = "acquireTokenByCode";
-    /**
-     * acquireTokenByRefreshToken API (msal-browser and msal-node).
-     * Used to renew an access token using a refresh token against the token endpoint.
-     */
-    PerformanceEvents["AcquireTokenByRefreshToken"] = "acquireTokenByRefreshToken";
-    /**
-     * acquireTokenSilent API (msal-browser and msal-node).
-     * Used to silently acquire a new access token (from the cache or the network).
-     */
-    PerformanceEvents["AcquireTokenSilent"] = "acquireTokenSilent";
-    /**
-     * acquireTokenSilentAsync (msal-browser).
-     * Internal API for acquireTokenSilent.
-     */
-    PerformanceEvents["AcquireTokenSilentAsync"] = "acquireTokenSilentAsync";
+var PerformanceClient = /** @class */ (function () {
     /**
-     * acquireTokenPopup (msal-browser).
-     * Used to acquire a new access token interactively through pop ups
+     * Creates an instance of PerformanceClient,
+     * an abstract class containing core performance telemetry logic.
+     *
+     * @constructor
+     * @param {string} clientId Client ID of the application
+     * @param {string} authority Authority used by the application
+     * @param {Logger} logger Logger used by the application
+     * @param {string} libraryName Name of the library
+     * @param {string} libraryVersion Version of the library
      */
-    PerformanceEvents["AcquireTokenPopup"] = "acquireTokenPopup";
+    function PerformanceClient(clientId, authority, logger, libraryName, libraryVersion, applicationTelemetry) {
+        this.authority = authority;
+        this.libraryName = libraryName;
+        this.libraryVersion = libraryVersion;
+        this.applicationTelemetry = applicationTelemetry;
+        this.clientId = clientId;
+        this.logger = logger;
+        this.callbacks = new Map();
+        this.eventsByCorrelationId = new Map();
+        this.measurementsById = new Map();
+    }
     /**
-     * getPublicKeyThumbprint API in CryptoOpts class (msal-browser).
-     * Used to generate a public/private keypair and generate a public key thumbprint for pop requests.
-     */
-    PerformanceEvents["CryptoOptsGetPublicKeyThumbprint"] = "cryptoOptsGetPublicKeyThumbprint";
-    /**
-     * signJwt API in CryptoOpts class (msal-browser).
-     * Used to signed a pop token.
-     */
-    PerformanceEvents["CryptoOptsSignJwt"] = "cryptoOptsSignJwt";
-    /**
-     * acquireToken API in the SilentCacheClient class (msal-browser).
-     * Used to read access tokens from the cache.
-     */
-    PerformanceEvents["SilentCacheClientAcquireToken"] = "silentCacheClientAcquireToken";
-    /**
-     * acquireToken API in the SilentIframeClient class (msal-browser).
-     * Used to acquire a new set of tokens from the authorize endpoint in a hidden iframe.
-     */
-    PerformanceEvents["SilentIframeClientAcquireToken"] = "silentIframeClientAcquireToken";
-    /**
-     * acquireToken API in SilentRereshClient (msal-browser).
-     * Used to acquire a new set of tokens from the token endpoint using a refresh token.
-     */
-    PerformanceEvents["SilentRefreshClientAcquireToken"] = "silentRefreshClientAcquireToken";
-    /**
-     * ssoSilent API (msal-browser).
-     * Used to silently acquire an authorization code and set of tokens using a hidden iframe.
-     */
-    PerformanceEvents["SsoSilent"] = "ssoSilent";
-    /**
-     * getDiscoveredAuthority API in StandardInteractionClient class (msal-browser).
-     * Used to load authority metadata for a request.
-     */
-    PerformanceEvents["StandardInteractionClientGetDiscoveredAuthority"] = "standardInteractionClientGetDiscoveredAuthority";
-    /**
-     * acquireToken APIs in msal-browser.
-     * Used to make an /authorize endpoint call with native brokering enabled.
-     */
-    PerformanceEvents["FetchAccountIdWithNativeBroker"] = "fetchAccountIdWithNativeBroker";
-    /**
-     * acquireToken API in NativeInteractionClient class (msal-browser).
-     * Used to acquire a token from Native component when native brokering is enabled.
-     */
-    PerformanceEvents["NativeInteractionClientAcquireToken"] = "nativeInteractionClientAcquireToken";
-})(exports.PerformanceEvents || (exports.PerformanceEvents = {}));
-/**
- * State of the performance event.
- *
- * @export
- * @enum {number}
- */
-var PerformanceEventStatus;
-(function (PerformanceEventStatus) {
-    PerformanceEventStatus[PerformanceEventStatus["NotStarted"] = 0] = "NotStarted";
-    PerformanceEventStatus[PerformanceEventStatus["InProgress"] = 1] = "InProgress";
-    PerformanceEventStatus[PerformanceEventStatus["Completed"] = 2] = "Completed";
-})(PerformanceEventStatus || (PerformanceEventStatus = {}));
-
-/*! @azure/msal-common v7.1.0 2022-07-05 */
-
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-var PerformanceClient = /** @class */ (function () {
-    /**
-     * Creates an instance of PerformanceClient,
-     * an abstract class containing core performance telemetry logic.
-     *
-     * @constructor
-     * @param {string} clientId Client ID of the application
-     * @param {string} authority Authority used by the application
-     * @param {Logger} logger Logger used by the application
-     * @param {string} libraryName Name of the library
-     * @param {string} libraryVersion Version of the library
-     */
-    function PerformanceClient(clientId, authority, logger, libraryName, libraryVersion, applicationTelemetry) {
-        this.authority = authority;
-        this.libraryName = libraryName;
-        this.libraryVersion = libraryVersion;
-        this.applicationTelemetry = applicationTelemetry;
-        this.clientId = clientId;
-        this.logger = logger;
-        this.callbacks = new Map();
-        this.eventsByCorrelationId = new Map();
-        this.measurementsById = new Map();
-    }
-    /**
-     * Starts measuring performance for a given operation. Returns a function that should be used to end the measurement.
-     *
-     * @param {PerformanceEvents} measureName
-     * @param {?string} [correlationId]
-     * @returns {InProgressPerformanceEvent}
+     * Starts measuring performance for a given operation. Returns a function that should be used to end the measurement.
+     *
+     * @param {PerformanceEvents} measureName
+     * @param {?string} [correlationId]
+     * @returns {InProgressPerformanceEvent}
      */
     PerformanceClient.prototype.startMeasurement = function (measureName, correlationId) {
         var _this = this;
@@ -7480,7 +7635,7 @@ var PerformanceClient = /** @class */ (function () {
             clientId: this.clientId,
             name: measureName,
             startTimeMs: Date.now(),
-            correlationId: eventCorrelationId
+            correlationId: eventCorrelationId,
         };
         // Store in progress events so they can be discarded if not ended properly
         this.cacheEventByCorrelationId(inProgressEvent);
@@ -7625,6 +7780,12 @@ var PerformanceClient = /** @class */ (function () {
                         else {
                             _this.logger.verbose("PerformanceClient: Submeasurement for " + measureName + " already exists for " + current.name + ", ignoring", correlationId);
                         }
+                        if (current.accessTokenSize) {
+                            previous.accessTokenSize = current.accessTokenSize;
+                        }
+                        if (current.idTokenSize) {
+                            previous.idTokenSize = current.idTokenSize;
+                        }
                     }
                     return previous;
                 }, topLevelEvent);
@@ -7692,7 +7853,7 @@ var PerformanceClient = /** @class */ (function () {
     return PerformanceClient;
 }());
 
-/*! @azure/msal-common v7.1.0 2022-07-05 */
+/*! @azure/msal-common v7.4.0 2022-09-06 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8912,26 +9073,57 @@ var BrowserCacheManager = /** @class */ (function (_super) {
      * Gets the active account
      */
     BrowserCacheManager.prototype.getActiveAccount = function () {
-        var activeAccountIdKey = this.generateCacheKey(PersistentCacheKeys.ACTIVE_ACCOUNT);
-        var activeAccountId = this.browserStorage.getItem(activeAccountIdKey);
-        if (!activeAccountId) {
+        var activeAccountKeyFilters = this.generateCacheKey(PersistentCacheKeys.ACTIVE_ACCOUNT_FILTERS);
+        var activeAccountValueFilters = this.getItem(activeAccountKeyFilters);
+        if (!activeAccountValueFilters) {
+            // if new active account cache type isn't found, it's an old version, so look for that instead
+            this.logger.trace("No active account filters cache schema found, looking for legacy schema");
+            var activeAccountKeyLocal = this.generateCacheKey(PersistentCacheKeys.ACTIVE_ACCOUNT);
+            var activeAccountValueLocal = this.getItem(activeAccountKeyLocal);
+            if (!activeAccountValueLocal) {
+                this.logger.trace("No active account found");
+                return null;
+            }
+            var activeAccount = this.getAccountInfoByFilter({ localAccountId: activeAccountValueLocal })[0] || null;
+            if (activeAccount) {
+                this.logger.trace("Legacy active account cache schema found");
+                this.logger.trace("Adding active account filters cache schema");
+                this.setActiveAccount(activeAccount);
+                return activeAccount;
+            }
             return null;
         }
-        return this.getAccountInfoByFilter({ localAccountId: activeAccountId })[0] || null;
+        var activeAccountValueObj = this.validateAndParseJson(activeAccountValueFilters);
+        if (activeAccountValueObj) {
+            this.logger.trace("Active account filters schema found");
+            return this.getAccountInfoByFilter({
+                homeAccountId: activeAccountValueObj.homeAccountId,
+                localAccountId: activeAccountValueObj.localAccountId
+            })[0] || null;
+        }
+        this.logger.trace("No active account found");
+        return null;
     };
     /**
      * Sets the active account's localAccountId in cache
      * @param account
      */
     BrowserCacheManager.prototype.setActiveAccount = function (account) {
-        var activeAccountIdKey = this.generateCacheKey(PersistentCacheKeys.ACTIVE_ACCOUNT);
+        var activeAccountKey = this.generateCacheKey(PersistentCacheKeys.ACTIVE_ACCOUNT_FILTERS);
+        var activeAccountKeyLocal = this.generateCacheKey(PersistentCacheKeys.ACTIVE_ACCOUNT);
         if (account) {
             this.logger.verbose("setActiveAccount: Active account set");
-            this.browserStorage.setItem(activeAccountIdKey, account.localAccountId);
+            var activeAccountValue = {
+                homeAccountId: account.homeAccountId,
+                localAccountId: account.localAccountId
+            };
+            this.browserStorage.setItem(activeAccountKey, JSON.stringify(activeAccountValue));
+            this.browserStorage.setItem(activeAccountKeyLocal, account.localAccountId);
         }
         else {
             this.logger.verbose("setActiveAccount: No account passed, active account not set");
-            this.browserStorage.removeItem(activeAccountIdKey);
+            this.browserStorage.removeItem(activeAccountKey);
+            this.browserStorage.removeItem(activeAccountKeyLocal);
         }
     };
     /**
@@ -9489,7 +9681,7 @@ var DEFAULT_BROWSER_CACHE_MANAGER = function (clientId, logger) {
 
 /* eslint-disable header/header */
 var name = "@azure/msal-browser";
-var version = "2.27.0";
+var version = "2.28.2";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -10038,8 +10230,7 @@ var BaseInteractionClient = /** @class */ (function () {
                             protocolMode: this.config.auth.protocolMode,
                             knownAuthorities: this.config.auth.knownAuthorities,
                             cloudDiscoveryMetadata: this.config.auth.cloudDiscoveryMetadata,
-                            authorityMetadata: this.config.auth.authorityMetadata,
-                            skipAuthorityMetadataCache: this.config.auth.skipAuthorityMetadataCache,
+                            authorityMetadata: this.config.auth.authorityMetadata
                         };
                         if (!requestAuthority) return [3 /*break*/, 2];
                         this.logger.verbose("Creating discovered authority with request authority");
@@ -10671,6 +10862,10 @@ var NativeAuthErrorMessage = {
     userSwitch: {
         code: "user_switch",
         desc: "User attempted to switch accounts in the native broker, which is not allowed. All new accounts must sign-in through the standard web flow first, please try again."
+    },
+    tokensNotFoundInCache: {
+        code: "tokens_not_found_in_internal_memory_cache",
+        desc: "Tokens not cached in MSAL JS internal memory, please make the WAM request"
     }
 };
 var NativeAuthError = /** @class */ (function (_super) {
@@ -10725,20 +10920,122 @@ var NativeAuthError = /** @class */ (function (_super) {
     NativeAuthError.createUserSwitchError = function () {
         return new NativeAuthError(NativeAuthErrorMessage.userSwitch.code, NativeAuthErrorMessage.userSwitch.desc);
     };
+    /**
+     * Creates a tokens not found error when the internal cache look up fails
+     * @returns NativeAuthError: tokensNotFoundInCache
+     */
+    NativeAuthError.createTokensNotFoundInCacheError = function () {
+        return new NativeAuthError(NativeAuthErrorMessage.tokensNotFoundInCache.code, NativeAuthErrorMessage.tokensNotFoundInCache.desc);
+    };
     return NativeAuthError;
 }(AuthError));
 
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+var SilentCacheClient = /** @class */ (function (_super) {
+    __extends$1(SilentCacheClient, _super);
+    function SilentCacheClient() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    /**
+     * Returns unexpired tokens from the cache, if available
+     * @param silentRequest
+     */
+    SilentCacheClient.prototype.acquireToken = function (silentRequest) {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var acquireTokenMeasurement, serverTelemetryManager, silentAuthClient, cachedToken, error_1;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        acquireTokenMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.SilentCacheClientAcquireToken, silentRequest.correlationId);
+                        serverTelemetryManager = this.initializeServerTelemetryManager(exports.ApiId.acquireTokenSilent_silentFlow);
+                        return [4 /*yield*/, this.createSilentFlowClient(serverTelemetryManager, silentRequest.authority, silentRequest.azureCloudOptions)];
+                    case 1:
+                        silentAuthClient = _a.sent();
+                        this.logger.verbose("Silent auth client created");
+                        _a.label = 2;
+                    case 2:
+                        _a.trys.push([2, 4, , 5]);
+                        return [4 /*yield*/, silentAuthClient.acquireCachedToken(silentRequest)];
+                    case 3:
+                        cachedToken = _a.sent();
+                        acquireTokenMeasurement.endMeasurement({
+                            success: true,
+                            fromCache: true
+                        });
+                        return [2 /*return*/, cachedToken];
+                    case 4:
+                        error_1 = _a.sent();
+                        if (error_1 instanceof BrowserAuthError && error_1.errorCode === BrowserAuthErrorMessage.signingKeyNotFoundInStorage.code) {
+                            this.logger.verbose("Signing keypair for bound access token not found. Refreshing bound access token and generating a new crypto keypair.");
+                        }
+                        acquireTokenMeasurement.endMeasurement({
+                            errorCode: error_1 instanceof AuthError && error_1.errorCode || undefined,
+                            subErrorCode: error_1 instanceof AuthError && error_1.subError || undefined,
+                            success: false
+                        });
+                        throw error_1;
+                    case 5: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Currently Unsupported
+     */
+    SilentCacheClient.prototype.logout = function () {
+        // Synchronous so we must reject
+        return Promise.reject(BrowserAuthError.createSilentLogoutUnsupportedError());
+    };
+    /**
+     * Creates an Silent Flow Client with the given authority, or the default authority.
+     * @param serverTelemetryManager
+     * @param 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, azureCloudOptions)];
+                    case 1:
+                        clientConfig = _a.sent();
+                        return [2 /*return*/, new SilentFlowClient(clientConfig, this.performanceClient)];
+                }
+            });
+        });
+    };
+    SilentCacheClient.prototype.initializeSilentRequest = function (request, account) {
+        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));
+
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
 var NativeInteractionClient = /** @class */ (function (_super) {
     __extends$1(NativeInteractionClient, _super);
-    function NativeInteractionClient(config, browserStorage, browserCrypto, logger, eventHandler, navigationClient, apiId, performanceClient, provider, accountId, correlationId) {
+    function NativeInteractionClient(config, browserStorage, browserCrypto, logger, eventHandler, navigationClient, apiId, performanceClient, provider, accountId, nativeStorageImpl, correlationId) {
         var _this = _super.call(this, config, browserStorage, browserCrypto, logger, eventHandler, navigationClient, performanceClient, provider, correlationId) || this;
         _this.apiId = apiId;
         _this.accountId = accountId;
         _this.nativeMessageHandler = provider;
+        _this.nativeStorageManager = nativeStorageImpl;
+        _this.silentCacheClient = new SilentCacheClient(config, _this.nativeStorageManager, browserCrypto, logger, eventHandler, navigationClient, performanceClient, provider, correlationId);
         return _this;
     }
     /**
@@ -10747,22 +11044,40 @@ var NativeInteractionClient = /** @class */ (function (_super) {
      */
     NativeInteractionClient.prototype.acquireToken = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var nativeATMeasurement, nativeRequest, messageBody, reqTimestamp, response, validatedResponse;
+            var nativeATMeasurement, reqTimestamp, nativeRequest, result, messageBody, response, validatedResponse;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.logger.trace("NativeInteractionClient - acquireToken called.");
                         nativeATMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.NativeInteractionClientAcquireToken, request.correlationId);
+                        reqTimestamp = TimeUtils.nowSeconds();
                         return [4 /*yield*/, this.initializeNativeRequest(request)];
                     case 1:
                         nativeRequest = _a.sent();
+                        _a.label = 2;
+                    case 2:
+                        _a.trys.push([2, 4, , 5]);
+                        return [4 /*yield*/, this.acquireTokensFromCache(this.accountId, nativeRequest)];
+                    case 3:
+                        result = _a.sent();
+                        nativeATMeasurement.endMeasurement({
+                            success: true,
+                            isNativeBroker: true,
+                            fromCache: true
+                        });
+                        return [2 /*return*/, result];
+                    case 4:
+                        _a.sent();
+                        // continue with a native call for any and all errors
+                        this.logger.info("MSAL internal Cache does not contain tokens, proceed to make a native call");
+                        return [3 /*break*/, 5];
+                    case 5:
                         messageBody = {
                             method: NativeExtensionMethod.GetToken,
                             request: nativeRequest
                         };
-                        reqTimestamp = TimeUtils.nowSeconds();
                         return [4 /*yield*/, this.nativeMessageHandler.sendMessage(messageBody)];
-                    case 2:
+                    case 6:
                         response = _a.sent();
                         validatedResponse = this.validateNativeResponse(response);
                         return [2 /*return*/, this.handleNativeResponse(validatedResponse, nativeRequest, reqTimestamp)
@@ -10786,13 +11101,61 @@ var NativeInteractionClient = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * Creates silent flow request
+     * @param request
+     * @param cachedAccount
+     * @returns CommonSilentFlowRequest
+     */
+    NativeInteractionClient.prototype.createSilentCacheRequest = function (request, cachedAccount) {
+        return {
+            authority: request.authority,
+            correlationId: this.correlationId,
+            scopes: ScopeSet.fromString(request.scope).asArray(),
+            account: cachedAccount,
+            forceRefresh: false,
+        };
+    };
+    /**
+     * Fetches the tokens from the cache if un-expired
+     * @param nativeAccountId
+     * @param request
+     * @returns authenticationResult
+     */
+    NativeInteractionClient.prototype.acquireTokensFromCache = function (nativeAccountId, request) {
+        return __awaiter$1(this, void 0, void 0, function () {
+            var accountEntity, account, silentRequest, result, e_2;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        accountEntity = this.browserStorage.readAccountFromCacheWithNativeAccountId(nativeAccountId);
+                        if (!accountEntity) {
+                            throw ClientAuthError.createNoAccountFoundError();
+                        }
+                        account = accountEntity.getAccountInfo();
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        silentRequest = this.createSilentCacheRequest(request, account);
+                        return [4 /*yield*/, this.silentCacheClient.acquireToken(silentRequest)];
+                    case 2:
+                        result = _a.sent();
+                        return [2 /*return*/, result];
+                    case 3:
+                        e_2 = _a.sent();
+                        throw e_2;
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
     /**
      * Acquires a token from native platform then redirects to the redirectUri instead of returning the response
      * @param request
      */
     NativeInteractionClient.prototype.acquireTokenRedirect = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var nativeRequest, messageBody, response, e_1, navigationOptions, redirectUri;
+            var nativeRequest, messageBody, response, e_3, navigationOptions, redirectUri;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -10813,10 +11176,10 @@ var NativeInteractionClient = /** @class */ (function (_super) {
                         this.validateNativeResponse(response);
                         return [3 /*break*/, 5];
                     case 4:
-                        e_1 = _a.sent();
+                        e_3 = _a.sent();
                         // Only throw fatal errors here to allow application to fallback to regular redirect. Otherwise proceed and the error will be thrown in handleRedirectPromise
-                        if (e_1 instanceof NativeAuthError && e_1.isFatal()) {
-                            throw e_1;
+                        if (e_3 instanceof NativeAuthError && e_3.isFatal()) {
+                            throw e_3;
                         }
                         return [3 /*break*/, 5];
                     case 5:
@@ -10840,7 +11203,7 @@ var NativeInteractionClient = /** @class */ (function (_super) {
      */
     NativeInteractionClient.prototype.handleRedirectPromise = function () {
         return __awaiter$1(this, void 0, void 0, function () {
-            var cachedRequest, messageBody, reqTimestamp, response, result, e_2;
+            var cachedRequest, messageBody, reqTimestamp, response, result, e_4;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -10872,9 +11235,9 @@ var NativeInteractionClient = /** @class */ (function (_super) {
                         this.browserStorage.setInteractionInProgress(false);
                         return [2 /*return*/, result];
                     case 3:
-                        e_2 = _a.sent();
+                        e_4 = _a.sent();
                         this.browserStorage.setInteractionInProgress(false);
-                        throw e_2;
+                        throw e_4;
                     case 4: return [2 /*return*/];
                 }
             });
@@ -10896,7 +11259,7 @@ var NativeInteractionClient = /** @class */ (function (_super) {
      */
     NativeInteractionClient.prototype.handleNativeResponse = function (response, request, reqTimestamp) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var idTokenObj, authority, authorityPreferredCache, homeAccountIdentifier, accountEntity, responseScopes, accountProperties, uid, tid, responseAccessToken, responseTokenType, _a, popTokenGenerator, shrParameters, mats, result;
+            var idTokenObj, authority, authorityPreferredCache, homeAccountIdentifier, accountEntity, responseScopes, accountProperties, uid, tid, responseAccessToken, responseTokenType, _a, popTokenGenerator, shrParameters, mats, result, idTokenEntity, expiresIn, tokenExpirationSeconds, accessTokenEntity;
             var _this = this;
             return __generator$1(this, function (_b) {
                 switch (_b.label) {
@@ -10914,7 +11277,7 @@ var NativeInteractionClient = /** @class */ (function (_super) {
                         homeAccountIdentifier = AccountEntity.generateHomeAccountId(response.client_info || Constants.EMPTY_STRING, AuthorityType.Default, this.logger, this.browserCrypto, idTokenObj);
                         accountEntity = AccountEntity.createAccount(response.client_info, homeAccountIdentifier, idTokenObj, undefined, undefined, undefined, authorityPreferredCache, response.account.id);
                         this.browserStorage.setAccount(accountEntity);
-                        responseScopes = response.scopes ? ScopeSet.fromString(response.scopes) : ScopeSet.fromString(request.scopes);
+                        responseScopes = response.scope ? ScopeSet.fromString(response.scope) : ScopeSet.fromString(request.scope);
                         accountProperties = response.account.properties || {};
                         uid = accountProperties["UID"] || idTokenObj.claims.oid || idTokenObj.claims.sub || Constants.EMPTY_STRING;
                         tid = accountProperties["TenantId"] || idTokenObj.claims.tid || Constants.EMPTY_STRING;
@@ -10974,7 +11337,17 @@ var NativeInteractionClient = /** @class */ (function (_super) {
                             state: response.state,
                             fromNativeBroker: true
                         };
-                        // Remove any existing cached tokens for this account
+                        idTokenEntity = IdTokenEntity.createIdTokenEntity(homeAccountIdentifier, request.authority, response.id_token || Constants.EMPTY_STRING, request.clientId, idTokenObj.claims.tid || Constants.EMPTY_STRING);
+                        this.nativeStorageManager.setIdTokenCredential(idTokenEntity);
+                        expiresIn = (responseTokenType === exports.AuthenticationScheme.POP)
+                            ? Constants.SHR_NONCE_VALIDITY
+                            : (typeof response.expires_in === "string"
+                                ? parseInt(response.expires_in, 10)
+                                : response.expires_in) || 0;
+                        tokenExpirationSeconds = reqTimestamp + expiresIn;
+                        accessTokenEntity = AccessTokenEntity.createAccessTokenEntity(homeAccountIdentifier, request.authority, responseAccessToken, request.clientId, tid, responseScopes.printScopes(), tokenExpirationSeconds, 0, this.browserCrypto);
+                        this.nativeStorageManager.setAccessTokenCredential(accessTokenEntity);
+                        // Remove any existing cached tokens for this account in browser storage
                         this.browserStorage.removeAccountContext(accountEntity).catch(function (e) {
                             _this.logger.error("Error occurred while removing account context from browser storage. " + e);
                         });
@@ -10992,7 +11365,7 @@ var NativeInteractionClient = /** @class */ (function (_super) {
             response.hasOwnProperty("id_token") &&
             response.hasOwnProperty("client_info") &&
             response.hasOwnProperty("account") &&
-            response.hasOwnProperty("scopes") &&
+            response.hasOwnProperty("scope") &&
             response.hasOwnProperty("expires_in")) {
             return response;
         }
@@ -11034,7 +11407,7 @@ var NativeInteractionClient = /** @class */ (function (_super) {
      */
     NativeInteractionClient.prototype.initializeNativeRequest = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var authority, canonicalAuthority, scopes, scopeSet, getPrompt, validatedRequest, shrParameters, popTokenGenerator, reqCnfData;
+            var authority, canonicalAuthority, scopes, remainingProperties, scopeSet, getPrompt, validatedRequest, shrParameters, popTokenGenerator, reqCnfData;
             var _this = this;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
@@ -11043,8 +11416,8 @@ var NativeInteractionClient = /** @class */ (function (_super) {
                         authority = request.authority || this.config.auth.authority;
                         canonicalAuthority = new UrlString(authority);
                         canonicalAuthority.validateAsUri();
-                        scopes = request && request.scopes || [];
-                        scopeSet = new ScopeSet(scopes);
+                        scopes = request.scopes, remainingProperties = __rest(request, ["scopes"]);
+                        scopeSet = new ScopeSet(scopes || []);
                         scopeSet.appendScopes(OIDC_DEFAULT_SCOPES);
                         getPrompt = function () {
                             // If request is silent, prompt is always none
@@ -11071,7 +11444,7 @@ var NativeInteractionClient = /** @class */ (function (_super) {
                                     throw BrowserAuthError.createNativePromptParameterNotSupportedError();
                             }
                         };
-                        validatedRequest = __assign$1(__assign$1({}, request), { accountId: this.accountId, clientId: this.config.auth.clientId, authority: canonicalAuthority.urlString, scopes: 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?
+                        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];
                         shrParameters = {
@@ -11338,8 +11711,10 @@ var NativeMessageHandler = /** @class */ (function () {
  */
 var RedirectClient = /** @class */ (function (_super) {
     __extends$1(RedirectClient, _super);
-    function RedirectClient() {
-        return _super !== null && _super.apply(this, arguments) || this;
+    function RedirectClient(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, performanceClient, nativeStorageImpl, nativeMessageHandler, correlationId) {
+        var _this = _super.call(this, config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, performanceClient, nativeMessageHandler, correlationId) || this;
+        _this.nativeStorage = nativeStorageImpl;
+        return _this;
     }
     /**
      * Redirects the page to the /authorize endpoint of the IDP
@@ -11548,7 +11923,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, 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.browserStorage, 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 () {
@@ -11666,10 +12041,11 @@ var RedirectClient = /** @class */ (function (_super) {
  */
 var PopupClient = /** @class */ (function (_super) {
     __extends$1(PopupClient, _super);
-    function PopupClient(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, performanceClient, nativeMessageHandler, correlationId) {
+    function PopupClient(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, performanceClient, nativeStorageImpl, nativeMessageHandler, correlationId) {
         var _this = _super.call(this, config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, performanceClient, nativeMessageHandler, correlationId) || this;
         // Properly sets this reference for the unload event.
         _this.unloadWindow = _this.unloadWindow.bind(_this);
+        _this.nativeStorage = nativeStorageImpl;
         return _this;
     }
     /**
@@ -11794,7 +12170,7 @@ var PopupClient = /** @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, validRequest.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, validRequest.correlationId);
                             userRequestState = ProtocolUtils.parseRequestState(this.browserCrypto, state_1).userRequestState;
                             return [2 /*return*/, nativeInteractionClient.acquireToken(__assign$1(__assign$1({}, validRequest), { state: userRequestState, prompt: undefined // Server should handle the prompt, ideally native broker can do this part silently
                                  })).finally(function () {
@@ -12422,9 +12798,10 @@ var SilentHandler = /** @class */ (function (_super) {
  */
 var SilentIframeClient = /** @class */ (function (_super) {
     __extends$1(SilentIframeClient, _super);
-    function SilentIframeClient(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, apiId, performanceClient, nativeMessageHandler, correlationId) {
+    function SilentIframeClient(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, apiId, performanceClient, nativeStorageImpl, nativeMessageHandler, correlationId) {
         var _this = _super.call(this, config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, performanceClient, nativeMessageHandler, correlationId) || this;
         _this.apiId = apiId;
+        _this.nativeStorage = nativeStorageImpl;
         return _this;
     }
     /**
@@ -12527,7 +12904,7 @@ var SilentIframeClient = /** @class */ (function (_super) {
                             if (!this.nativeMessageHandler) {
                                 throw BrowserAuthError.createNativeConnectionNotEstablishedError();
                             }
-                            nativeInteractionClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.apiId, this.performanceClient, this.nativeMessageHandler, serverParams.accountId, this.correlationId);
+                            nativeInteractionClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.apiId, this.performanceClient, this.nativeMessageHandler, serverParams.accountId, this.browserStorage, this.correlationId);
                             userRequestState = ProtocolUtils.parseRequestState(this.browserCrypto, state).userRequestState;
                             return [2 /*return*/, nativeInteractionClient.acquireToken(__assign$1(__assign$1({}, silentRequest), { state: userRequestState, prompt: PromptValue.NONE })).finally(function () {
                                     _this.browserStorage.cleanRequestByState(state);
@@ -12542,99 +12919,6 @@ var SilentIframeClient = /** @class */ (function (_super) {
     return SilentIframeClient;
 }(StandardInteractionClient));
 
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- */
-var SilentCacheClient = /** @class */ (function (_super) {
-    __extends$1(SilentCacheClient, _super);
-    function SilentCacheClient() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    /**
-     * Returns unexpired tokens from the cache, if available
-     * @param silentRequest
-     */
-    SilentCacheClient.prototype.acquireToken = function (silentRequest) {
-        return __awaiter$1(this, void 0, void 0, function () {
-            var acquireTokenMeasurement, serverTelemetryManager, silentAuthClient, cachedToken, error_1;
-            return __generator$1(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        acquireTokenMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.SilentCacheClientAcquireToken, silentRequest.correlationId);
-                        serverTelemetryManager = this.initializeServerTelemetryManager(exports.ApiId.acquireTokenSilent_silentFlow);
-                        return [4 /*yield*/, this.createSilentFlowClient(serverTelemetryManager, silentRequest.authority, silentRequest.azureCloudOptions)];
-                    case 1:
-                        silentAuthClient = _a.sent();
-                        this.logger.verbose("Silent auth client created");
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, silentAuthClient.acquireCachedToken(silentRequest)];
-                    case 3:
-                        cachedToken = _a.sent();
-                        acquireTokenMeasurement.endMeasurement({
-                            success: true,
-                            fromCache: true
-                        });
-                        return [2 /*return*/, cachedToken];
-                    case 4:
-                        error_1 = _a.sent();
-                        if (error_1 instanceof BrowserAuthError && error_1.errorCode === BrowserAuthErrorMessage.signingKeyNotFoundInStorage.code) {
-                            this.logger.verbose("Signing keypair for bound access token not found. Refreshing bound access token and generating a new crypto keypair.");
-                        }
-                        acquireTokenMeasurement.endMeasurement({
-                            errorCode: error_1 instanceof AuthError && error_1.errorCode || undefined,
-                            subErrorCode: error_1 instanceof AuthError && error_1.subError || undefined,
-                            success: false
-                        });
-                        throw error_1;
-                    case 5: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    /**
-     * Currently Unsupported
-     */
-    SilentCacheClient.prototype.logout = function () {
-        // Synchronous so we must reject
-        return Promise.reject(BrowserAuthError.createSilentLogoutUnsupportedError());
-    };
-    /**
-     * Creates an Silent Flow Client with the given authority, or the default authority.
-     * @param serverTelemetryManager
-     * @param 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, azureCloudOptions)];
-                    case 1:
-                        clientConfig = _a.sent();
-                        return [2 /*return*/, new SilentFlowClient(clientConfig)];
-                }
-            });
-        });
-    };
-    SilentCacheClient.prototype.initializeSilentRequest = function (request, account) {
-        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));
-
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -12710,7 +12994,7 @@ var SilentRefreshClient = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl, azureCloudOptions)];
                     case 1:
                         clientConfig = _a.sent();
-                        return [2 /*return*/, new RefreshTokenClient(clientConfig)];
+                        return [2 /*return*/, new RefreshTokenClient(clientConfig, this.performanceClient)];
                 }
             });
         });
@@ -14652,6 +14936,13 @@ var ClientApplication = /** @class */ (function () {
         this.browserStorage = this.isBrowserEnvironment ?
             new BrowserCacheManager(this.config.auth.clientId, this.config.cache, this.browserCrypto, this.logger) :
             DEFAULT_BROWSER_CACHE_MANAGER(this.config.auth.clientId, this.logger);
+        // initialize in memory storage for native flows
+        var nativeCacheOptions = {
+            cacheLocation: exports.BrowserCacheLocation.MemoryStorage,
+            storeAuthStateInCookie: false,
+            secureCookies: false
+        };
+        this.nativeInternalStorage = new BrowserCacheManager(this.config.auth.clientId, nativeCacheOptions, this.browserCrypto, this.logger);
         // Initialize the token cache
         this.tokenCache = new TokenCache(this.config, this.browserStorage, this.logger, this.browserCrypto);
     }
@@ -14718,7 +15009,7 @@ var ClientApplication = /** @class */ (function () {
                         redirectResponse = void 0;
                         if (request && NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeExtensionProvider) && this.nativeExtensionProvider && !hash) {
                             this.logger.trace("handleRedirectPromise - acquiring token from native platform");
-                            nativeClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, exports.ApiId.handleRedirectPromise, this.performanceClient, this.nativeExtensionProvider, request.accountId, request.correlationId);
+                            nativeClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, exports.ApiId.handleRedirectPromise, this.performanceClient, this.nativeExtensionProvider, request.accountId, this.nativeInternalStorage, request.correlationId);
                             redirectResponse = nativeClient.handleRedirectPromise();
                         }
                         else {
@@ -14790,7 +15081,7 @@ var ClientApplication = /** @class */ (function () {
                     this.eventHandler.emitEvent(exports.EventType.LOGIN_START, exports.InteractionType.Redirect, request);
                 }
                 if (this.nativeExtensionProvider && this.canUseNative(request)) {
-                    nativeClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, exports.ApiId.acquireTokenRedirect, this.performanceClient, this.nativeExtensionProvider, this.getNativeAccountId(request), request.correlationId);
+                    nativeClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, exports.ApiId.acquireTokenRedirect, this.performanceClient, this.nativeExtensionProvider, this.getNativeAccountId(request), this.nativeInternalStorage, request.correlationId);
                     result = nativeClient.acquireTokenRedirect(request).catch(function (e) {
                         if (e instanceof NativeAuthError && e.isFatal()) {
                             _this.nativeExtensionProvider = undefined; // If extension gets uninstalled during session prevent future requests from continuing to attempt
@@ -14858,7 +15149,9 @@ var ClientApplication = /** @class */ (function () {
                 _this.browserStorage.setInteractionInProgress(false);
                 atPopupMeasurement.endMeasurement({
                     success: true,
-                    isNativeBroker: true
+                    isNativeBroker: true,
+                    accessTokenSize: response.accessToken.length,
+                    idTokenSize: response.idToken.length,
                 });
                 atPopupMeasurement.flushMeasurement();
                 return response;
@@ -14882,7 +15175,9 @@ var ClientApplication = /** @class */ (function () {
             result = popupClient.acquireToken(request);
         }
         return result.then(function (result) {
-            // If logged in, emit acquire token events
+            /*
+             *  If logged in, emit acquire token events
+             */
             var isLoggingIn = loggedInAccounts.length < _this.getAllAccounts().length;
             if (isLoggingIn) {
                 _this.eventHandler.emitEvent(exports.EventType.LOGIN_SUCCESS, exports.InteractionType.Popup, result);
@@ -14891,7 +15186,9 @@ var ClientApplication = /** @class */ (function () {
                 _this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Popup, result);
             }
             atPopupMeasurement.endMeasurement({
-                success: true
+                success: true,
+                accessTokenSize: result.accessToken.length,
+                idTokenSize: result.idToken.length,
             });
             atPopupMeasurement.flushMeasurement();
             return result;
@@ -14959,7 +15256,9 @@ var ClientApplication = /** @class */ (function () {
                         _this.eventHandler.emitEvent(exports.EventType.SSO_SILENT_SUCCESS, exports.InteractionType.Silent, response);
                         ssoSilentMeasurement.endMeasurement({
                             success: true,
-                            isNativeBroker: response.fromNativeBroker
+                            isNativeBroker: response.fromNativeBroker,
+                            accessTokenSize: response.accessToken.length,
+                            idTokenSize: response.idToken.length
                         });
                         ssoSilentMeasurement.flushMeasurement();
                         return response;
@@ -15008,6 +15307,8 @@ var ClientApplication = /** @class */ (function () {
                                 _this.hybridAuthCodeResponses.delete(hybridAuthCode_1);
                                 atbcMeasurement.endMeasurement({
                                     success: true,
+                                    accessTokenSize: result.accessToken.length,
+                                    idTokenSize: result.idToken.length,
                                     isNativeBroker: result.fromNativeBroker
                                 });
                                 atbcMeasurement.flushMeasurement();
@@ -15112,7 +15413,9 @@ var ClientApplication = /** @class */ (function () {
                         .then(function (result) {
                         atbrtMeasurement.endMeasurement({
                             success: true,
-                            fromCache: result.fromCache
+                            fromCache: result.fromCache,
+                            accessTokenSize: result.accessToken.length,
+                            idTokenSize: result.idToken.length,
                         });
                         return result;
                     })
@@ -15127,7 +15430,9 @@ var ClientApplication = /** @class */ (function () {
                                 .then(function (result) {
                                 atbrtMeasurement.endMeasurement({
                                     success: true,
-                                    fromCache: result.fromCache
+                                    fromCache: result.fromCache,
+                                    accessTokenSize: result.accessToken.length,
+                                    idTokenSize: result.idToken.length,
                                 });
                                 return result;
                             })
@@ -15339,7 +15644,7 @@ var ClientApplication = /** @class */ (function () {
                 if (!this.nativeExtensionProvider) {
                     throw BrowserAuthError.createNativeConnectionNotEstablishedError();
                 }
-                nativeClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, apiId, this.performanceClient, this.nativeExtensionProvider, accountId || this.getNativeAccountId(request), request.correlationId);
+                nativeClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, apiId, this.performanceClient, this.nativeExtensionProvider, accountId || this.getNativeAccountId(request), this.nativeInternalStorage, request.correlationId);
                 return [2 /*return*/, nativeClient.acquireToken(request)];
             });
         });
@@ -15386,21 +15691,21 @@ var ClientApplication = /** @class */ (function () {
      * @param correlationId
      */
     ClientApplication.prototype.createPopupClient = function (correlationId) {
-        return new PopupClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.performanceClient, this.nativeExtensionProvider, correlationId);
+        return new PopupClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.performanceClient, this.nativeInternalStorage, this.nativeExtensionProvider, correlationId);
     };
     /**
      * Returns new instance of the Redirect Interaction Client
      * @param correlationId
      */
     ClientApplication.prototype.createRedirectClient = function (correlationId) {
-        return new RedirectClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.performanceClient, this.nativeExtensionProvider, correlationId);
+        return new RedirectClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.performanceClient, this.nativeInternalStorage, this.nativeExtensionProvider, correlationId);
     };
     /**
      * Returns new instance of the Silent Iframe Interaction Client
      * @param correlationId
      */
     ClientApplication.prototype.createSilentIframeClient = function (correlationId) {
-        return new SilentIframeClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, exports.ApiId.ssoSilent, this.performanceClient, this.nativeExtensionProvider, correlationId);
+        return new SilentIframeClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, exports.ApiId.ssoSilent, this.performanceClient, this.nativeInternalStorage, this.nativeExtensionProvider, correlationId);
     };
     /**
      * Returns new instance of the Silent Cache Interaction Client
@@ -15636,6 +15941,8 @@ var PublicClientApplication = /** @class */ (function (_super) {
                         atsMeasurement.endMeasurement({
                             success: true,
                             fromCache: result.fromCache,
+                            accessTokenSize: result.accessToken.length,
+                            idTokenSize: result.idToken.length,
                             isNativeBroker: result.fromNativeBroker
                         });
                         atsMeasurement.flushMeasurement();
@@ -15644,8 +15951,6 @@ var PublicClientApplication = /** @class */ (function (_super) {
                         .catch(function (error) {
                         _this.activeSilentTokenRequests.delete(silentRequestKey);
                         atsMeasurement.endMeasurement({
-                            errorCode: error.errorCode,
-                            subErrorCode: error.subError,
                             success: false
                         });
                         atsMeasurement.flushMeasurement();
@@ -15715,6 +16020,8 @@ var PublicClientApplication = /** @class */ (function (_super) {
                             astsAsyncMeasurement.endMeasurement({
                                 success: true,
                                 fromCache: response.fromCache,
+                                accessTokenSize: response.accessToken.length,
+                                idTokenSize: response.idToken.length,
                                 isNativeBroker: response.fromNativeBroker
                             });
                             return response;