@azure/msal-browser 2.21.0 → 2.23.0

package/dist/index.cjs.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v2.21.0 2022-01-04 */
+/*! @azure/msal-browser v2.23.0 2022-04-04 */
 'use strict';
 'use strict';
 
@@ -105,7 +105,7 @@ function __spread() {
     return ar;
 }
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -192,7 +192,7 @@ function __spreadArrays() {
     return r;
 }
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -206,6 +206,7 @@ var Constants = {
     // default authority
     DEFAULT_AUTHORITY: "https://login.microsoftonline.com/common/",
     DEFAULT_AUTHORITY_HOST: "login.microsoftonline.com",
+    DEFAULT_COMMON_TENANT: "common",
     // ADFS String
     ADFS: "adfs",
     // Default AAD Instance Discovery Endpoint
@@ -316,6 +317,8 @@ var AADServerParamKeys;
     AADServerParamKeys["X_CLIENT_CURR_TELEM"] = "x-client-current-telemetry";
     AADServerParamKeys["X_CLIENT_LAST_TELEM"] = "x-client-last-telemetry";
     AADServerParamKeys["X_MS_LIB_CAPABILITY"] = "x-ms-lib-capability";
+    AADServerParamKeys["X_APP_NAME"] = "x-app-name";
+    AADServerParamKeys["X_APP_VER"] = "x-app-ver";
     AADServerParamKeys["POST_LOGOUT_URI"] = "post_logout_redirect_uri";
     AADServerParamKeys["ID_TOKEN_HINT"] = "id_token_hint";
     AADServerParamKeys["DEVICE_CODE"] = "device_code";
@@ -330,6 +333,7 @@ var AADServerParamKeys;
     AADServerParamKeys["FOCI"] = "foci";
     AADServerParamKeys["CCS_HEADER"] = "X-AnchorMailbox";
     AADServerParamKeys["RETURN_SPA_CODE"] = "return_spa_code";
+    AADServerParamKeys["LOGOUT_HINT"] = "logout_hint";
 })(AADServerParamKeys || (AADServerParamKeys = {}));
 /**
  * Claims request keys
@@ -554,7 +558,7 @@ var CacheOutcome;
     CacheOutcome["REFRESH_CACHED_ACCESS_TOKEN"] = "4";
 })(CacheOutcome || (CacheOutcome = {}));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -580,8 +584,8 @@ var AuthError = /** @class */ (function (_super) {
         _this = _super.call(this, errorString) || this;
         Object.setPrototypeOf(_this, AuthError.prototype);
         _this.errorCode = errorCode || Constants.EMPTY_STRING;
-        _this.errorMessage = errorMessage || "";
-        _this.subError = suberror || "";
+        _this.errorMessage = errorMessage || Constants.EMPTY_STRING;
+        _this.subError = suberror || Constants.EMPTY_STRING;
         _this.name = "AuthError";
         return _this;
     }
@@ -598,7 +602,7 @@ var AuthError = /** @class */ (function (_super) {
     return AuthError;
 }(Error));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -673,7 +677,7 @@ var DEFAULT_CRYPTO_IMPLEMENTATION = {
     }
 };
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1135,7 +1139,7 @@ var ClientAuthError = /** @class */ (function (_super) {
     return ClientAuthError;
 }(AuthError));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1260,7 +1264,7 @@ var StringUtils = /** @class */ (function () {
     return StringUtils;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1290,7 +1294,7 @@ var Logger = /** @class */ (function () {
         this.localCallback = loggerOptions.loggerCallback || defaultLoggerCallback;
         this.piiLoggingEnabled = loggerOptions.piiLoggingEnabled || false;
         this.level = typeof (loggerOptions.logLevel) === "number" ? loggerOptions.logLevel : exports.LogLevel.Info;
-        this.correlationId = loggerOptions.correlationId || "";
+        this.correlationId = loggerOptions.correlationId || Constants.EMPTY_STRING;
         this.packageName = packageName || Constants.EMPTY_STRING;
         this.packageVersion = packageVersion || Constants.EMPTY_STRING;
     }
@@ -1320,7 +1324,7 @@ var Logger = /** @class */ (function () {
             logHeader = "[" + timestamp + "]";
         }
         var log = logHeader + " : " + this.packageName + "@" + this.packageVersion + " : " + exports.LogLevel[options.logLevel] + " - " + logMessage;
-        // debug(`msal:${LogLevel[options.logLevel]}${options.containsPii ? "-Pii": ""}${options.context ? `:${options.context}` : ""}`)(logMessage);
+        // debug(`msal:${LogLevel[options.logLevel]}${options.containsPii ? "-Pii": Constants.EMPTY_STRING}${options.context ? `:${options.context}` : Constants.EMPTY_STRING}`)(logMessage);
         this.executeCallback(options.logLevel, log, options.containsPii || false);
     };
     /**
@@ -1338,7 +1342,7 @@ var Logger = /** @class */ (function () {
         this.logMessage(message, {
             logLevel: exports.LogLevel.Error,
             containsPii: false,
-            correlationId: correlationId || ""
+            correlationId: correlationId || Constants.EMPTY_STRING
         });
     };
     /**
@@ -1348,7 +1352,7 @@ var Logger = /** @class */ (function () {
         this.logMessage(message, {
             logLevel: exports.LogLevel.Error,
             containsPii: true,
-            correlationId: correlationId || ""
+            correlationId: correlationId || Constants.EMPTY_STRING
         });
     };
     /**
@@ -1358,7 +1362,7 @@ var Logger = /** @class */ (function () {
         this.logMessage(message, {
             logLevel: exports.LogLevel.Warning,
             containsPii: false,
-            correlationId: correlationId || ""
+            correlationId: correlationId || Constants.EMPTY_STRING
         });
     };
     /**
@@ -1368,7 +1372,7 @@ var Logger = /** @class */ (function () {
         this.logMessage(message, {
             logLevel: exports.LogLevel.Warning,
             containsPii: true,
-            correlationId: correlationId || ""
+            correlationId: correlationId || Constants.EMPTY_STRING
         });
     };
     /**
@@ -1378,7 +1382,7 @@ var Logger = /** @class */ (function () {
         this.logMessage(message, {
             logLevel: exports.LogLevel.Info,
             containsPii: false,
-            correlationId: correlationId || ""
+            correlationId: correlationId || Constants.EMPTY_STRING
         });
     };
     /**
@@ -1388,7 +1392,7 @@ var Logger = /** @class */ (function () {
         this.logMessage(message, {
             logLevel: exports.LogLevel.Info,
             containsPii: true,
-            correlationId: correlationId || ""
+            correlationId: correlationId || Constants.EMPTY_STRING
         });
     };
     /**
@@ -1398,7 +1402,7 @@ var Logger = /** @class */ (function () {
         this.logMessage(message, {
             logLevel: exports.LogLevel.Verbose,
             containsPii: false,
-            correlationId: correlationId || ""
+            correlationId: correlationId || Constants.EMPTY_STRING
         });
     };
     /**
@@ -1408,7 +1412,7 @@ var Logger = /** @class */ (function () {
         this.logMessage(message, {
             logLevel: exports.LogLevel.Verbose,
             containsPii: true,
-            correlationId: correlationId || ""
+            correlationId: correlationId || Constants.EMPTY_STRING
         });
     };
     /**
@@ -1418,7 +1422,7 @@ var Logger = /** @class */ (function () {
         this.logMessage(message, {
             logLevel: exports.LogLevel.Trace,
             containsPii: false,
-            correlationId: correlationId || ""
+            correlationId: correlationId || Constants.EMPTY_STRING
         });
     };
     /**
@@ -1428,7 +1432,7 @@ var Logger = /** @class */ (function () {
         this.logMessage(message, {
             logLevel: exports.LogLevel.Trace,
             containsPii: true,
-            correlationId: correlationId || ""
+            correlationId: correlationId || Constants.EMPTY_STRING
         });
     };
     /**
@@ -1440,12 +1444,33 @@ var Logger = /** @class */ (function () {
     return Logger;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 /* eslint-disable header/header */
 var name$1 = "@azure/msal-common";
-var version$1 = "6.0.0";
+var version$1 = "6.2.0";
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+exports.AzureCloudInstance = void 0;
+(function (AzureCloudInstance) {
+    // AzureCloudInstance is not specified.
+    AzureCloudInstance[AzureCloudInstance["None"] = 0] = "None";
+    // Microsoft Azure public cloud
+    AzureCloudInstance["AzurePublic"] = "https://login.microsoftonline.com";
+    // Microsoft PPE
+    AzureCloudInstance["AzurePpe"] = "https://login.windows-ppe.net";
+    // Microsoft Chinese national cloud
+    AzureCloudInstance["AzureChina"] = "https://login.chinacloudapi.cn";
+    // Microsoft German national cloud ("Black Forest")
+    AzureCloudInstance["AzureGermany"] = "https://login.microsoftonline.de";
+    // US Government cloud
+    AzureCloudInstance["AzureUsGovernment"] = "https://login.microsoftonline.us";
+})(exports.AzureCloudInstance || (exports.AzureCloudInstance = {}));
+
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1575,7 +1600,7 @@ var CredentialEntity = /** @class */ (function () {
         var credentialId = [
             credentialType,
             clientOrFamilyId,
-            realm || "",
+            realm || Constants.EMPTY_STRING,
         ];
         return credentialId.join(Separators.CACHE_KEY_SEPARATOR).toLowerCase();
     };
@@ -1583,13 +1608,13 @@ var CredentialEntity = /** @class */ (function () {
      * Generate target key component as per schema: <target>
      */
     CredentialEntity.generateTargetForCacheKey = function (scopes) {
-        return (scopes || "").toLowerCase();
+        return (scopes || Constants.EMPTY_STRING).toLowerCase();
     };
     /**
      * Generate requested claims key component as per schema: <requestedClaims>
      */
     CredentialEntity.generateClaimsHashForCacheKey = function (requestedClaimsHash) {
-        return (requestedClaimsHash || "").toLowerCase();
+        return (requestedClaimsHash || Constants.EMPTY_STRING).toLowerCase();
     };
     /**
      * Generate scheme key componenet as per schema: <scheme>
@@ -1599,12 +1624,12 @@ var CredentialEntity = /** @class */ (function () {
          * PoP Tokens and SSH certs include scheme in cache key
          * Cast to lowercase to handle "bearer" from ADFS
          */
-        return (tokenType && tokenType.toLowerCase() !== exports.AuthenticationScheme.BEARER.toLowerCase()) ? tokenType.toLowerCase() : "";
+        return (tokenType && tokenType.toLowerCase() !== exports.AuthenticationScheme.BEARER.toLowerCase()) ? tokenType.toLowerCase() : Constants.EMPTY_STRING;
     };
     return CredentialEntity;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1686,6 +1711,10 @@ var ClientConfigurationErrorMessage = {
         code: "untrusted_authority",
         desc: "The provided authority is not a trusted authority. Please include this authority in the knownAuthorities config parameter."
     },
+    invalidAzureCloudInstance: {
+        code: "invalid_azure_cloud_instance",
+        desc: "Invalid AzureCloudInstance provided. Please refer MSAL JS docs: aks.ms/msaljs/azure_cloud_instance for valid values"
+    },
     missingSshJwk: {
         code: "missing_ssh_jwk",
         desc: "Missing sshJwk in SSH certificate request. A stringified JSON Web Key is required when using the SSH authentication scheme."
@@ -1822,7 +1851,13 @@ var ClientConfigurationError = /** @class */ (function (_super) {
     ClientConfigurationError.createUntrustedAuthorityError = function () {
         return new ClientConfigurationError(ClientConfigurationErrorMessage.untrustedAuthority.code, ClientConfigurationErrorMessage.untrustedAuthority.desc);
     };
-    /*
+    /**
+     * Throws error when the AzureCloudInstance is set to an invalid value
+     */
+    ClientConfigurationError.createInvalidAzureCloudInstanceError = function () {
+        return new ClientConfigurationError(ClientConfigurationErrorMessage.invalidAzureCloudInstance.code, ClientConfigurationErrorMessage.invalidAzureCloudInstance.desc);
+    };
+    /**
      * Throws an error when the authentication scheme is set to SSH but the SSH public key is omitted from the request
      */
     ClientConfigurationError.createMissingSshJwkError = function () {
@@ -1849,7 +1884,7 @@ var ClientConfigurationError = /** @class */ (function (_super) {
     return ClientConfigurationError;
 }(ClientAuthError));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1878,7 +1913,7 @@ var ScopeSet = /** @class */ (function () {
      * @param scopesRequired
      */
     ScopeSet.fromString = function (inputScopeString) {
-        var scopeString = inputScopeString || "";
+        var scopeString = inputScopeString || Constants.EMPTY_STRING;
         var inputScopes = scopeString.split(" ");
         return new ScopeSet(inputScopes);
     };
@@ -2022,7 +2057,7 @@ var ScopeSet = /** @class */ (function () {
             var scopeArr = this.asArray();
             return scopeArr.join(" ");
         }
-        return "";
+        return Constants.EMPTY_STRING;
     };
     /**
      * Prints scopes into a space-delimited lower-case string (used for caching)
@@ -2033,7 +2068,7 @@ var ScopeSet = /** @class */ (function () {
     return ScopeSet;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2071,7 +2106,7 @@ function buildClientInfoFromHomeAccountId(homeAccountId) {
     };
 }
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -2085,7 +2120,7 @@ var AuthorityType;
     AuthorityType[AuthorityType["Adfs"] = 1] = "Adfs";
 })(AuthorityType || (AuthorityType = {}));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2175,8 +2210,8 @@ var AccountEntity = /** @class */ (function () {
     AccountEntity.generateAccountCacheKey = function (accountInterface) {
         var accountKey = [
             accountInterface.homeAccountId,
-            accountInterface.environment || "",
-            accountInterface.tenantId || "",
+            accountInterface.environment || Constants.EMPTY_STRING,
+            accountInterface.tenantId || Constants.EMPTY_STRING,
         ];
         return accountKey.join(Separators.CACHE_KEY_SEPARATOR).toLowerCase();
     };
@@ -2199,17 +2234,17 @@ var AccountEntity = /** @class */ (function () {
         }
         account.environment = env;
         // non AAD scenarios can have empty realm
-        account.realm = ((_a = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _a === void 0 ? void 0 : _a.tid) || "";
+        account.realm = ((_a = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _a === void 0 ? void 0 : _a.tid) || Constants.EMPTY_STRING;
         account.oboAssertion = oboAssertion;
         if (idToken) {
             account.idTokenClaims = idToken.claims;
             // How do you account for MSA CID here?
-            account.localAccountId = ((_b = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _b === void 0 ? void 0 : _b.oid) || ((_c = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _c === void 0 ? void 0 : _c.sub) || "";
+            account.localAccountId = ((_b = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _b === void 0 ? void 0 : _b.oid) || ((_c = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _c === void 0 ? void 0 : _c.sub) || Constants.EMPTY_STRING;
             /*
              * In B2C scenarios the emails claim is used instead of preferred_username and it is an array. In most cases it will contain a single email.
              * This field should not be relied upon if a custom policy is configured to return more than 1 email.
              */
-            account.username = ((_d = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _d === void 0 ? void 0 : _d.preferred_username) || (((_e = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _e === void 0 ? void 0 : _e.emails) ? idToken.claims.emails[0] : "");
+            account.username = ((_d = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _d === void 0 ? void 0 : _d.preferred_username) || (((_e = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _e === void 0 ? void 0 : _e.emails) ? idToken.claims.emails[0] : Constants.EMPTY_STRING);
             account.name = (_f = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _f === void 0 ? void 0 : _f.name;
         }
         account.cloudGraphHostName = cloudGraphHostName;
@@ -2227,7 +2262,7 @@ var AccountEntity = /** @class */ (function () {
         account.authorityType = (authority && authority.authorityType === AuthorityType.Adfs) ? CacheAccountType.ADFS_ACCOUNT_TYPE : CacheAccountType.GENERIC_ACCOUNT_TYPE;
         account.homeAccountId = homeAccountId;
         // non AAD scenarios can have empty realm
-        account.realm = "";
+        account.realm = Constants.EMPTY_STRING;
         account.oboAssertion = oboAssertion;
         var env = environment || authority && authority.getPreferredCache();
         if (!env) {
@@ -2235,10 +2270,10 @@ var AccountEntity = /** @class */ (function () {
         }
         if (idToken) {
             // How do you account for MSA CID here?
-            account.localAccountId = ((_a = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _a === void 0 ? void 0 : _a.oid) || ((_b = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _b === void 0 ? void 0 : _b.sub) || "";
+            account.localAccountId = ((_a = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _a === void 0 ? void 0 : _a.oid) || ((_b = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _b === void 0 ? void 0 : _b.sub) || Constants.EMPTY_STRING;
             // upn claim for most ADFS scenarios
-            account.username = ((_c = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _c === void 0 ? void 0 : _c.upn) || "";
-            account.name = ((_d = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _d === void 0 ? void 0 : _d.name) || "";
+            account.username = ((_c = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _c === void 0 ? void 0 : _c.upn) || Constants.EMPTY_STRING;
+            account.name = ((_d = idToken === null || idToken === void 0 ? void 0 : idToken.claims) === null || _d === void 0 ? void 0 : _d.name) || Constants.EMPTY_STRING;
             account.idTokenClaims = idToken === null || idToken === void 0 ? void 0 : idToken.claims;
         }
         account.environment = env;
@@ -2319,7 +2354,7 @@ var AccountEntity = /** @class */ (function () {
     return AccountEntity;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2357,7 +2392,7 @@ var AuthToken = /** @class */ (function () {
     return AuthToken;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2479,7 +2514,7 @@ var CacheManager = /** @class */ (function () {
      * @param realm
      */
     CacheManager.prototype.getAccountsFilteredBy = function (accountFilter) {
-        return this.getAccountsFilteredByInternal(accountFilter ? accountFilter.homeAccountId : "", accountFilter ? accountFilter.environment : "", accountFilter ? accountFilter.realm : "");
+        return this.getAccountsFilteredByInternal(accountFilter ? accountFilter.homeAccountId : Constants.EMPTY_STRING, accountFilter ? accountFilter.environment : Constants.EMPTY_STRING, accountFilter ? accountFilter.realm : Constants.EMPTY_STRING);
     };
     /**
      * retrieve accounts matching all provided filters; if no filter is set, get all accounts
@@ -3199,7 +3234,7 @@ var DefaultStorageClass = /** @class */ (function (_super) {
     return DefaultStorageClass;
 }(CacheManager));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3209,7 +3244,8 @@ var DefaultStorageClass = /** @class */ (function (_super) {
 var DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;
 var DEFAULT_SYSTEM_OPTIONS = {
     tokenRenewalOffsetSeconds: DEFAULT_TOKEN_RENEWAL_OFFSET_SEC,
-    preventCorsPreflight: false
+    preventCorsPreflight: false,
+    proxyUrl: Constants.EMPTY_STRING
 };
 var DEFAULT_LOGGER_IMPLEMENTATION = {
     loggerCallback: function () {
@@ -3217,7 +3253,7 @@ var DEFAULT_LOGGER_IMPLEMENTATION = {
     },
     piiLoggingEnabled: false,
     logLevel: exports.LogLevel.Info,
-    correlationId: ""
+    correlationId: Constants.EMPTY_STRING
 };
 var DEFAULT_NETWORK_IMPLEMENTATION = {
     sendGetRequestAsync: function () {
@@ -3242,13 +3278,23 @@ var DEFAULT_NETWORK_IMPLEMENTATION = {
 var DEFAULT_LIBRARY_INFO = {
     sku: Constants.SKU,
     version: version$1,
-    cpu: "",
-    os: ""
+    cpu: Constants.EMPTY_STRING,
+    os: Constants.EMPTY_STRING
 };
 var DEFAULT_CLIENT_CREDENTIALS = {
-    clientSecret: "",
+    clientSecret: Constants.EMPTY_STRING,
     clientAssertion: undefined
 };
+var DEFAULT_AZURE_CLOUD_OPTIONS = {
+    azureCloudInstance: exports.AzureCloudInstance.None,
+    tenant: "" + Constants.DEFAULT_COMMON_TENANT
+};
+var DEFAULT_TELEMETRY_OPTIONS = {
+    application: {
+        appName: "",
+        appVersion: ""
+    }
+};
 /**
  * Function that sets the default options when not explicitly configured from app developer
  *
@@ -3257,7 +3303,7 @@ var DEFAULT_CLIENT_CREDENTIALS = {
  * @returns Configuration
  */
 function buildClientConfiguration(_a) {
-    var userAuthOptions = _a.authOptions, userSystemOptions = _a.systemOptions, userLoggerOption = _a.loggerOptions, storageImplementation = _a.storageInterface, networkImplementation = _a.networkInterface, cryptoImplementation = _a.cryptoInterface, clientCredentials = _a.clientCredentials, libraryInfo = _a.libraryInfo, serverTelemetryManager = _a.serverTelemetryManager, persistencePlugin = _a.persistencePlugin, serializableCache = _a.serializableCache;
+    var userAuthOptions = _a.authOptions, userSystemOptions = _a.systemOptions, userLoggerOption = _a.loggerOptions, storageImplementation = _a.storageInterface, networkImplementation = _a.networkInterface, cryptoImplementation = _a.cryptoInterface, clientCredentials = _a.clientCredentials, libraryInfo = _a.libraryInfo, telemetry = _a.telemetry, serverTelemetryManager = _a.serverTelemetryManager, persistencePlugin = _a.persistencePlugin, serializableCache = _a.serializableCache;
     var loggerOptions = __assign(__assign({}, DEFAULT_LOGGER_IMPLEMENTATION), userLoggerOption);
     return {
         authOptions: buildAuthOptions(userAuthOptions),
@@ -3268,6 +3314,7 @@ function buildClientConfiguration(_a) {
         cryptoInterface: cryptoImplementation || DEFAULT_CRYPTO_IMPLEMENTATION,
         clientCredentials: clientCredentials || DEFAULT_CLIENT_CREDENTIALS,
         libraryInfo: __assign(__assign({}, DEFAULT_LIBRARY_INFO), libraryInfo),
+        telemetry: __assign(__assign({}, DEFAULT_TELEMETRY_OPTIONS), telemetry),
         serverTelemetryManager: serverTelemetryManager || null,
         persistencePlugin: persistencePlugin || null,
         serializableCache: serializableCache || null
@@ -3278,10 +3325,10 @@ function buildClientConfiguration(_a) {
  * @param authOptions
  */
 function buildAuthOptions(authOptions) {
-    return __assign({ clientCapabilities: [] }, authOptions);
+    return __assign({ clientCapabilities: [], azureCloudOptions: DEFAULT_AZURE_CLOUD_OPTIONS }, authOptions);
 }
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3301,7 +3348,7 @@ var ServerError = /** @class */ (function (_super) {
     return ServerError;
 }(AuthError));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3397,7 +3444,7 @@ var ThrottlingUtils = /** @class */ (function () {
     return ThrottlingUtils;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3446,7 +3493,7 @@ var NetworkManager = /** @class */ (function () {
     return NetworkManager;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3457,7 +3504,7 @@ var CcsCredentialType;
     CcsCredentialType["UPN"] = "UPN";
 })(CcsCredentialType || (CcsCredentialType = {}));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3521,7 +3568,7 @@ var BaseClient = /** @class */ (function () {
             var response;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.networkManager.sendPostRequest(thumbprint, tokenEndpoint, { body: queryString, headers: headers })];
+                    case 0: return [4 /*yield*/, this.networkManager.sendPostRequest(thumbprint, tokenEndpoint, { body: queryString, headers: headers, proxyUrl: this.config.systemOptions.proxyUrl })];
                     case 1:
                         response = _a.sent();
                         if (this.config.serverTelemetryManager && response.status < 500 && response.status !== 429) {
@@ -3546,7 +3593,7 @@ var BaseClient = /** @class */ (function () {
     return BaseClient;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3632,7 +3679,7 @@ var RequestValidator = /** @class */ (function () {
     return RequestValidator;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3755,8 +3802,24 @@ var RequestParameterBuilder = /** @class */ (function () {
         // Telemetry Info
         this.parameters.set(AADServerParamKeys.X_CLIENT_SKU, libraryInfo.sku);
         this.parameters.set(AADServerParamKeys.X_CLIENT_VER, libraryInfo.version);
-        this.parameters.set(AADServerParamKeys.X_CLIENT_OS, libraryInfo.os);
-        this.parameters.set(AADServerParamKeys.X_CLIENT_CPU, libraryInfo.cpu);
+        if (libraryInfo.os) {
+            this.parameters.set(AADServerParamKeys.X_CLIENT_OS, libraryInfo.os);
+        }
+        if (libraryInfo.cpu) {
+            this.parameters.set(AADServerParamKeys.X_CLIENT_CPU, libraryInfo.cpu);
+        }
+    };
+    /**
+     * Add client telemetry parameters
+     * @param appTelemetry
+     */
+    RequestParameterBuilder.prototype.addApplicationTelemetry = function (appTelemetry) {
+        if (appTelemetry === null || appTelemetry === void 0 ? void 0 : appTelemetry.appName) {
+            this.parameters.set(AADServerParamKeys.X_APP_NAME, appTelemetry.appName);
+        }
+        if (appTelemetry === null || appTelemetry === void 0 ? void 0 : appTelemetry.appVersion) {
+            this.parameters.set(AADServerParamKeys.X_APP_VER, appTelemetry.appVersion);
+        }
     };
     /**
      * add prompt
@@ -3959,6 +4022,12 @@ var RequestParameterBuilder = /** @class */ (function () {
     RequestParameterBuilder.prototype.addThrottling = function () {
         this.parameters.set(AADServerParamKeys.X_MS_LIB_CAPABILITY, ThrottlingConstants.X_MS_LIB_CAPABILITY_VALUE);
     };
+    /**
+     * Adds logout_hint parameter for "silent" logout which prevent server account picker
+     */
+    RequestParameterBuilder.prototype.addLogoutHint = function (logoutHint) {
+        this.parameters.set(AADServerParamKeys.LOGOUT_HINT, encodeURIComponent(logoutHint));
+    };
     /**
      * Utility to create a URL from the params map
      */
@@ -3972,7 +4041,7 @@ var RequestParameterBuilder = /** @class */ (function () {
     return RequestParameterBuilder;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4037,7 +4106,7 @@ var IdTokenEntity = /** @class */ (function (_super) {
     return IdTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4087,7 +4156,7 @@ var TimeUtils = /** @class */ (function () {
     return TimeUtils;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4201,7 +4270,7 @@ var AccessTokenEntity = /** @class */ (function (_super) {
     return AccessTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4268,7 +4337,7 @@ var RefreshTokenEntity = /** @class */ (function (_super) {
     return RefreshTokenEntity;
 }(CredentialEntity));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4332,7 +4401,7 @@ var InteractionRequiredAuthError = /** @class */ (function (_super) {
     return InteractionRequiredAuthError;
 }(AuthError));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4348,7 +4417,7 @@ var CacheRecord = /** @class */ (function () {
     return CacheRecord;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4404,11 +4473,11 @@ var ProtocolUtils = /** @class */ (function () {
             // Split the state between library state and user passed state and decode them separately
             var splitState = state.split(Constants.RESOURCE_DELIM);
             var libraryState = splitState[0];
-            var userState = splitState.length > 1 ? splitState.slice(1).join(Constants.RESOURCE_DELIM) : "";
+            var userState = splitState.length > 1 ? splitState.slice(1).join(Constants.RESOURCE_DELIM) : Constants.EMPTY_STRING;
             var libraryStateString = cryptoObj.base64Decode(libraryState);
             var libraryStateObj = JSON.parse(libraryStateString);
             return {
-                userRequestState: !StringUtils.isEmpty(userState) ? userState : "",
+                userRequestState: !StringUtils.isEmpty(userState) ? userState : Constants.EMPTY_STRING,
                 libraryState: libraryStateObj
             };
         }
@@ -4419,7 +4488,7 @@ var ProtocolUtils = /** @class */ (function () {
     return ProtocolUtils;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4580,7 +4649,7 @@ var UrlString = /** @class */ (function () {
         else if (hashIndex1 > -1) {
             return hashString.substring(hashIndex1 + 1);
         }
-        return "";
+        return Constants.EMPTY_STRING;
     };
     UrlString.constructAuthorityUriFromObject = function (urlObject) {
         return new UrlString(urlObject.Protocol + "//" + urlObject.HostNameAndPort + "/" + urlObject.PathSegments.join("/"));
@@ -4620,7 +4689,7 @@ var UrlString = /** @class */ (function () {
     return UrlString;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4686,7 +4755,7 @@ var PopTokenGenerator = /** @class */ (function () {
                         resourceRequestMethod = request.resourceRequestMethod, resourceRequestUri = request.resourceRequestUri, shrClaims = request.shrClaims, shrNonce = request.shrNonce;
                         resourceUrlString = (resourceRequestUri) ? new UrlString(resourceRequestUri) : undefined;
                         resourceUrlComponents = resourceUrlString === null || resourceUrlString === void 0 ? void 0 : resourceUrlString.getUrlComponents();
-                        return [4 /*yield*/, this.cryptoUtils.signJwt(__assign({ at: payload, ts: TimeUtils.nowSeconds(), m: resourceRequestMethod === null || resourceRequestMethod === void 0 ? void 0 : resourceRequestMethod.toUpperCase(), u: resourceUrlComponents === null || resourceUrlComponents === void 0 ? void 0 : resourceUrlComponents.HostNameAndPort, nonce: shrNonce || this.cryptoUtils.createNewGuid(), p: resourceUrlComponents === null || resourceUrlComponents === void 0 ? void 0 : resourceUrlComponents.AbsolutePath, q: (resourceUrlComponents === null || resourceUrlComponents === void 0 ? void 0 : resourceUrlComponents.QueryString) ? [[], resourceUrlComponents.QueryString] : undefined, client_claims: shrClaims || undefined }, claims), kid)];
+                        return [4 /*yield*/, this.cryptoUtils.signJwt(__assign({ at: payload, ts: TimeUtils.nowSeconds(), m: resourceRequestMethod === null || resourceRequestMethod === void 0 ? void 0 : resourceRequestMethod.toUpperCase(), u: resourceUrlComponents === null || resourceUrlComponents === void 0 ? void 0 : resourceUrlComponents.HostNameAndPort, nonce: shrNonce || this.cryptoUtils.createNewGuid(), p: resourceUrlComponents === null || resourceUrlComponents === void 0 ? void 0 : resourceUrlComponents.AbsolutePath, q: (resourceUrlComponents === null || resourceUrlComponents === void 0 ? void 0 : resourceUrlComponents.QueryString) ? [[], resourceUrlComponents.QueryString] : undefined, client_claims: shrClaims || undefined }, claims), kid, request.correlationId)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -4695,7 +4764,7 @@ var PopTokenGenerator = /** @class */ (function () {
     return PopTokenGenerator;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4765,7 +4834,7 @@ var AppMetadataEntity = /** @class */ (function () {
     return AppMetadataEntity;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4801,7 +4870,7 @@ var AppMetadataEntity = /** @class */ (function () {
     return TokenCacheContext;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4982,8 +5051,8 @@ var ResponseHandler = /** @class */ (function () {
      */
     ResponseHandler.prototype.generateAccountEntity = function (serverTokenResponse, idToken, authority, oboAssertion, authCodePayload) {
         var authorityType = authority.authorityType;
-        var cloudGraphHostName = authCodePayload ? authCodePayload.cloud_graph_host_name : "";
-        var msGraphhost = authCodePayload ? authCodePayload.msgraph_host : "";
+        var cloudGraphHostName = authCodePayload ? authCodePayload.cloud_graph_host_name : Constants.EMPTY_STRING;
+        var msGraphhost = authCodePayload ? authCodePayload.msgraph_host : Constants.EMPTY_STRING;
         // ADFS does not require client_info in the response
         if (authorityType === AuthorityType.Adfs) {
             this.logger.verbose("Authority type is ADFS, creating ADFS account");
@@ -5014,7 +5083,7 @@ var ResponseHandler = /** @class */ (function () {
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        accessToken = "";
+                        accessToken = Constants.EMPTY_STRING;
                         responseScopes = [];
                         expiresOn = null;
                         familyId = Constants.EMPTY_STRING;
@@ -5066,7 +5135,7 @@ var ResponseHandler = /** @class */ (function () {
     return ResponseHandler;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5254,6 +5323,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
                         parameterBuilder.addAuthorizationCode(request.code);
                         // Add library metadata
                         parameterBuilder.addLibraryInfo(this.config.libraryInfo);
+                        parameterBuilder.addApplicationTelemetry(this.config.telemetry.application);
                         parameterBuilder.addThrottling();
                         if (this.serverTelemetryManager) {
                             parameterBuilder.addServerTelemetry(this.serverTelemetryManager);
@@ -5362,6 +5432,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
         parameterBuilder.addResponseTypeCode();
         // add library info parameters
         parameterBuilder.addLibraryInfo(this.config.libraryInfo);
+        parameterBuilder.addApplicationTelemetry(this.config.telemetry.application);
         // add client_info=1
         parameterBuilder.addClientInfo();
         if (request.codeChallenge && request.codeChallengeMethod) {
@@ -5455,6 +5526,9 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
         if (request.state) {
             parameterBuilder.addState(request.state);
         }
+        if (request.logoutHint) {
+            parameterBuilder.addLogoutHint(request.logoutHint);
+        }
         if (request.extraQueryParameters) {
             parameterBuilder.addExtraQueryParameters(request.extraQueryParameters);
         }
@@ -5474,7 +5548,7 @@ var AuthorizationCodeClient = /** @class */ (function (_super) {
     return AuthorizationCodeClient;
 }(BaseClient));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5625,6 +5699,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
                         parameterBuilder.addGrantType(GrantType.REFRESH_TOKEN_GRANT);
                         parameterBuilder.addClientInfo();
                         parameterBuilder.addLibraryInfo(this.config.libraryInfo);
+                        parameterBuilder.addApplicationTelemetry(this.config.telemetry.application);
                         parameterBuilder.addThrottling();
                         if (this.serverTelemetryManager) {
                             parameterBuilder.addServerTelemetry(this.serverTelemetryManager);
@@ -5685,7 +5760,7 @@ var RefreshTokenClient = /** @class */ (function (_super) {
     return RefreshTokenClient;
 }(BaseClient));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5801,7 +5876,7 @@ var SilentFlowClient = /** @class */ (function (_super) {
     return SilentFlowClient;
 }(BaseClient));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5812,7 +5887,7 @@ function isOpenIdConfigResponse(response) {
         response.hasOwnProperty("issuer"));
 }
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5826,7 +5901,7 @@ exports.ProtocolMode = void 0;
     ProtocolMode["OIDC"] = "OIDC";
 })(exports.ProtocolMode || (exports.ProtocolMode = {}));
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5901,7 +5976,7 @@ var AuthorityMetadataEntity = /** @class */ (function () {
     return AuthorityMetadataEntity;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5911,7 +5986,7 @@ function isCloudInstanceDiscoveryResponse(response) {
         response.hasOwnProperty("metadata"));
 }
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5926,18 +6001,22 @@ var RegionDiscovery = /** @class */ (function () {
      *
      * @returns Promise<string | null>
      */
-    RegionDiscovery.prototype.detectRegion = function (environmentRegion, regionDiscoveryMetadata) {
+    RegionDiscovery.prototype.detectRegion = function (environmentRegion, regionDiscoveryMetadata, proxyUrl) {
         return __awaiter(this, void 0, void 0, function () {
-            var autodetectedRegionName, localIMDSVersionResponse, currentIMDSVersion, currentIMDSVersionResponse;
+            var autodetectedRegionName, options, localIMDSVersionResponse, currentIMDSVersion, currentIMDSVersionResponse;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         autodetectedRegionName = environmentRegion;
                         if (!!autodetectedRegionName) return [3 /*break*/, 8];
+                        options = RegionDiscovery.IMDS_OPTIONS;
+                        if (proxyUrl) {
+                            options.proxyUrl = proxyUrl;
+                        }
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 6, , 7]);
-                        return [4 /*yield*/, this.getRegionFromIMDS(Constants.IMDS_VERSION)];
+                        return [4 /*yield*/, this.getRegionFromIMDS(Constants.IMDS_VERSION, options)];
                     case 2:
                         localIMDSVersionResponse = _a.sent();
                         if (localIMDSVersionResponse.status === ResponseCodes.httpSuccess) {
@@ -5945,14 +6024,14 @@ var RegionDiscovery = /** @class */ (function () {
                             regionDiscoveryMetadata.region_source = RegionDiscoverySources.IMDS;
                         }
                         if (!(localIMDSVersionResponse.status === ResponseCodes.httpBadRequest)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.getCurrentVersion()];
+                        return [4 /*yield*/, this.getCurrentVersion(options)];
                     case 3:
                         currentIMDSVersion = _a.sent();
                         if (!currentIMDSVersion) {
                             regionDiscoveryMetadata.region_source = RegionDiscoverySources.FAILED_AUTO_DETECTION;
                             return [2 /*return*/, null];
                         }
-                        return [4 /*yield*/, this.getRegionFromIMDS(currentIMDSVersion)];
+                        return [4 /*yield*/, this.getRegionFromIMDS(currentIMDSVersion, options)];
                     case 4:
                         currentIMDSVersionResponse = _a.sent();
                         if (currentIMDSVersionResponse.status === ResponseCodes.httpSuccess) {
@@ -5985,10 +6064,10 @@ var RegionDiscovery = /** @class */ (function () {
      * @param imdsEndpointUrl
      * @returns Promise<NetworkResponse<string>>
      */
-    RegionDiscovery.prototype.getRegionFromIMDS = function (version) {
+    RegionDiscovery.prototype.getRegionFromIMDS = function (version, options) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.networkInterface.sendGetRequestAsync(Constants.IMDS_ENDPOINT + "?api-version=" + version + "&format=text", RegionDiscovery.IMDS_OPTIONS, Constants.IMDS_TIMEOUT)];
+                return [2 /*return*/, this.networkInterface.sendGetRequestAsync(Constants.IMDS_ENDPOINT + "?api-version=" + version + "&format=text", options, Constants.IMDS_TIMEOUT)];
             });
         });
     };
@@ -5997,14 +6076,14 @@ var RegionDiscovery = /** @class */ (function () {
      *
      * @returns Promise<string | null>
      */
-    RegionDiscovery.prototype.getCurrentVersion = function () {
+    RegionDiscovery.prototype.getCurrentVersion = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             var response;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(Constants.IMDS_ENDPOINT + "?format=json", RegionDiscovery.IMDS_OPTIONS)];
+                        return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(Constants.IMDS_ENDPOINT + "?format=json", options)];
                     case 1:
                         response = _a.sent();
                         // When IMDS endpoint is called without the api version query param, bad request response comes back with latest version.
@@ -6021,11 +6100,15 @@ var RegionDiscovery = /** @class */ (function () {
         });
     };
     // Options for the IMDS endpoint request
-    RegionDiscovery.IMDS_OPTIONS = { headers: { "Metadata": "true" } };
+    RegionDiscovery.IMDS_OPTIONS = {
+        headers: {
+            Metadata: "true",
+        },
+    };
     return RegionDiscovery;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6036,7 +6119,7 @@ var RegionDiscovery = /** @class */ (function () {
  * endpoint. It will store the pertinent config data in this object for use during token calls.
  */
 var Authority = /** @class */ (function () {
-    function Authority(authority, networkInterface, cacheManager, authorityOptions) {
+    function Authority(authority, networkInterface, cacheManager, authorityOptions, proxyUrl) {
         this.canonicalAuthority = authority;
         this._canonicalAuthority.validateAsUri();
         this.networkInterface = networkInterface;
@@ -6044,6 +6127,7 @@ var Authority = /** @class */ (function () {
         this.authorityOptions = authorityOptions;
         this.regionDiscovery = new RegionDiscovery(networkInterface);
         this.regionDiscoveryMetadata = { region_used: undefined, region_source: undefined, region_outcome: undefined };
+        this.proxyUrl = proxyUrl || Constants.EMPTY_STRING;
     }
     Object.defineProperty(Authority.prototype, "authorityType", {
         // See above for AuthorityType
@@ -6312,7 +6396,7 @@ var Authority = /** @class */ (function () {
                         metadata = _b.sent();
                         if (!metadata) return [3 /*break*/, 4];
                         if (!((_a = this.authorityOptions.azureRegionConfiguration) === null || _a === void 0 ? void 0 : _a.azureRegion)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.regionDiscovery.detectRegion(this.authorityOptions.azureRegionConfiguration.environmentRegion, this.regionDiscoveryMetadata)];
+                        return [4 /*yield*/, this.regionDiscovery.detectRegion(this.authorityOptions.azureRegionConfiguration.environmentRegion, this.regionDiscoveryMetadata, this.proxyUrl)];
                     case 2:
                         autodetectedRegionName = _b.sent();
                         azureRegion = this.authorityOptions.azureRegionConfiguration.azureRegion === Constants.AZURE_REGION_AUTO_DISCOVER_FLAG
@@ -6375,19 +6459,25 @@ var Authority = /** @class */ (function () {
      */
     Authority.prototype.getEndpointMetadataFromNetwork = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var response;
+            var options, response;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(this.defaultOpenIdConfigurationEndpoint)];
+                        options = {};
+                        if (this.proxyUrl) {
+                            options.proxyUrl = this.proxyUrl;
+                        }
+                        _a.label = 1;
                     case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(this.defaultOpenIdConfigurationEndpoint, options)];
+                    case 2:
                         response = _a.sent();
                         return [2 /*return*/, isOpenIdConfigResponse(response.body) ? response.body : null];
-                    case 2:
+                    case 3:
                         _a.sent();
                         return [2 /*return*/, null];
-                    case 3: return [2 /*return*/];
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -6457,16 +6547,20 @@ var Authority = /** @class */ (function () {
      */
     Authority.prototype.getCloudDiscoveryMetadataFromNetwork = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var instanceDiscoveryEndpoint, match, response, metadata;
+            var instanceDiscoveryEndpoint, options, match, response, metadata;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         instanceDiscoveryEndpoint = "" + Constants.AAD_INSTANCE_DISCOVERY_ENDPT + this.canonicalAuthority + "oauth2/v2.0/authorize";
+                        options = {};
+                        if (this.proxyUrl) {
+                            options.proxyUrl = this.proxyUrl;
+                        }
                         match = null;
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(instanceDiscoveryEndpoint)];
+                        return [4 /*yield*/, this.networkInterface.sendGetRequestAsync(instanceDiscoveryEndpoint, options)];
                     case 2:
                         response = _a.sent();
                         metadata = isCloudInstanceDiscoveryResponse(response.body) ? response.body.metadata : [];
@@ -6481,7 +6575,7 @@ var Authority = /** @class */ (function () {
                         return [2 /*return*/, null];
                     case 4:
                         if (!match) {
-                            // Custom Domain scenario, host is trusted because Instance Discovery call succeeded 
+                            // Custom Domain scenario, host is trusted because Instance Discovery call succeeded
                             match = Authority.createCloudDiscoveryMetadataFromHost(this.hostnameAndPort);
                         }
                         return [2 /*return*/, match];
@@ -6499,6 +6593,19 @@ var Authority = /** @class */ (function () {
         });
         return matches.length > 0;
     };
+    /**
+     * helper function to populate the authority based on azureCloudOptions
+     * @param authorityString
+     * @param azureCloudOptions
+     */
+    Authority.generateAuthority = function (authorityString, azureCloudOptions) {
+        var authorityAzureCloudInstance;
+        if (azureCloudOptions && azureCloudOptions.azureCloudInstance !== exports.AzureCloudInstance.None) {
+            var tenant = azureCloudOptions.tenant ? azureCloudOptions.tenant : Constants.DEFAULT_COMMON_TENANT;
+            authorityAzureCloudInstance = azureCloudOptions.azureCloudInstance + "/" + tenant + "/";
+        }
+        return authorityAzureCloudInstance ? authorityAzureCloudInstance : authorityString;
+    };
     /**
      * Creates cloud discovery metadata object from a given host
      * @param host
@@ -6591,7 +6698,7 @@ var Authority = /** @class */ (function () {
     return Authority;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6610,13 +6717,13 @@ var AuthorityFactory = /** @class */ (function () {
      * @param networkClient
      * @param protocolMode
      */
-    AuthorityFactory.createDiscoveredInstance = function (authorityUri, networkClient, cacheManager, authorityOptions) {
+    AuthorityFactory.createDiscoveredInstance = function (authorityUri, networkClient, cacheManager, authorityOptions, proxyUrl) {
         return __awaiter(this, void 0, void 0, function () {
             var acquireTokenAuthority, e_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        acquireTokenAuthority = AuthorityFactory.createInstance(authorityUri, networkClient, cacheManager, authorityOptions);
+                        acquireTokenAuthority = AuthorityFactory.createInstance(authorityUri, networkClient, cacheManager, authorityOptions, proxyUrl);
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
@@ -6642,17 +6749,17 @@ var AuthorityFactory = /** @class */ (function () {
      * @param networkInterface
      * @param protocolMode
      */
-    AuthorityFactory.createInstance = function (authorityUrl, networkInterface, cacheManager, authorityOptions) {
+    AuthorityFactory.createInstance = function (authorityUrl, networkInterface, cacheManager, authorityOptions, proxyUrl) {
         // Throw error if authority url is empty
         if (StringUtils.isEmpty(authorityUrl)) {
             throw ClientConfigurationError.createUrlEmptyError();
         }
-        return new Authority(authorityUrl, networkInterface, cacheManager, authorityOptions);
+        return new Authority(authorityUrl, networkInterface, cacheManager, authorityOptions, proxyUrl);
     };
     return AuthorityFactory;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6683,7 +6790,7 @@ var ServerTelemetryEntity = /** @class */ (function () {
     return ServerTelemetryEntity;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6711,7 +6818,7 @@ var ThrottlingEntity = /** @class */ (function () {
     return ThrottlingEntity;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6728,7 +6835,7 @@ var StubbedNetworkModule = {
     }
 };
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6780,14 +6887,14 @@ var AuthenticationHeaderParser = /** @class */ (function () {
         challenges.forEach(function (challenge) {
             var _a = challenge.split("="), key = _a[0], value = _a[1];
             // Remove escaped quotation marks (', ") from challenge string to keep only the challenge value
-            challengeMap[key] = unescape(value.replace(/['"]+/g, ""));
+            challengeMap[key] = unescape(value.replace(/['"]+/g, Constants.EMPTY_STRING));
         });
         return challengeMap;
     };
     return AuthenticationHeaderParser;
 }());
 
-/*! @azure/msal-common v6.0.0 2022-01-04 */
+/*! @azure/msal-common v6.2.0 2022-04-04 */
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6924,9 +7031,9 @@ var ServerTelemetryManager = /** @class */ (function () {
      */
     ServerTelemetryManager.prototype.getRegionDiscoveryFields = function () {
         var regionDiscoveryFields = [];
-        regionDiscoveryFields.push(this.regionUsed || "");
-        regionDiscoveryFields.push(this.regionSource || "");
-        regionDiscoveryFields.push(this.regionOutcome || "");
+        regionDiscoveryFields.push(this.regionUsed || Constants.EMPTY_STRING);
+        regionDiscoveryFields.push(this.regionSource || Constants.EMPTY_STRING);
+        regionDiscoveryFields.push(this.regionOutcome || Constants.EMPTY_STRING);
         return regionDiscoveryFields.join(",");
     };
     /**
@@ -6949,6 +7056,390 @@ var ServerTelemetryManager = /** @class */ (function () {
     return ServerTelemetryManager;
 }());
 
+/*! @azure/msal-common v6.2.0 2022-04-04 */
+/*
+ * 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";
+    /**
+     * 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";
+})(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 v6.2.0 2022-04-04 */
+
+/*
+ * 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}
+     */
+    PerformanceClient.prototype.startMeasurement = function (measureName, correlationId) {
+        var _this = this;
+        var _a, _b;
+        // Generate a placeholder correlation if the request does not provide one
+        var eventCorrelationId = correlationId || this.generateId();
+        if (!correlationId) {
+            this.logger.info("PerformanceClient: No correlation id provided for " + measureName + ", generating", eventCorrelationId);
+        }
+        this.logger.trace("PerformanceClient: Performance measurement started for " + measureName, eventCorrelationId);
+        var performanceMeasurement = this.startPerformanceMeasuremeant(measureName, eventCorrelationId);
+        performanceMeasurement.startMeasurement();
+        var inProgressEvent = {
+            eventId: this.generateId(),
+            status: PerformanceEventStatus.InProgress,
+            authority: this.authority,
+            libraryName: this.libraryName,
+            libraryVersion: this.libraryVersion,
+            appName: (_a = this.applicationTelemetry) === null || _a === void 0 ? void 0 : _a.appName,
+            appVersion: (_b = this.applicationTelemetry) === null || _b === void 0 ? void 0 : _b.appVersion,
+            clientId: this.clientId,
+            name: measureName,
+            startTimeMs: Date.now(),
+            correlationId: eventCorrelationId
+        };
+        // Store in progress events so they can be discarded if not ended properly
+        this.cacheEventByCorrelationId(inProgressEvent);
+        this.cacheMeasurement(inProgressEvent, performanceMeasurement);
+        // Return the event and functions the caller can use to properly end/flush the measurement
+        return {
+            endMeasurement: function (event) {
+                var completedEvent = _this.endMeasurement(__assign(__assign({}, inProgressEvent), event));
+                if (completedEvent) {
+                    // Cache event so that submeasurements can be added downstream
+                    _this.cacheEventByCorrelationId(completedEvent);
+                }
+                return completedEvent;
+            },
+            flushMeasurement: function () {
+                return _this.flushMeasurements(inProgressEvent.name, inProgressEvent.correlationId);
+            },
+            discardMeasurement: function () {
+                return _this.discardMeasurements(inProgressEvent.correlationId);
+            },
+            measurement: performanceMeasurement,
+            event: inProgressEvent
+        };
+    };
+    /**
+     * Stops measuring the performance for an operation. Should only be called directly by PerformanceClient classes,
+     * as consumers should instead use the function returned by startMeasurement.
+     *
+     * @param {PerformanceEvent} event
+     * @returns {(PerformanceEvent | null)}
+     */
+    PerformanceClient.prototype.endMeasurement = function (event) {
+        var performanceMeasurement = this.measurementsById.get(event.eventId);
+        if (performanceMeasurement) {
+            // Immediately delete so that the same event isnt ended twice
+            this.measurementsById.delete(event.eventId);
+            performanceMeasurement.endMeasurement();
+            var durationMs = performanceMeasurement.flushMeasurement();
+            // null indicates no measurement was taken (e.g. needed performance APIs not present)
+            if (durationMs !== null) {
+                this.logger.trace("PerformanceClient: Performance measurement ended for " + event.name + ": " + durationMs + " ms", event.correlationId);
+                var completedEvent = __assign(__assign({ 
+                    // Allow duration to be overwritten when event ends (e.g. testing), but not status
+                    durationMs: Math.round(durationMs) }, event), { status: PerformanceEventStatus.Completed });
+                return completedEvent;
+            }
+            else {
+                this.logger.trace("PerformanceClient: Performance measurement not taken", event.correlationId);
+            }
+        }
+        else {
+            this.logger.trace("PerformanceClient: Measurement not found for " + event.eventId, event.correlationId);
+        }
+        return null;
+    };
+    /**
+     * Upserts event into event cache.
+     * First key is the correlation id, second key is the event id.
+     * Allows for events to be grouped by correlation id,
+     * and to easily allow for properties on them to be updated.
+     *
+     * @private
+     * @param {PerformanceEvent} event
+     */
+    PerformanceClient.prototype.cacheEventByCorrelationId = function (event) {
+        var existingEvents = this.eventsByCorrelationId.get(event.correlationId);
+        if (existingEvents) {
+            this.logger.trace("PerformanceClient: Performance measurement for " + event.name + " added/updated", event.correlationId);
+            existingEvents.set(event.eventId, event);
+        }
+        else {
+            this.logger.trace("PerformanceClient: Performance measurement for " + event.name + " started", event.correlationId);
+            this.eventsByCorrelationId.set(event.correlationId, new Map().set(event.eventId, event));
+        }
+    };
+    /**
+     * Cache measurements by their id.
+     *
+     * @private
+     * @param {PerformanceEvent} event
+     * @param {IPerformanceMeasurement} measurement
+     */
+    PerformanceClient.prototype.cacheMeasurement = function (event, measurement) {
+        this.measurementsById.set(event.eventId, measurement);
+    };
+    /**
+     * Gathers and emits performance events for measurements taked for the given top-level API and correlation ID.
+     *
+     * @param {PerformanceEvents} measureName
+     * @param {string} correlationId
+     */
+    PerformanceClient.prototype.flushMeasurements = function (measureName, correlationId) {
+        var _this = this;
+        this.logger.trace("PerformanceClient: Performance measurements flushed for " + measureName, correlationId);
+        var eventsForCorrelationId = this.eventsByCorrelationId.get(correlationId);
+        if (eventsForCorrelationId) {
+            this.discardMeasurements(correlationId);
+            /*
+             * Manually end incomplete submeasurements to ensure there arent orphaned/never ending events.
+             * Incomplete submeasurements are likely an instrumentation bug that should be fixed.
+             * IE only supports Map.forEach.
+             */
+            var completedEvents_1 = [];
+            eventsForCorrelationId.forEach(function (event) {
+                if (event.name !== measureName && event.status !== PerformanceEventStatus.Completed) {
+                    _this.logger.trace("PerformanceClient: Incomplete submeasurement " + event.name + " found for " + measureName, correlationId);
+                    var completedEvent = _this.endMeasurement(event);
+                    if (completedEvent) {
+                        completedEvents_1.push(completedEvent);
+                    }
+                }
+                completedEvents_1.push(event);
+            });
+            // Sort events by start time (earliest first)
+            var sortedCompletedEvents = completedEvents_1.sort(function (eventA, eventB) { return eventA.startTimeMs - eventB.startTimeMs; });
+            // Take completed top level event and add completed submeasurements durations as properties
+            var topLevelEvents = sortedCompletedEvents.filter(function (event) { return event.name === measureName && event.status === PerformanceEventStatus.Completed; });
+            if (topLevelEvents.length > 0) {
+                /*
+                 * Only take the first top-level event if there are multiple events with the same correlation id.
+                 * This greatly simplifies logic for submeasurements.
+                 */
+                if (topLevelEvents.length > 1) {
+                    this.logger.verbose("PerformanceClient: Multiple distinct top-level performance events found, using the first", correlationId);
+                }
+                var topLevelEvent = topLevelEvents[0];
+                this.logger.verbose("PerformanceClient: Measurement found for " + measureName, correlationId);
+                // Build event object with top level and sub measurements
+                var eventToEmit = sortedCompletedEvents.reduce(function (previous, current) {
+                    if (current.name !== measureName) {
+                        _this.logger.trace("PerformanceClient: Complete submeasurement found for " + current.name, correlationId);
+                        // TODO: Emit additional properties for each subMeasurement
+                        var subMeasurementName = current.name + "DurationMs";
+                        /*
+                         * Some code paths, such as resolving an authority, can occur multiple times.
+                         * Only take the first measurement, since the second could be read from the cache,
+                         * or due to the same correlation id being used for two distinct requests.
+                         */
+                        if (!previous[subMeasurementName]) {
+                            previous[subMeasurementName] = current.durationMs;
+                        }
+                        else {
+                            _this.logger.verbose("PerformanceClient: Submeasurement for " + measureName + " already exists for " + current.name + ", ignoring", correlationId);
+                        }
+                    }
+                    return previous;
+                }, topLevelEvent);
+                this.emitEvents([eventToEmit], eventToEmit.correlationId);
+            }
+            else {
+                this.logger.verbose("PerformanceClient: No completed top-level measurements found for " + measureName, correlationId);
+            }
+        }
+        else {
+            this.logger.verbose("PerformanceClient: No measurements found", correlationId);
+        }
+    };
+    /**
+     * Removes measurements for a given correlation id.
+     *
+     * @param {string} correlationId
+     */
+    PerformanceClient.prototype.discardMeasurements = function (correlationId) {
+        this.logger.trace("PerformanceClient: Performance measurements discarded", correlationId);
+        this.eventsByCorrelationId.delete(correlationId);
+    };
+    /**
+     * Registers a callback function to receive performance events.
+     *
+     * @param {PerformanceCallbackFunction} callback
+     * @returns {string}
+     */
+    PerformanceClient.prototype.addPerformanceCallback = function (callback) {
+        var callbackId = this.generateId();
+        this.callbacks.set(callbackId, callback);
+        this.logger.verbose("PerformanceClient: Performance callback registered with id: " + callbackId);
+        return callbackId;
+    };
+    /**
+     * Removes a callback registered with addPerformanceCallback.
+     *
+     * @param {string} callbackId
+     * @returns {boolean}
+     */
+    PerformanceClient.prototype.removePerformanceCallback = function (callbackId) {
+        var result = this.callbacks.delete(callbackId);
+        if (result) {
+            this.logger.verbose("PerformanceClient: Performance callback " + callbackId + " removed.");
+        }
+        else {
+            this.logger.verbose("PerformanceClient: Performance callback " + callbackId + " not removed.");
+        }
+        return result;
+    };
+    /**
+     * Emits events to all registered callbacks.
+     *
+     * @param {PerformanceEvent[]} events
+     * @param {?string} [correlationId]
+     */
+    PerformanceClient.prototype.emitEvents = function (events, correlationId) {
+        var _this = this;
+        this.logger.verbose("PerformanceClient: Emitting performance events", correlationId);
+        this.callbacks.forEach(function (callback, callbackId) {
+            _this.logger.trace("PerformanceClient: Emitting event to callback " + callbackId, correlationId);
+            callback.apply(null, [events]);
+        });
+    };
+    return PerformanceClient;
+}());
+
+/*! @azure/msal-common v6.2.0 2022-04-04 */
+
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+var StubPerformanceMeasurement = /** @class */ (function () {
+    function StubPerformanceMeasurement() {
+    }
+    /* eslint-disable-next-line @typescript-eslint/no-empty-function */
+    StubPerformanceMeasurement.prototype.startMeasurement = function () { };
+    /* eslint-disable-next-line @typescript-eslint/no-empty-function */
+    StubPerformanceMeasurement.prototype.endMeasurement = function () { };
+    StubPerformanceMeasurement.prototype.flushMeasurement = function () {
+        return null;
+    };
+    return StubPerformanceMeasurement;
+}());
+var StubPerformanceClient = /** @class */ (function (_super) {
+    __extends(StubPerformanceClient, _super);
+    function StubPerformanceClient() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    StubPerformanceClient.prototype.generateId = function () {
+        return "callback-id";
+    };
+    StubPerformanceClient.prototype.startPerformanceMeasuremeant = function () {
+        return new StubPerformanceMeasurement();
+    };
+    return StubPerformanceClient;
+}(PerformanceClient));
+
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -7003,7 +7494,7 @@ var HTTP_REQUEST_TYPE;
 /**
  * Temporary cache keys for MSAL, deleted after any request.
  */
-var TemporaryCacheKeys;
+exports.TemporaryCacheKeys = void 0;
 (function (TemporaryCacheKeys) {
     TemporaryCacheKeys["AUTHORITY"] = "authority";
     TemporaryCacheKeys["ACQUIRE_TOKEN_ACCOUNT"] = "acquireToken.account";
@@ -7018,7 +7509,7 @@ var TemporaryCacheKeys;
     TemporaryCacheKeys["INTERACTION_STATUS_KEY"] = "interaction.status";
     TemporaryCacheKeys["CCS_CREDENTIAL"] = "ccs.credential";
     TemporaryCacheKeys["CORRELATION_ID"] = "request.correlationId";
-})(TemporaryCacheKeys || (TemporaryCacheKeys = {}));
+})(exports.TemporaryCacheKeys || (exports.TemporaryCacheKeys = {}));
 /**
  * Cache keys stored in-memory
  */
@@ -7053,6 +7544,7 @@ exports.InteractionType = void 0;
     InteractionType["Redirect"] = "redirect";
     InteractionType["Popup"] = "popup";
     InteractionType["Silent"] = "silent";
+    InteractionType["None"] = "none";
 })(exports.InteractionType || (exports.InteractionType = {}));
 /**
  * Types of interaction currently in progress.
@@ -7185,7 +7677,7 @@ var GuidGenerator = /** @class */ (function () {
             var guidHolder = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx";
             var hex = "0123456789abcdef";
             var r = 0;
-            var guidResponse = "";
+            var guidResponse = Constants.EMPTY_STRING;
             for (var i = 0; i < 36; i++) {
                 if (guidHolder[i] !== "-" && guidHolder[i] !== "4") {
                     // each x and y needs to be random
@@ -7211,7 +7703,7 @@ var GuidGenerator = /** @class */ (function () {
      * verifies if a string is  GUID
      * @param guid
      */
-    GuidGenerator.isGuid = function (guid) {
+    GuidGenerator.prototype.isGuid = function (guid) {
         var regexGuid = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
         return regexGuid.test(guid);
     };
@@ -7305,7 +7797,7 @@ var BrowserStringUtils = /** @class */ (function () {
      * @param aBytes
      */
     BrowserStringUtils.utf8ArrToString = function (aBytes) {
-        var sView = "";
+        var sView = Constants.EMPTY_STRING;
         for (var nPart = void 0, nLen = aBytes.length, nIdx = 0; nIdx < nLen; nIdx++) {
             nPart = aBytes[nIdx];
             sView += String.fromCharCode(nPart > 251 && nPart < 254 && nIdx + 5 < nLen ? /* six bytes */
@@ -7344,7 +7836,7 @@ var Base64Encode = /** @class */ (function () {
      */
     Base64Encode.prototype.urlEncode = function (input) {
         return encodeURIComponent(this.encode(input)
-            .replace(/=/g, "")
+            .replace(/=/g, Constants.EMPTY_STRING)
             .replace(/\+/g, "-")
             .replace(/\//g, "_"));
     };
@@ -7354,7 +7846,7 @@ var Base64Encode = /** @class */ (function () {
      */
     Base64Encode.prototype.urlEncodeArr = function (inputArr) {
         return this.base64EncArr(inputArr)
-            .replace(/=/g, "")
+            .replace(/=/g, Constants.EMPTY_STRING)
             .replace(/\+/g, "-")
             .replace(/\//g, "_");
     };
@@ -7372,7 +7864,7 @@ var Base64Encode = /** @class */ (function () {
      */
     Base64Encode.prototype.base64EncArr = function (aBytes) {
         var eqLen = (3 - (aBytes.length % 3)) % 3;
-        var sB64Enc = "";
+        var sB64Enc = Constants.EMPTY_STRING;
         for (var nMod3 = void 0, nLen = aBytes.length, nUint24 = 0, nIdx = 0; nIdx < nLen; nIdx++) {
             nMod3 = nIdx % 3;
             /* Uncomment the following line in order to split the output in lines 76-character long: */
@@ -7446,7 +7938,7 @@ var Base64Decode = /** @class */ (function () {
      * @param nBlockSize
      */
     Base64Decode.prototype.base64DecToArr = function (base64String, nBlockSize) {
-        var sB64Enc = base64String.replace(/[^A-Za-z0-9\+\/]/g, "");
+        var sB64Enc = base64String.replace(/[^A-Za-z0-9\+\/]/g, Constants.EMPTY_STRING);
         var nInLen = sB64Enc.length;
         var nOutLen = nBlockSize ? Math.ceil((nInLen * 3 + 1 >>> 2) / nBlockSize) * nBlockSize : nInLen * 3 + 1 >>> 2;
         var aBytes = new Uint8Array(nOutLen);
@@ -8164,11 +8656,11 @@ var BrowserCrypto = /** @class */ (function () {
                         msExportKey.addEventListener("complete", function (e) {
                             var resultBuffer = e.target.result;
                             var resultString = BrowserStringUtils.utf8ArrToString(new Uint8Array(resultBuffer))
-                                .replace(/\r/g, "")
-                                .replace(/\n/g, "")
-                                .replace(/\t/g, "")
-                                .split(" ").join("")
-                                .replace("\u0000", "");
+                                .replace(/\r/g, Constants.EMPTY_STRING)
+                                .replace(/\n/g, Constants.EMPTY_STRING)
+                                .replace(/\t/g, Constants.EMPTY_STRING)
+                                .split(" ").join(Constants.EMPTY_STRING)
+                                .replace("\u0000", Constants.EMPTY_STRING);
                             try {
                                 resolve(JSON.parse(resultString));
                             }
@@ -8275,6 +8767,17 @@ var DatabaseStorage = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Closes the connection to IndexedDB database when all pending transactions
+     * complete.
+     */
+    DatabaseStorage.prototype.closeConnection = function () {
+        var db = this.db;
+        if (db && this.dbOpen) {
+            db.close();
+            this.dbOpen = false;
+        }
+    };
     /**
      * Opens database if it's not already open
      */
@@ -8313,9 +8816,13 @@ var DatabaseStorage = /** @class */ (function () {
                                 var dbGet = objectStore.get(key);
                                 dbGet.addEventListener("success", function (e) {
                                     var event = e;
+                                    _this.closeConnection();
                                     resolve(event.target.result);
                                 });
-                                dbGet.addEventListener("error", function (e) { return reject(e); });
+                                dbGet.addEventListener("error", function (e) {
+                                    _this.closeConnection();
+                                    reject(e);
+                                });
                             })];
                 }
             });
@@ -8342,8 +8849,14 @@ var DatabaseStorage = /** @class */ (function () {
                                 var transaction = _this.db.transaction([_this.tableName], "readwrite");
                                 var objectStore = transaction.objectStore(_this.tableName);
                                 var dbPut = objectStore.put(payload, key);
-                                dbPut.addEventListener("success", function () { return resolve(); });
-                                dbPut.addEventListener("error", function (e) { return reject(e); });
+                                dbPut.addEventListener("success", function () {
+                                    _this.closeConnection();
+                                    resolve();
+                                });
+                                dbPut.addEventListener("error", function (e) {
+                                    _this.closeConnection();
+                                    reject(e);
+                                });
                             })];
                 }
             });
@@ -8368,8 +8881,14 @@ var DatabaseStorage = /** @class */ (function () {
                                 var transaction = _this.db.transaction([_this.tableName], "readwrite");
                                 var objectStore = transaction.objectStore(_this.tableName);
                                 var dbDelete = objectStore.delete(key);
-                                dbDelete.addEventListener("success", function () { return resolve(); });
-                                dbDelete.addEventListener("error", function (e) { return reject(e); });
+                                dbDelete.addEventListener("success", function () {
+                                    _this.closeConnection();
+                                    resolve();
+                                });
+                                dbDelete.addEventListener("error", function (e) {
+                                    _this.closeConnection();
+                                    reject(e);
+                                });
                             })];
                 }
             });
@@ -8395,9 +8914,13 @@ var DatabaseStorage = /** @class */ (function () {
                                 var dbGetKeys = objectStore.getAllKeys();
                                 dbGetKeys.addEventListener("success", function (e) {
                                     var event = e;
+                                    _this.closeConnection();
                                     resolve(event.target.result);
                                 });
-                                dbGetKeys.addEventListener("error", function (e) { return reject(e); });
+                                dbGetKeys.addEventListener("error", function (e) {
+                                    _this.closeConnection();
+                                    reject(e);
+                                });
                             })];
                 }
             });
@@ -8424,9 +8947,13 @@ var DatabaseStorage = /** @class */ (function () {
                                 var dbContainsKey = objectStore.count(key);
                                 dbContainsKey.addEventListener("success", function (e) {
                                     var event = e;
+                                    _this.closeConnection();
                                     resolve(event.target.result === 1);
                                 });
-                                dbContainsKey.addEventListener("error", function (e) { return reject(e); });
+                                dbContainsKey.addEventListener("error", function (e) {
+                                    _this.closeConnection();
+                                    reject(e);
+                                });
                             })];
                 }
             });
@@ -8439,12 +8966,29 @@ var DatabaseStorage = /** @class */ (function () {
      */
     DatabaseStorage.prototype.deleteDatabase = function () {
         return __awaiter$1(this, void 0, void 0, function () {
+            var existingDatabases, database;
             return __generator$1(this, function (_a) {
-                return [2 /*return*/, new Promise(function (resolve, reject) {
-                        var deleteDbRequest = window.indexedDB.deleteDatabase(DB_NAME);
-                        deleteDbRequest.addEventListener("success", function () { return resolve(true); });
-                        deleteDbRequest.addEventListener("error", function () { return reject(false); });
-                    })];
+                switch (_a.label) {
+                    case 0:
+                        // Check if database being deleted exists
+                        if (this.db && this.dbOpen) {
+                            this.closeConnection();
+                        }
+                        return [4 /*yield*/, window.indexedDB.databases()];
+                    case 1:
+                        existingDatabases = _a.sent();
+                        database = existingDatabases.find(function (database) { return database.name === DB_NAME; });
+                        // If database exists, delete it
+                        if (database) {
+                            return [2 /*return*/, new Promise(function (resolve, reject) {
+                                    var deleteDbRequest = window.indexedDB.deleteDatabase(DB_NAME);
+                                    deleteDbRequest.addEventListener("success", function () { return resolve(true); });
+                                    deleteDbRequest.addEventListener("error", function () { return reject(false); });
+                                })];
+                        }
+                        // Database doesn't exist, return true
+                        return [2 /*return*/, true];
+                }
             });
         });
     };
@@ -8493,15 +9037,19 @@ var MemoryStorage = /** @class */ (function () {
  * backed up with the more volatile MemoryStorage object for cases in which IndexedDB may be unavailable.
  */
 var AsyncMemoryStorage = /** @class */ (function () {
-    function AsyncMemoryStorage(logger) {
+    function AsyncMemoryStorage(logger, storeName) {
         this.inMemoryCache = new MemoryStorage();
         this.indexedDBCache = new DatabaseStorage();
         this.logger = logger;
+        this.storeName = storeName;
     }
     AsyncMemoryStorage.prototype.handleDatabaseAccessError = function (error) {
         if (error instanceof BrowserAuthError && error.errorCode === BrowserAuthErrorMessage.databaseUnavailable.code) {
             this.logger.error("Could not access persistent storage. This may be caused by browser privacy features which block persistent storage in third-party contexts.");
         }
+        else {
+            throw error;
+        }
     };
     /**
      * Get the item matching the given key. Tries in-memory cache first, then in the asynchronous
@@ -8646,22 +9194,29 @@ var AsyncMemoryStorage = /** @class */ (function () {
      */
     AsyncMemoryStorage.prototype.clear = function () {
         return __awaiter$1(this, void 0, void 0, function () {
-            var e_6;
+            var dbDeleted, e_6;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        // InMemory cache is a Map instance, clear is straightforward
+                        this.logger.verbose("Deleting in-memory keystore " + this.storeName);
                         this.inMemoryCache.clear();
+                        this.logger.verbose("In-memory keystore " + this.storeName + " deleted");
+                        this.logger.verbose("Deleting persistent keystore " + this.storeName);
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, this.indexedDBCache.deleteDatabase()];
                     case 2:
-                        _a.sent();
-                        return [3 /*break*/, 4];
+                        dbDeleted = _a.sent();
+                        if (dbDeleted) {
+                            this.logger.verbose("Persistent keystore " + this.storeName + " deleted");
+                        }
+                        return [2 /*return*/, dbDeleted];
                     case 3:
                         e_6 = _a.sent();
                         this.handleDatabaseAccessError(e_6);
-                        return [3 /*break*/, 4];
+                        return [2 /*return*/, false];
                     case 4: return [2 /*return*/];
                 }
             });
@@ -8674,12 +9229,17 @@ var AsyncMemoryStorage = /** @class */ (function () {
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
+var CryptoKeyStoreNames;
+(function (CryptoKeyStoreNames) {
+    CryptoKeyStoreNames["asymmetricKeys"] = "asymmetricKeys";
+    CryptoKeyStoreNames["symmetricKeys"] = "symmetricKeys";
+})(CryptoKeyStoreNames || (CryptoKeyStoreNames = {}));
 /**
  * This class implements MSAL's crypto interface, which allows it to perform base64 encoding and decoding, generating cryptographically random GUIDs and
  * implementing Proof Key for Code Exchange specs for the OAuth Authorization Code Flow using PKCE (rfc here: https://tools.ietf.org/html/rfc7636).
  */
 var CryptoOps = /** @class */ (function () {
-    function CryptoOps(logger) {
+    function CryptoOps(logger, performanceClient) {
         this.logger = logger;
         // Browser crypto needs to be validated first before any other classes can be set.
         this.browserCrypto = new BrowserCrypto(this.logger);
@@ -8688,9 +9248,10 @@ var CryptoOps = /** @class */ (function () {
         this.guidGenerator = new GuidGenerator(this.browserCrypto);
         this.pkceGenerator = new PkceGenerator(this.browserCrypto);
         this.cache = {
-            asymmetricKeys: new AsyncMemoryStorage(this.logger),
-            symmetricKeys: new AsyncMemoryStorage(this.logger)
+            asymmetricKeys: new AsyncMemoryStorage(this.logger, CryptoKeyStoreNames.asymmetricKeys),
+            symmetricKeys: new AsyncMemoryStorage(this.logger, CryptoKeyStoreNames.symmetricKeys)
         };
+        this.performanceClient = performanceClient;
     }
     /**
      * Creates a new random GUID - used to populate state and nonce.
@@ -8728,16 +9289,19 @@ var CryptoOps = /** @class */ (function () {
      * @param request
      */
     CryptoOps.prototype.getPublicKeyThumbprint = function (request) {
+        var _a;
         return __awaiter$1(this, void 0, void 0, function () {
-            var keyPair, publicKeyJwk, pubKeyThumprintObj, publicJwkString, publicJwkHash, privateKeyJwk, unextractablePrivateKey;
-            return __generator$1(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.browserCrypto.generateKeyPair(CryptoOps.EXTRACTABLE, CryptoOps.POP_KEY_USAGES)];
+            var publicKeyThumbMeasurement, keyPair, publicKeyJwk, pubKeyThumprintObj, publicJwkString, publicJwkHash, privateKeyJwk, unextractablePrivateKey;
+            return __generator$1(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        publicKeyThumbMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.CryptoOptsGetPublicKeyThumbprint, request.correlationId);
+                        return [4 /*yield*/, this.browserCrypto.generateKeyPair(CryptoOps.EXTRACTABLE, CryptoOps.POP_KEY_USAGES)];
                     case 1:
-                        keyPair = _a.sent();
+                        keyPair = _b.sent();
                         return [4 /*yield*/, this.browserCrypto.exportJwk(keyPair.publicKey)];
                     case 2:
-                        publicKeyJwk = _a.sent();
+                        publicKeyJwk = _b.sent();
                         pubKeyThumprintObj = {
                             e: publicKeyJwk.e,
                             kty: publicKeyJwk.kty,
@@ -8746,13 +9310,13 @@ var CryptoOps = /** @class */ (function () {
                         publicJwkString = BrowserCrypto.getJwkString(pubKeyThumprintObj);
                         return [4 /*yield*/, this.hashString(publicJwkString)];
                     case 3:
-                        publicJwkHash = _a.sent();
+                        publicJwkHash = _b.sent();
                         return [4 /*yield*/, this.browserCrypto.exportJwk(keyPair.privateKey)];
                     case 4:
-                        privateKeyJwk = _a.sent();
+                        privateKeyJwk = _b.sent();
                         return [4 /*yield*/, this.browserCrypto.importJwk(privateKeyJwk, false, ["sign"])];
                     case 5:
-                        unextractablePrivateKey = _a.sent();
+                        unextractablePrivateKey = _b.sent();
                         // Store Keypair data in keystore
                         return [4 /*yield*/, this.cache.asymmetricKeys.setItem(publicJwkHash, {
                                 privateKey: unextractablePrivateKey,
@@ -8762,7 +9326,12 @@ var CryptoOps = /** @class */ (function () {
                             })];
                     case 6:
                         // Store Keypair data in keystore
-                        _a.sent();
+                        _b.sent();
+                        if (publicKeyThumbMeasurement) {
+                            publicKeyThumbMeasurement.endMeasurement({
+                                success: true
+                            });
+                        }
                         return [2 /*return*/, publicJwkHash];
                 }
             });
@@ -8793,21 +9362,32 @@ var CryptoOps = /** @class */ (function () {
      */
     CryptoOps.prototype.clearKeystore = function () {
         return __awaiter$1(this, void 0, void 0, function () {
-            var dataStoreNames, databaseStorage, _a;
-            return __generator$1(this, function (_b) {
-                switch (_b.label) {
+            var e_1;
+            return __generator$1(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        dataStoreNames = Object.keys(this.cache);
-                        databaseStorage = this.cache[dataStoreNames[0]];
-                        if (!databaseStorage) return [3 /*break*/, 2];
-                        return [4 /*yield*/, databaseStorage.deleteDatabase()];
+                        _a.trys.push([0, 3, , 4]);
+                        this.logger.verbose("Deleting in-memory and persistent asymmetric key stores");
+                        return [4 /*yield*/, this.cache.asymmetricKeys.clear()];
                     case 1:
-                        _a = _b.sent();
-                        return [3 /*break*/, 3];
+                        _a.sent();
+                        this.logger.verbose("Successfully deleted asymmetric key stores");
+                        this.logger.verbose("Deleting in-memory and persistent symmetric key stores");
+                        return [4 /*yield*/, this.cache.symmetricKeys.clear()];
                     case 2:
-                        _a = false;
-                        _b.label = 3;
-                    case 3: return [2 /*return*/, _a];
+                        _a.sent();
+                        this.logger.verbose("Successfully deleted symmetric key stores");
+                        return [2 /*return*/, true];
+                    case 3:
+                        e_1 = _a.sent();
+                        if (e_1 instanceof Error) {
+                            this.logger.error("Clearing keystore failed with error: " + e_1.message);
+                        }
+                        else {
+                            this.logger.error("Clearing keystore failed with unknown error");
+                        }
+                        return [2 /*return*/, false];
+                    case 4: return [2 /*return*/];
                 }
             });
         });
@@ -8817,20 +9397,23 @@ var CryptoOps = /** @class */ (function () {
      * @param payload
      * @param kid
      */
-    CryptoOps.prototype.signJwt = function (payload, kid) {
+    CryptoOps.prototype.signJwt = function (payload, kid, correlationId) {
+        var _a;
         return __awaiter$1(this, void 0, void 0, function () {
-            var cachedKeyPair, publicKeyJwk, publicKeyJwkString, header, encodedHeader, encodedPayload, tokenString, tokenBuffer, signatureBuffer, encodedSignature;
-            return __generator$1(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.cache.asymmetricKeys.getItem(kid)];
+            var signJwtMeasurement, cachedKeyPair, publicKeyJwk, publicKeyJwkString, header, encodedHeader, encodedPayload, tokenString, tokenBuffer, signatureBuffer, encodedSignature, signedJwt;
+            return __generator$1(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        signJwtMeasurement = (_a = this.performanceClient) === null || _a === void 0 ? void 0 : _a.startMeasurement(exports.PerformanceEvents.CryptoOptsSignJwt, correlationId);
+                        return [4 /*yield*/, this.cache.asymmetricKeys.getItem(kid)];
                     case 1:
-                        cachedKeyPair = _a.sent();
+                        cachedKeyPair = _b.sent();
                         if (!cachedKeyPair) {
                             throw BrowserAuthError.createSigningKeyNotFoundInStorageError(kid);
                         }
                         return [4 /*yield*/, this.browserCrypto.exportJwk(cachedKeyPair.publicKey)];
                     case 2:
-                        publicKeyJwk = _a.sent();
+                        publicKeyJwk = _b.sent();
                         publicKeyJwkString = BrowserCrypto.getJwkString(publicKeyJwk);
                         header = {
                             alg: publicKeyJwk.alg,
@@ -8846,9 +9429,15 @@ var CryptoOps = /** @class */ (function () {
                         tokenBuffer = BrowserStringUtils.stringToArrayBuffer(tokenString);
                         return [4 /*yield*/, this.browserCrypto.sign(cachedKeyPair.privateKey, tokenBuffer)];
                     case 3:
-                        signatureBuffer = _a.sent();
+                        signatureBuffer = _b.sent();
                         encodedSignature = this.b64Encode.urlEncodeArr(new Uint8Array(signatureBuffer));
-                        return [2 /*return*/, tokenString + "." + encodedSignature];
+                        signedJwt = tokenString + "." + encodedSignature;
+                        if (signJwtMeasurement) {
+                            signJwtMeasurement.endMeasurement({
+                                success: true
+                            });
+                        }
+                        return [2 /*return*/, signedJwt];
                 }
             });
         });
@@ -9368,8 +9957,8 @@ var BrowserCacheManager = /** @class */ (function (_super) {
      * Returns wrapper metadata from in-memory storage
      */
     BrowserCacheManager.prototype.getWrapperMetadata = function () {
-        var sku = this.internalStorage.getItem(InMemoryCacheKeys.WRAPPER_SKU) || "";
-        var version = this.internalStorage.getItem(InMemoryCacheKeys.WRAPPER_VER) || "";
+        var sku = this.internalStorage.getItem(InMemoryCacheKeys.WRAPPER_SKU) || Constants.EMPTY_STRING;
+        var version = this.internalStorage.getItem(InMemoryCacheKeys.WRAPPER_VER) || Constants.EMPTY_STRING;
         return [sku, version];
     };
     /**
@@ -9591,7 +10180,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
                 return decodeURIComponent(cookie.substring(name.length, cookie.length));
             }
         }
-        return "";
+        return Constants.EMPTY_STRING;
     };
     /**
      * Clear all msal-related cookies currently set in the browser. Should only be used to clear temporary cache items.
@@ -9616,7 +10205,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
      * @param cookieName
      */
     BrowserCacheManager.prototype.clearItemCookie = function (cookieName) {
-        this.setItemCookie(cookieName, "", -1);
+        this.setItemCookie(cookieName, Constants.EMPTY_STRING, -1);
     };
     /**
      * Get cookie expiration time
@@ -9660,7 +10249,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
      */
     BrowserCacheManager.prototype.generateAuthorityKey = function (stateString) {
         var stateId = ProtocolUtils.parseRequestState(this.cryptoImpl, stateString).libraryState.id;
-        return this.generateCacheKey(TemporaryCacheKeys.AUTHORITY + "." + stateId);
+        return this.generateCacheKey(exports.TemporaryCacheKeys.AUTHORITY + "." + stateId);
     };
     /**
      * Create Nonce key to cache nonce
@@ -9668,7 +10257,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
      */
     BrowserCacheManager.prototype.generateNonceKey = function (stateString) {
         var stateId = ProtocolUtils.parseRequestState(this.cryptoImpl, stateString).libraryState.id;
-        return this.generateCacheKey(TemporaryCacheKeys.NONCE_IDTOKEN + "." + stateId);
+        return this.generateCacheKey(exports.TemporaryCacheKeys.NONCE_IDTOKEN + "." + stateId);
     };
     /**
      * Creates full cache key for the request state
@@ -9677,7 +10266,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
     BrowserCacheManager.prototype.generateStateKey = function (stateString) {
         // Use the library state id to key temp storage for uniqueness for multiple concurrent requests
         var stateId = ProtocolUtils.parseRequestState(this.cryptoImpl, stateString).libraryState.id;
-        return this.generateCacheKey(TemporaryCacheKeys.REQUEST_STATE + "." + stateId);
+        return this.generateCacheKey(exports.TemporaryCacheKeys.REQUEST_STATE + "." + stateId);
     };
     /**
      * Gets the cached authority based on the cached state. Returns empty if no cached state found.
@@ -9712,14 +10301,14 @@ var BrowserCacheManager = /** @class */ (function (_super) {
                 credential: account.homeAccountId,
                 type: CcsCredentialType.HOME_ACCOUNT_ID
             };
-            this.setTemporaryCache(TemporaryCacheKeys.CCS_CREDENTIAL, JSON.stringify(ccsCredential), true);
+            this.setTemporaryCache(exports.TemporaryCacheKeys.CCS_CREDENTIAL, JSON.stringify(ccsCredential), true);
         }
         else if (!StringUtils.isEmpty(loginHint)) {
             var ccsCredential = {
                 credential: loginHint,
                 type: CcsCredentialType.UPN
             };
-            this.setTemporaryCache(TemporaryCacheKeys.CCS_CREDENTIAL, JSON.stringify(ccsCredential), true);
+            this.setTemporaryCache(exports.TemporaryCacheKeys.CCS_CREDENTIAL, JSON.stringify(ccsCredential), true);
         }
     };
     /**
@@ -9743,11 +10332,11 @@ var BrowserCacheManager = /** @class */ (function (_super) {
             this.removeItem(this.generateNonceKey(state));
             this.removeItem(this.generateAuthorityKey(state));
         }
-        this.removeItem(this.generateCacheKey(TemporaryCacheKeys.REQUEST_PARAMS));
-        this.removeItem(this.generateCacheKey(TemporaryCacheKeys.ORIGIN_URI));
-        this.removeItem(this.generateCacheKey(TemporaryCacheKeys.URL_HASH));
-        this.removeItem(this.generateCacheKey(TemporaryCacheKeys.CORRELATION_ID));
-        this.removeItem(this.generateCacheKey(TemporaryCacheKeys.CCS_CREDENTIAL));
+        this.removeItem(this.generateCacheKey(exports.TemporaryCacheKeys.REQUEST_PARAMS));
+        this.removeItem(this.generateCacheKey(exports.TemporaryCacheKeys.ORIGIN_URI));
+        this.removeItem(this.generateCacheKey(exports.TemporaryCacheKeys.URL_HASH));
+        this.removeItem(this.generateCacheKey(exports.TemporaryCacheKeys.CORRELATION_ID));
+        this.removeItem(this.generateCacheKey(exports.TemporaryCacheKeys.CCS_CREDENTIAL));
         this.setInteractionInProgress(false);
     };
     /**
@@ -9761,7 +10350,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
             var stateKey = this.generateStateKey(stateString);
             var cachedState = this.temporaryCacheStorage.getItem(stateKey);
             this.logger.infoPii("BrowserCacheManager.cleanRequestByState: Removing temporary cache items for state: " + cachedState);
-            this.resetRequestCache(cachedState || "");
+            this.resetRequestCache(cachedState || Constants.EMPTY_STRING);
         }
         this.clearMsalCookies();
     };
@@ -9776,7 +10365,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
         // Loop through all keys to find state key
         this.getKeys().forEach(function (key) {
             // If this key is not the state key, move on
-            if (key.indexOf(TemporaryCacheKeys.REQUEST_STATE) === -1) {
+            if (key.indexOf(exports.TemporaryCacheKeys.REQUEST_STATE) === -1) {
                 return;
             }
             // Retrieve state value, return if not a valid value
@@ -9797,7 +10386,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
     BrowserCacheManager.prototype.cacheCodeRequest = function (authCodeRequest, browserCrypto) {
         this.logger.trace("BrowserCacheManager.cacheCodeRequest called");
         var encodedValue = browserCrypto.base64Encode(JSON.stringify(authCodeRequest));
-        this.setTemporaryCache(TemporaryCacheKeys.REQUEST_PARAMS, encodedValue, true);
+        this.setTemporaryCache(exports.TemporaryCacheKeys.REQUEST_PARAMS, encodedValue, true);
     };
     /**
      * Gets the token exchange parameters from the cache. Throws an error if nothing is found.
@@ -9805,7 +10394,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
     BrowserCacheManager.prototype.getCachedRequest = function (state, browserCrypto) {
         this.logger.trace("BrowserCacheManager.getCachedRequest called");
         // Get token request from cache and parse as TokenExchangeParameters.
-        var encodedTokenRequest = this.getTemporaryCache(TemporaryCacheKeys.REQUEST_PARAMS, true);
+        var encodedTokenRequest = this.getTemporaryCache(exports.TemporaryCacheKeys.REQUEST_PARAMS, true);
         if (!encodedTokenRequest) {
             throw BrowserAuthError.createNoTokenRequestCacheError();
         }
@@ -9813,7 +10402,7 @@ var BrowserCacheManager = /** @class */ (function (_super) {
         if (!parsedRequest) {
             throw BrowserAuthError.createUnableToParseTokenRequestCacheError();
         }
-        this.removeItem(this.generateCacheKey(TemporaryCacheKeys.REQUEST_PARAMS));
+        this.removeItem(this.generateCacheKey(exports.TemporaryCacheKeys.REQUEST_PARAMS));
         // Get cached authority and use if no authority is cached with request.
         if (StringUtils.isEmpty(parsedRequest.authority)) {
             var authorityCacheKey = this.generateAuthorityKey(state);
@@ -9835,18 +10424,22 @@ var BrowserCacheManager = /** @class */ (function (_super) {
         }
     };
     BrowserCacheManager.prototype.getInteractionInProgress = function () {
-        var key = Constants.CACHE_PREFIX + "." + TemporaryCacheKeys.INTERACTION_STATUS_KEY;
+        var key = Constants.CACHE_PREFIX + "." + exports.TemporaryCacheKeys.INTERACTION_STATUS_KEY;
         return this.getTemporaryCache(key, false);
     };
     BrowserCacheManager.prototype.setInteractionInProgress = function (inProgress) {
-        var clientId = this.getInteractionInProgress();
         // Ensure we don't overwrite interaction in progress for a different clientId
-        var key = Constants.CACHE_PREFIX + "." + TemporaryCacheKeys.INTERACTION_STATUS_KEY;
-        if (inProgress && !clientId) {
-            // No interaction is in progress
-            this.setTemporaryCache(key, this.clientId, false);
+        var key = Constants.CACHE_PREFIX + "." + exports.TemporaryCacheKeys.INTERACTION_STATUS_KEY;
+        if (inProgress) {
+            if (this.getInteractionInProgress()) {
+                throw BrowserAuthError.createInteractionInProgressError();
+            }
+            else {
+                // No interaction is in progress
+                this.setTemporaryCache(key, this.clientId, false);
+            }
         }
-        else if (!inProgress && clientId === this.clientId) {
+        else if (!inProgress && this.getInteractionInProgress() === this.clientId) {
             this.removeItem(key);
         }
     };
@@ -9980,7 +10573,7 @@ var FetchClient = /** @class */ (function () {
             return __generator$1(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        reqBody = (options && options.body) || "";
+                        reqBody = (options && options.body) || Constants.EMPTY_STRING;
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 3, , 4]);
@@ -10200,7 +10793,7 @@ var BrowserUtils = /** @class */ (function () {
     BrowserUtils.replaceHash = function (url) {
         var urlParts = url.split("#");
         urlParts.shift(); // Remove part before the hash
-        window.location.hash = urlParts.length > 0 ? urlParts.join("#") : "";
+        window.location.hash = urlParts.length > 0 ? urlParts.join("#") : Constants.EMPTY_STRING;
     };
     /**
      * Returns boolean of whether the current window is in an iframe or not.
@@ -10361,19 +10954,23 @@ var DEFAULT_REDIRECT_TIMEOUT_MS = 30000;
  * @returns Configuration object
  */
 function buildConfiguration(_a, isBrowserEnvironment) {
-    var userInputAuth = _a.auth, userInputCache = _a.cache, userInputSystem = _a.system;
+    var userInputAuth = _a.auth, userInputCache = _a.cache, userInputSystem = _a.system, userInputTelemetry = _a.telemetry;
     // Default auth options for browser
     var DEFAULT_AUTH_OPTIONS = {
-        clientId: "",
+        clientId: Constants.EMPTY_STRING,
         authority: "" + Constants.DEFAULT_AUTHORITY,
         knownAuthorities: [],
-        cloudDiscoveryMetadata: "",
-        authorityMetadata: "",
-        redirectUri: "",
-        postLogoutRedirectUri: "",
+        cloudDiscoveryMetadata: Constants.EMPTY_STRING,
+        authorityMetadata: Constants.EMPTY_STRING,
+        redirectUri: Constants.EMPTY_STRING,
+        postLogoutRedirectUri: Constants.EMPTY_STRING,
         navigateToLoginRequestUrl: true,
         clientCapabilities: [],
-        protocolMode: exports.ProtocolMode.AAD
+        protocolMode: exports.ProtocolMode.AAD,
+        azureCloudOptions: {
+            azureCloudInstance: exports.AzureCloudInstance.None,
+            tenant: Constants.EMPTY_STRING
+        },
     };
     // Default cache options for browser
     var DEFAULT_CACHE_OPTIONS = {
@@ -10392,17 +10989,24 @@ function buildConfiguration(_a, isBrowserEnvironment) {
     var DEFAULT_BROWSER_SYSTEM_OPTIONS = __assign$1(__assign$1({}, DEFAULT_SYSTEM_OPTIONS), { loggerOptions: DEFAULT_LOGGER_OPTIONS, networkClient: isBrowserEnvironment ? BrowserUtils.getBrowserNetworkClient() : StubbedNetworkModule, navigationClient: new NavigationClient(), loadFrameTimeout: 0, 
         // If loadFrameTimeout is provided, use that as default.
         windowHashTimeout: (userInputSystem && userInputSystem.loadFrameTimeout) || DEFAULT_POPUP_TIMEOUT_MS, iframeHashTimeout: (userInputSystem && userInputSystem.loadFrameTimeout) || DEFAULT_IFRAME_TIMEOUT_MS, navigateFrameWait: isBrowserEnvironment && BrowserUtils.detectIEOrEdge() ? 500 : 0, redirectNavigationTimeout: DEFAULT_REDIRECT_TIMEOUT_MS, asyncPopups: false, allowRedirectInIframe: false });
+    var DEFAULT_TELEMETRY_OPTIONS = {
+        application: {
+            appName: Constants.EMPTY_STRING,
+            appVersion: Constants.EMPTY_STRING
+        }
+    };
     var overlayedConfig = {
         auth: __assign$1(__assign$1({}, DEFAULT_AUTH_OPTIONS), userInputAuth),
         cache: __assign$1(__assign$1({}, DEFAULT_CACHE_OPTIONS), userInputCache),
-        system: __assign$1(__assign$1({}, DEFAULT_BROWSER_SYSTEM_OPTIONS), userInputSystem)
+        system: __assign$1(__assign$1({}, DEFAULT_BROWSER_SYSTEM_OPTIONS), userInputSystem),
+        telemetry: __assign$1(__assign$1({}, DEFAULT_TELEMETRY_OPTIONS), userInputTelemetry)
     };
     return overlayedConfig;
 }
 
 /* eslint-disable header/header */
 var name = "@azure/msal-browser";
-var version = "2.21.0";
+var version = "2.23.0";
 
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -10559,7 +11163,7 @@ var EventHandler = /** @class */ (function () {
  * Licensed under the MIT License.
  */
 var BaseInteractionClient = /** @class */ (function () {
-    function BaseInteractionClient(config, storageImpl, browserCrypto, logger, eventHandler, correlationId) {
+    function BaseInteractionClient(config, storageImpl, browserCrypto, logger, eventHandler, performanceClient, correlationId) {
         this.config = config;
         this.browserStorage = storageImpl;
         this.browserCrypto = browserCrypto;
@@ -10567,6 +11171,7 @@ var BaseInteractionClient = /** @class */ (function () {
         this.eventHandler = eventHandler;
         this.correlationId = correlationId || this.browserCrypto.createNewGuid();
         this.logger = logger.clone(BrowserConstants.MSAL_SKU, version, this.correlationId);
+        this.performanceClient = performanceClient;
     }
     BaseInteractionClient.prototype.clearCacheOnLogout = function (account) {
         return __awaiter$1(this, void 0, void 0, function () {
@@ -10593,6 +11198,7 @@ var BaseInteractionClient = /** @class */ (function () {
                     case 4: return [3 /*break*/, 9];
                     case 5:
                         _a.trys.push([5, 8, , 9]);
+                        this.logger.verbose("No account provided in logout request, clearing all cache items.", this.correlationId);
                         // Clear all accounts and tokens
                         return [4 /*yield*/, this.browserStorage.clear()];
                     case 6:
@@ -10603,7 +11209,6 @@ var BaseInteractionClient = /** @class */ (function () {
                     case 7:
                         // Clear any stray keys from IndexedDB
                         _a.sent();
-                        this.logger.verbose("No account provided in logout request, clearing all cache items.");
                         return [3 /*break*/, 9];
                     case 8:
                         _a.sent();
@@ -10620,20 +11225,22 @@ var BaseInteractionClient = /** @class */ (function () {
      */
     BaseInteractionClient.prototype.initializeBaseRequest = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var authority, scopes, _a, validatedRequest;
+            var authority, scopes, validatedRequest, _a;
             return __generator$1(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         this.logger.verbose("Initializing BaseAuthRequest");
                         authority = request.authority || this.config.auth.authority;
                         scopes = __spread(((request && request.scopes) || []));
+                        validatedRequest = __assign$1(__assign$1({}, request), { correlationId: this.correlationId, authority: authority,
+                            scopes: scopes });
                         // Set authenticationScheme to BEARER if not explicitly set in the request
-                        if (!request.authenticationScheme) {
-                            request.authenticationScheme = exports.AuthenticationScheme.BEARER;
+                        if (!validatedRequest.authenticationScheme) {
+                            validatedRequest.authenticationScheme = exports.AuthenticationScheme.BEARER;
                             this.logger.verbose("Authentication Scheme wasn't explicitly set in request, defaulting to \"Bearer\" request");
                         }
                         else {
-                            if (request.authenticationScheme === exports.AuthenticationScheme.SSH) {
+                            if (validatedRequest.authenticationScheme === exports.AuthenticationScheme.SSH) {
                                 if (!request.sshJwk) {
                                     throw ClientConfigurationError.createMissingSshJwkError();
                                 }
@@ -10641,18 +11248,15 @@ var BaseInteractionClient = /** @class */ (function () {
                                     throw ClientConfigurationError.createMissingSshKidError();
                                 }
                             }
-                            this.logger.verbose("Authentication Scheme set to \"" + request.authenticationScheme + "\" as configured in Auth request");
+                            this.logger.verbose("Authentication Scheme set to \"" + validatedRequest.authenticationScheme + "\" as configured in Auth request");
                         }
                         if (!(request.claims && !StringUtils.isEmpty(request.claims))) return [3 /*break*/, 2];
-                        _a = request;
+                        _a = validatedRequest;
                         return [4 /*yield*/, this.browserCrypto.hashString(request.claims)];
                     case 1:
                         _a.requestedClaimsHash = _b.sent();
                         _b.label = 2;
-                    case 2:
-                        validatedRequest = __assign$1(__assign$1({}, request), { correlationId: this.correlationId, authority: authority,
-                            scopes: scopes });
-                        return [2 /*return*/, validatedRequest];
+                    case 2: return [2 /*return*/, validatedRequest];
                 }
             });
         });
@@ -10699,8 +11303,8 @@ var BaseInteractionClient = /** @class */ (function () {
  */
 var StandardInteractionClient = /** @class */ (function (_super) {
     __extends$1(StandardInteractionClient, _super);
-    function StandardInteractionClient(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, correlationId) {
-        var _this = _super.call(this, config, storageImpl, browserCrypto, logger, eventHandler, correlationId) || this;
+    function StandardInteractionClient(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, performanceClient, correlationId) {
+        var _this = _super.call(this, config, storageImpl, browserCrypto, logger, eventHandler, performanceClient, correlationId) || this;
         _this.navigationClient = navigationClient;
         return _this;
     }
@@ -10718,7 +11322,7 @@ var StandardInteractionClient = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.browserCrypto.generatePkceCodes()];
                     case 1:
                         generatedPkceParams = _a.sent();
-                        authCodeRequest = __assign$1(__assign$1({}, request), { redirectUri: request.redirectUri, code: "", codeVerifier: generatedPkceParams.verifier });
+                        authCodeRequest = __assign$1(__assign$1({}, request), { redirectUri: request.redirectUri, code: Constants.EMPTY_STRING, codeVerifier: generatedPkceParams.verifier });
                         request.codeChallenge = generatedPkceParams.challenge;
                         request.codeChallengeMethod = Constants.S256_CODE_CHALLENGE_METHOD;
                         return [2 /*return*/, authCodeRequest];
@@ -10732,11 +11336,32 @@ var StandardInteractionClient = /** @class */ (function (_super) {
      */
     StandardInteractionClient.prototype.initializeLogoutRequest = function (logoutRequest) {
         this.logger.verbose("initializeLogoutRequest called", logoutRequest === null || logoutRequest === void 0 ? void 0 : logoutRequest.correlationId);
-        // Check if interaction is in progress. Throw error if true.
-        if (this.browserStorage.isInteractionInProgress()) {
-            throw BrowserAuthError.createInteractionInProgressError();
-        }
         var validLogoutRequest = __assign$1({ correlationId: this.browserCrypto.createNewGuid() }, logoutRequest);
+        /**
+         * Set logout_hint to be login_hint from ID Token Claims if present
+         * and logoutHint attribute wasn't manually set in logout request
+         */
+        if (logoutRequest) {
+            // If logoutHint isn't set and an account was passed in, try to extract logoutHint from ID Token Claims
+            if (!logoutRequest.logoutHint) {
+                if (logoutRequest.account) {
+                    var logoutHint = this.getLogoutHintFromIdTokenClaims(logoutRequest.account);
+                    if (logoutHint) {
+                        this.logger.verbose("Setting logoutHint to login_hint ID Token Claim value for the account provided");
+                        validLogoutRequest.logoutHint = logoutHint;
+                    }
+                }
+                else {
+                    this.logger.verbose("logoutHint was not set and account was not passed into logout request, logoutHint will not be set");
+                }
+            }
+            else {
+                this.logger.verbose("logoutHint has already been set in logoutRequest");
+            }
+        }
+        else {
+            this.logger.verbose("logoutHint will not be set since no logout request was configured");
+        }
         /*
          * Only set redirect uri if logout request isn't provided or the set uri isn't null.
          * Otherwise, use passed uri, config, or current page.
@@ -10763,17 +11388,37 @@ var StandardInteractionClient = /** @class */ (function (_super) {
         }
         return validLogoutRequest;
     };
+    /**
+     * Parses login_hint ID Token Claim out of AccountInfo object to be used as
+     * logout_hint in end session request.
+     * @param account
+     */
+    StandardInteractionClient.prototype.getLogoutHintFromIdTokenClaims = function (account) {
+        var idTokenClaims = account.idTokenClaims;
+        if (idTokenClaims) {
+            if (idTokenClaims.login_hint) {
+                return idTokenClaims.login_hint;
+            }
+            else {
+                this.logger.verbose("The ID Token Claims tied to the provided account do not contain a login_hint claim, logoutHint will not be added to logout request");
+            }
+        }
+        else {
+            this.logger.verbose("The provided account does not contain ID Token Claims, logoutHint will not be added to logout request");
+        }
+        return null;
+    };
     /**
      * Creates an Authorization Code Client with the given authority, or the default authority.
      * @param serverTelemetryManager
      * @param authorityUrl
      */
-    StandardInteractionClient.prototype.createAuthCodeClient = function (serverTelemetryManager, authorityUrl) {
+    StandardInteractionClient.prototype.createAuthCodeClient = function (serverTelemetryManager, authorityUrl, requestAzureCloudOptions) {
         return __awaiter$1(this, void 0, void 0, function () {
             var clientConfig;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl)];
+                    case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl, requestAzureCloudOptions)];
                     case 1:
                         clientConfig = _a.sent();
                         return [2 /*return*/, new AuthorizationCodeClient(clientConfig)];
@@ -10787,14 +11432,14 @@ var StandardInteractionClient = /** @class */ (function (_super) {
      * @param requestAuthority
      * @param requestCorrelationId
      */
-    StandardInteractionClient.prototype.getClientConfiguration = function (serverTelemetryManager, requestAuthority) {
+    StandardInteractionClient.prototype.getClientConfiguration = function (serverTelemetryManager, requestAuthority, requestAzureCloudOptions) {
         return __awaiter$1(this, void 0, void 0, function () {
             var discoveredAuthority;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.logger.verbose("getClientConfiguration called");
-                        return [4 /*yield*/, this.getDiscoveredAuthority(requestAuthority)];
+                        this.logger.verbose("getClientConfiguration called", this.correlationId);
+                        return [4 /*yield*/, this.getDiscoveredAuthority(requestAuthority, requestAzureCloudOptions)];
                     case 1:
                         discoveredAuthority = _a.sent();
                         return [2 /*return*/, {
@@ -10820,9 +11465,10 @@ var StandardInteractionClient = /** @class */ (function (_super) {
                                 libraryInfo: {
                                     sku: BrowserConstants.MSAL_SKU,
                                     version: version,
-                                    cpu: "",
-                                    os: ""
-                                }
+                                    cpu: Constants.EMPTY_STRING,
+                                    os: Constants.EMPTY_STRING
+                                },
+                                telemetry: this.config.telemetry
                             }];
                 }
             });
@@ -10854,49 +11500,36 @@ var StandardInteractionClient = /** @class */ (function (_super) {
      * @param requestAuthority
      * @param requestCorrelationId
      */
-    StandardInteractionClient.prototype.getDiscoveredAuthority = function (requestAuthority) {
+    StandardInteractionClient.prototype.getDiscoveredAuthority = function (requestAuthority, requestAzureCloudOptions) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var authorityOptions;
+            var getAuthorityMeasurement, authorityOptions, userAuthority, builtAuthority;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.logger.verbose("getDiscoveredAuthority called");
+                        this.logger.verbose("getDiscoveredAuthority called", this.correlationId);
+                        getAuthorityMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.StandardInteractionClientGetDiscoveredAuthority, this.correlationId);
                         authorityOptions = {
                             protocolMode: this.config.auth.protocolMode,
                             knownAuthorities: this.config.auth.knownAuthorities,
                             cloudDiscoveryMetadata: this.config.auth.cloudDiscoveryMetadata,
-                            authorityMetadata: this.config.auth.authorityMetadata
+                            authorityMetadata: this.config.auth.authorityMetadata,
                         };
-                        if (!requestAuthority) return [3 /*break*/, 2];
-                        this.logger.verbose("Creating discovered authority with request authority");
-                        return [4 /*yield*/, AuthorityFactory.createDiscoveredInstance(requestAuthority, this.config.system.networkClient, this.browserStorage, authorityOptions)];
-                    case 1: return [2 /*return*/, _a.sent()];
-                    case 2:
-                        this.logger.verbose("Creating discovered authority with configured authority");
-                        return [4 /*yield*/, AuthorityFactory.createDiscoveredInstance(this.config.auth.authority, this.config.system.networkClient, this.browserStorage, authorityOptions)];
-                    case 3: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
-    /**
-     * Helper to validate app environment before making a request.
-     * @param request
-     * @param interactionType
-     */
-    StandardInteractionClient.prototype.preflightInteractiveRequest = function (request, interactionType) {
-        return __awaiter$1(this, void 0, void 0, function () {
-            return __generator$1(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        this.logger.verbose("preflightInteractiveRequest called, validating app environment", request === null || request === void 0 ? void 0 : request.correlationId);
-                        // block the reload if it occurred inside a hidden iframe
-                        BrowserUtils.blockReloadInHiddenIframes();
-                        // Check if interaction is in progress. Throw error if true.
-                        if (this.browserStorage.isInteractionInProgress(false)) {
-                            throw BrowserAuthError.createInteractionInProgressError();
-                        }
-                        return [4 /*yield*/, this.initializeAuthorizationRequest(request, interactionType)];
+                        userAuthority = requestAuthority ? requestAuthority : this.config.auth.authority;
+                        builtAuthority = Authority.generateAuthority(userAuthority, requestAzureCloudOptions || this.config.auth.azureCloudOptions);
+                        this.logger.verbose("Creating discovered authority with configured authority", this.correlationId);
+                        return [4 /*yield*/, AuthorityFactory.createDiscoveredInstance(builtAuthority, this.config.system.networkClient, this.browserStorage, authorityOptions)
+                                .then(function (result) {
+                                getAuthorityMeasurement.endMeasurement({
+                                    success: true
+                                });
+                                return result;
+                            })
+                                .catch(function (error) {
+                                getAuthorityMeasurement.endMeasurement({
+                                    success: false
+                                });
+                                throw error;
+                            })];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -10913,20 +11546,20 @@ var StandardInteractionClient = /** @class */ (function (_super) {
             return __generator$1(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        this.logger.verbose("initializeAuthorizationRequest called");
+                        this.logger.verbose("initializeAuthorizationRequest called", this.correlationId);
                         redirectUri = this.getRedirectUri(request.redirectUri);
                         browserState = {
                             interactionType: interactionType
                         };
-                        state = ProtocolUtils.setRequestState(this.browserCrypto, (request && request.state) || "", browserState);
+                        state = ProtocolUtils.setRequestState(this.browserCrypto, (request && request.state) || Constants.EMPTY_STRING, browserState);
                         _a = [{}];
                         return [4 /*yield*/, this.initializeBaseRequest(request)];
                     case 1:
                         validatedRequest = __assign$1.apply(void 0, [__assign$1.apply(void 0, _a.concat([_b.sent()])), { redirectUri: redirectUri, state: state, nonce: request.nonce || this.browserCrypto.createNewGuid(), responseMode: ResponseMode.FRAGMENT }]);
                         account = request.account || this.browserStorage.getActiveAccount();
                         if (account) {
-                            this.logger.verbose("Setting validated request account");
-                            this.logger.verbosePii("Setting validated request account: " + account);
+                            this.logger.verbose("Setting validated request account", this.correlationId);
+                            this.logger.verbosePii("Setting validated request account: " + account.homeAccountId, this.correlationId);
                             validatedRequest.account = account;
                         }
                         // Check for ADAL/MSAL v1 SSO
@@ -10936,7 +11569,6 @@ var StandardInteractionClient = /** @class */ (function (_super) {
                                 validatedRequest.loginHint = legacyLoginHint;
                             }
                         }
-                        this.browserStorage.updateCacheEntries(validatedRequest.state, validatedRequest.nonce, validatedRequest.authority, validatedRequest.loginHint || "", validatedRequest.account || null);
                         return [2 /*return*/, validatedRequest];
                 }
             });
@@ -11107,8 +11739,8 @@ var PopupUtils = /** @class */ (function () {
      * @param clientId
      * @param request
      */
-    PopupUtils.generatePopupName = function (clientId, request) {
-        return BrowserConstants.POPUP_NAME_PREFIX + "." + clientId + "." + request.scopes.join("-") + "." + request.authority + "." + request.correlationId;
+    PopupUtils.generatePopupName = function (clientId, scopes, authority, correlationId) {
+        return BrowserConstants.POPUP_NAME_PREFIX + "." + clientId + "." + scopes.join("-") + "." + authority + "." + correlationId;
     };
     /**
      * Generates the name for the popup based on the client id and request for logouts
@@ -11241,7 +11873,7 @@ var InteractionHandler = /** @class */ (function () {
      */
     InteractionHandler.prototype.checkCcsCredentials = function () {
         // Look up ccs credential in temp cache
-        var cachedCcsCred = this.browserStorage.getTemporaryCache(TemporaryCacheKeys.CCS_CREDENTIAL, true);
+        var cachedCcsCred = this.browserStorage.getTemporaryCache(exports.TemporaryCacheKeys.CCS_CREDENTIAL, true);
         if (cachedCcsCred) {
             try {
                 return JSON.parse(cachedCcsCred);
@@ -11279,8 +11911,6 @@ var PopupHandler = /** @class */ (function (_super) {
     PopupHandler.prototype.initiateAuthRequest = function (requestUrl, params) {
         // Check that request url is not empty.
         if (!StringUtils.isEmpty(requestUrl)) {
-            // Set interaction status in the library.
-            this.browserStorage.setInteractionInProgress(true);
             this.browserRequestLogger.infoPii("Navigate to: " + requestUrl);
             // Open the popup window to requestUrl.
             return this.popupUtils.openPopup(requestUrl, params);
@@ -11330,36 +11960,25 @@ var PopupClient = /** @class */ (function (_super) {
      * @param request
      */
     PopupClient.prototype.acquireToken = function (request) {
-        return __awaiter$1(this, void 0, void 0, function () {
-            var validRequest, popupName, popupWindowAttributes, popup, e_1;
-            return __generator$1(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.preflightInteractiveRequest(request, exports.InteractionType.Popup)];
-                    case 1:
-                        validRequest = _a.sent();
-                        popupName = PopupUtils.generatePopupName(this.config.auth.clientId, validRequest);
-                        popupWindowAttributes = request.popupWindowAttributes || {};
-                        // asyncPopups flag is true. Acquires token without first opening popup. Popup will be opened later asynchronously.
-                        if (this.config.system.asyncPopups) {
-                            this.logger.verbose("asyncPopups set to true, acquiring token");
-                            // Passes on popup position and dimensions if in request
-                            return [2 /*return*/, this.acquireTokenPopupAsync(validRequest, popupName, popupWindowAttributes)];
-                        }
-                        else {
-                            // asyncPopups flag is set to false. Opens popup before acquiring token.
-                            this.logger.verbose("asyncPopup set to false, opening popup before acquiring token");
-                            popup = PopupUtils.openSizedPopup("about:blank", popupName, popupWindowAttributes, this.logger);
-                            return [2 /*return*/, this.acquireTokenPopupAsync(validRequest, popupName, popupWindowAttributes, popup)];
-                        }
-                    case 2:
-                        e_1 = _a.sent();
-                        return [2 /*return*/, Promise.reject(e_1)];
-                    case 3: return [2 /*return*/];
-                }
-            });
-        });
+        try {
+            var popupName = PopupUtils.generatePopupName(this.config.auth.clientId, request.scopes || OIDC_DEFAULT_SCOPES, request.authority || this.config.auth.authority, this.correlationId);
+            var popupWindowAttributes = request.popupWindowAttributes || {};
+            // asyncPopups flag is true. Acquires token without first opening popup. Popup will be opened later asynchronously.
+            if (this.config.system.asyncPopups) {
+                this.logger.verbose("asyncPopups set to true, acquiring token");
+                // Passes on popup position and dimensions if in request
+                return this.acquireTokenPopupAsync(request, popupName, popupWindowAttributes);
+            }
+            else {
+                // asyncPopups flag is set to false. Opens popup before acquiring token.
+                this.logger.verbose("asyncPopup set to false, opening popup before acquiring token");
+                var popup = PopupUtils.openSizedPopup("about:blank", popupName, popupWindowAttributes, this.logger);
+                return this.acquireTokenPopupAsync(request, popupName, popupWindowAttributes, popup);
+            }
+        }
+        catch (e) {
+            return Promise.reject(e);
+        }
     };
     /**
      * Clears local cache for the current user then opens a popup window prompting the user to sign-out of the server
@@ -11400,26 +12019,30 @@ var PopupClient = /** @class */ (function (_super) {
      *
      * @returns A promise that is fulfilled when this function has completed, or rejected if an error was raised.
      */
-    PopupClient.prototype.acquireTokenPopupAsync = function (validRequest, popupName, popupWindowAttributes, popup) {
+    PopupClient.prototype.acquireTokenPopupAsync = function (request, popupName, popupWindowAttributes, popup) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var serverTelemetryManager, authCodeRequest, authClient, navigateUrl, interactionHandler, popupParameters, popupWindow, hash, state, result, e_2;
+            var serverTelemetryManager, validRequest, authCodeRequest, authClient, navigateUrl, interactionHandler, popupParameters, popupWindow, hash, state, result, e_1;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.logger.verbose("acquireTokenPopupAsync called");
                         serverTelemetryManager = this.initializeServerTelemetryManager(exports.ApiId.acquireTokenPopup);
-                        _a.label = 1;
+                        return [4 /*yield*/, this.initializeAuthorizationRequest(request, exports.InteractionType.Popup)];
                     case 1:
-                        _a.trys.push([1, 7, , 8]);
-                        return [4 /*yield*/, this.initializeAuthorizationCodeRequest(validRequest)];
+                        validRequest = _a.sent();
+                        this.browserStorage.updateCacheEntries(validRequest.state, validRequest.nonce, validRequest.authority, validRequest.loginHint || Constants.EMPTY_STRING, validRequest.account || null);
+                        _a.label = 2;
                     case 2:
-                        authCodeRequest = _a.sent();
-                        return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, validRequest.authority)];
+                        _a.trys.push([2, 8, , 9]);
+                        return [4 /*yield*/, this.initializeAuthorizationCodeRequest(validRequest)];
                     case 3:
+                        authCodeRequest = _a.sent();
+                        return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, validRequest.authority, validRequest.azureCloudOptions)];
+                    case 4:
                         authClient = _a.sent();
                         this.logger.verbose("Auth code client created");
                         return [4 /*yield*/, authClient.getAuthCodeUrl(validRequest)];
-                    case 4:
+                    case 5:
                         navigateUrl = _a.sent();
                         interactionHandler = new PopupHandler(authClient, this.browserStorage, authCodeRequest, this.logger);
                         popupParameters = {
@@ -11430,28 +12053,28 @@ var PopupClient = /** @class */ (function (_super) {
                         popupWindow = interactionHandler.initiateAuthRequest(navigateUrl, popupParameters);
                         this.eventHandler.emitEvent(exports.EventType.POPUP_OPENED, exports.InteractionType.Popup, { popupWindow: popupWindow }, null);
                         return [4 /*yield*/, interactionHandler.monitorPopupForHash(popupWindow)];
-                    case 5:
+                    case 6:
                         hash = _a.sent();
                         state = this.validateAndExtractStateFromHash(hash, exports.InteractionType.Popup, validRequest.correlationId);
                         // Remove throttle if it exists
                         ThrottlingUtils.removeThrottle(this.browserStorage, this.config.auth.clientId, authCodeRequest);
                         return [4 /*yield*/, interactionHandler.handleCodeResponseFromHash(hash, state, authClient.authority, this.networkClient)];
-                    case 6:
+                    case 7:
                         result = _a.sent();
                         return [2 /*return*/, result];
-                    case 7:
-                        e_2 = _a.sent();
+                    case 8:
+                        e_1 = _a.sent();
                         if (popup) {
                             // Close the synchronous popup if an error is thrown before the window unload event is registered
                             popup.close();
                         }
-                        if (e_2 instanceof AuthError) {
-                            e_2.setCorrelationId(this.correlationId);
+                        if (e_1 instanceof AuthError) {
+                            e_1.setCorrelationId(this.correlationId);
                         }
-                        serverTelemetryManager.cacheFailedRequest(e_2);
+                        serverTelemetryManager.cacheFailedRequest(e_1);
                         this.browserStorage.cleanRequestByState(validRequest.state);
-                        throw e_2;
-                    case 8: return [2 /*return*/];
+                        throw e_1;
+                    case 9: return [2 /*return*/];
                 }
             });
         });
@@ -11467,7 +12090,7 @@ var PopupClient = /** @class */ (function (_super) {
      */
     PopupClient.prototype.logoutPopupAsync = function (validRequest, popupName, popupWindowAttributes, requestAuthority, popup, mainWindowRedirectUri) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var serverTelemetryManager, authClient, logoutUri, popupUtils, popupWindow, e_3, navigationOptions, absoluteUrl, e_4;
+            var serverTelemetryManager, authClient, logoutUri, popupUtils, popupWindow, e_2, navigationOptions, absoluteUrl, e_3;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -11482,7 +12105,6 @@ var PopupClient = /** @class */ (function (_super) {
                     case 2:
                         // Clear cache on logout
                         _a.sent();
-                        this.browserStorage.setInteractionInProgress(true);
                         return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, requestAuthority)];
                     case 3:
                         authClient = _a.sent();
@@ -11503,8 +12125,8 @@ var PopupClient = /** @class */ (function (_super) {
                         this.logger.verbose("Popup successfully redirected to postLogoutRedirectUri");
                         return [3 /*break*/, 7];
                     case 6:
-                        e_3 = _a.sent();
-                        this.logger.verbose("Error occurred while monitoring popup for same origin. Session on server may remain active. Error: " + e_3);
+                        e_2 = _a.sent();
+                        this.logger.verbose("Error occurred while monitoring popup for same origin. Session on server may remain active. Error: " + e_2);
                         return [3 /*break*/, 7];
                     case 7:
                         popupUtils.cleanPopup(popupWindow);
@@ -11516,7 +12138,7 @@ var PopupClient = /** @class */ (function (_super) {
                             };
                             absoluteUrl = UrlString.getAbsoluteUrl(mainWindowRedirectUri, BrowserUtils.getCurrentUri());
                             this.logger.verbose("Redirecting main window to url specified in the request");
-                            this.logger.verbosePii("Redirecing main window to: " + absoluteUrl);
+                            this.logger.verbosePii("Redirecting main window to: " + absoluteUrl);
                             this.navigationClient.navigateInternal(absoluteUrl, navigationOptions);
                         }
                         else {
@@ -11524,19 +12146,19 @@ var PopupClient = /** @class */ (function (_super) {
                         }
                         return [3 /*break*/, 9];
                     case 8:
-                        e_4 = _a.sent();
+                        e_3 = _a.sent();
                         if (popup) {
                             // Close the synchronous popup if an error is thrown before the window unload event is registered
                             popup.close();
                         }
-                        if (e_4 instanceof AuthError) {
-                            e_4.setCorrelationId(this.correlationId);
+                        if (e_3 instanceof AuthError) {
+                            e_3.setCorrelationId(this.correlationId);
                         }
                         this.browserStorage.setInteractionInProgress(false);
-                        this.eventHandler.emitEvent(exports.EventType.LOGOUT_FAILURE, exports.InteractionType.Popup, null, e_4);
+                        this.eventHandler.emitEvent(exports.EventType.LOGOUT_FAILURE, exports.InteractionType.Popup, null, e_3);
                         this.eventHandler.emitEvent(exports.EventType.LOGOUT_END, exports.InteractionType.Popup);
-                        serverTelemetryManager.cacheFailedRequest(e_4);
-                        throw e_4;
+                        serverTelemetryManager.cacheFailedRequest(e_3);
+                        throw e_3;
                     case 9:
                         this.eventHandler.emitEvent(exports.EventType.LOGOUT_END, exports.InteractionType.Popup);
                         return [2 /*return*/];
@@ -11573,11 +12195,10 @@ var RedirectHandler = /** @class */ (function (_super) {
                         // Cache start page, returns to this page after redirectUri if navigateToLoginRequestUrl is true
                         if (params.redirectStartPage) {
                             this.browserRequestLogger.verbose("RedirectHandler.initiateAuthRequest: redirectStartPage set, caching start page");
-                            this.browserStorage.setTemporaryCache(TemporaryCacheKeys.ORIGIN_URI, params.redirectStartPage, true);
+                            this.browserStorage.setTemporaryCache(exports.TemporaryCacheKeys.ORIGIN_URI, params.redirectStartPage, true);
                         }
                         // Set interaction status in the library.
-                        this.browserStorage.setInteractionInProgress(true);
-                        this.browserStorage.setTemporaryCache(TemporaryCacheKeys.CORRELATION_ID, this.authCodeRequest.correlationId, true);
+                        this.browserStorage.setTemporaryCache(exports.TemporaryCacheKeys.CORRELATION_ID, this.authCodeRequest.correlationId, true);
                         this.browserStorage.cacheCodeRequest(this.authCodeRequest, this.browserCrypto);
                         this.browserRequestLogger.infoPii("RedirectHandler.initiateAuthRequest: Navigate to: " + requestUrl);
                         navigationOptions = {
@@ -11691,20 +12312,29 @@ var RedirectClient = /** @class */ (function (_super) {
      */
     RedirectClient.prototype.acquireToken = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var validRequest, serverTelemetryManager, authCodeRequest, authClient, interactionHandler, navigateUrl, redirectStartPage, e_1;
+            var validRequest, serverTelemetryManager, handleBackButton, authCodeRequest, authClient, interactionHandler, navigateUrl, redirectStartPage, e_1;
+            var _this = this;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.preflightInteractiveRequest(request, exports.InteractionType.Redirect)];
+                    case 0: return [4 /*yield*/, this.initializeAuthorizationRequest(request, exports.InteractionType.Redirect)];
                     case 1:
                         validRequest = _a.sent();
+                        this.browserStorage.updateCacheEntries(validRequest.state, validRequest.nonce, validRequest.authority, validRequest.loginHint || Constants.EMPTY_STRING, validRequest.account || null);
                         serverTelemetryManager = this.initializeServerTelemetryManager(exports.ApiId.acquireTokenRedirect);
+                        handleBackButton = function (event) {
+                            // Clear temporary cache if the back button is clicked during the redirect flow.
+                            if (event.persisted) {
+                                _this.logger.verbose("Page was restored from back/forward cache. Clearing temporary cache.");
+                                _this.browserStorage.cleanRequestByState(validRequest.state);
+                            }
+                        };
                         _a.label = 2;
                     case 2:
                         _a.trys.push([2, 7, , 8]);
                         return [4 /*yield*/, this.initializeAuthorizationCodeRequest(validRequest)];
                     case 3:
                         authCodeRequest = _a.sent();
-                        return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, validRequest.authority)];
+                        return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, validRequest.authority, validRequest.azureCloudOptions)];
                     case 4:
                         authClient = _a.sent();
                         this.logger.verbose("Auth code client created");
@@ -11714,6 +12344,8 @@ var RedirectClient = /** @class */ (function (_super) {
                         navigateUrl = _a.sent();
                         redirectStartPage = this.getRedirectStartPage(request.redirectStartPage);
                         this.logger.verbosePii("Redirect start page: " + redirectStartPage);
+                        // Clear temporary cache if the back button is clicked during the redirect flow.
+                        window.addEventListener("pageshow", handleBackButton);
                         return [4 /*yield*/, interactionHandler.initiateAuthRequest(navigateUrl, {
                                 navigationClient: this.navigationClient,
                                 redirectTimeout: this.config.system.redirectNavigationTimeout,
@@ -11728,6 +12360,7 @@ var RedirectClient = /** @class */ (function (_super) {
                         if (e_1 instanceof AuthError) {
                             e_1.setCorrelationId(this.correlationId);
                         }
+                        window.removeEventListener("pageshow", handleBackButton);
                         serverTelemetryManager.cacheFailedRequest(e_1);
                         this.browserStorage.cleanRequestByState(validRequest.state);
                         throw e_1;
@@ -11766,7 +12399,6 @@ var RedirectClient = /** @class */ (function (_super) {
                         state = void 0;
                         try {
                             state = this.validateAndExtractStateFromHash(responseHash, exports.InteractionType.Redirect);
-                            BrowserUtils.clearHash(window);
                             this.logger.verbose("State extracted from hash");
                         }
                         catch (e) {
@@ -11774,7 +12406,7 @@ var RedirectClient = /** @class */ (function (_super) {
                             this.browserStorage.cleanRequestByInteractionType(exports.InteractionType.Redirect);
                             return [2 /*return*/, null];
                         }
-                        loginRequestUrl = this.browserStorage.getTemporaryCache(TemporaryCacheKeys.ORIGIN_URI, true) || "";
+                        loginRequestUrl = this.browserStorage.getTemporaryCache(exports.TemporaryCacheKeys.ORIGIN_URI, true) || Constants.EMPTY_STRING;
                         loginRequestUrlNormalized = UrlString.removeHashFromUrl(loginRequestUrl);
                         currentUrlNormalized = UrlString.removeHashFromUrl(window.location.href);
                         if (!(loginRequestUrlNormalized === currentUrlNormalized && this.config.auth.navigateToLoginRequestUrl)) return [3 /*break*/, 3];
@@ -11798,7 +12430,7 @@ var RedirectClient = /** @class */ (function (_super) {
                          * Returned from authority using redirect - need to perform navigation before processing response
                          * Cache the hash to be retrieved after the next redirect
                          */
-                        this.browserStorage.setTemporaryCache(TemporaryCacheKeys.URL_HASH, responseHash, true);
+                        this.browserStorage.setTemporaryCache(exports.TemporaryCacheKeys.URL_HASH, responseHash, true);
                         navigationOptions = {
                             apiId: exports.ApiId.handleRedirectPromise,
                             timeout: this.config.system.redirectNavigationTimeout,
@@ -11808,7 +12440,7 @@ var RedirectClient = /** @class */ (function (_super) {
                         if (!(!loginRequestUrl || loginRequestUrl === "null")) return [3 /*break*/, 6];
                         homepage = BrowserUtils.getHomepage();
                         // Cache the homepage under ORIGIN_URI to ensure cached hash is processed on homepage
-                        this.browserStorage.setTemporaryCache(TemporaryCacheKeys.ORIGIN_URI, homepage, true);
+                        this.browserStorage.setTemporaryCache(exports.TemporaryCacheKeys.ORIGIN_URI, homepage, true);
                         this.logger.warning("Unable to get valid login request url from cache, redirecting to home page");
                         return [4 /*yield*/, this.navigationClient.navigateInternal(homepage, navigationOptions)];
                     case 5:
@@ -11850,12 +12482,13 @@ var RedirectClient = /** @class */ (function (_super) {
         this.logger.verbose("getRedirectResponseHash called");
         // Get current location hash from window or cache.
         var isResponseHash = UrlString.hashContainsKnownProperties(hash);
-        var cachedHash = this.browserStorage.getTemporaryCache(TemporaryCacheKeys.URL_HASH, true);
-        this.browserStorage.removeItem(this.browserStorage.generateCacheKey(TemporaryCacheKeys.URL_HASH));
         if (isResponseHash) {
+            BrowserUtils.clearHash(window);
             this.logger.verbose("Hash contains known properties, returning response hash");
             return hash;
         }
+        var cachedHash = this.browserStorage.getTemporaryCache(exports.TemporaryCacheKeys.URL_HASH, true);
+        this.browserStorage.removeItem(this.browserStorage.generateCacheKey(exports.TemporaryCacheKeys.URL_HASH));
         this.logger.verbose("Hash does not contain known properties, returning cached hash");
         return cachedHash;
     };
@@ -12123,8 +12756,8 @@ var SilentHandler = /** @class */ (function (_super) {
  */
 var SilentIframeClient = /** @class */ (function (_super) {
     __extends$1(SilentIframeClient, _super);
-    function SilentIframeClient(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, apiId, correlationId) {
-        var _this = _super.call(this, config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, correlationId) || this;
+    function SilentIframeClient(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, apiId, performanceClient, correlationId) {
+        var _this = _super.call(this, config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, performanceClient, correlationId) || this;
         _this.apiId = apiId;
         return _this;
     }
@@ -12134,22 +12767,27 @@ var SilentIframeClient = /** @class */ (function (_super) {
      */
     SilentIframeClient.prototype.acquireToken = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var silentRequest, serverTelemetryManager, authCodeRequest, authClient, navigateUrl, e_1;
+            var acquireTokenMeasurement, silentRequest, serverTelemetryManager, authCodeRequest, authClient, navigateUrl, e_1;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.logger.verbose("acquireTokenByIframe called");
+                        acquireTokenMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.SilentIframeClientAcquireToken, request.correlationId);
                         // Check that we have some SSO data
                         if (StringUtils.isEmpty(request.loginHint) && StringUtils.isEmpty(request.sid) && (!request.account || StringUtils.isEmpty(request.account.username))) {
                             this.logger.warning("No user hint provided. The authorization server may need more information to complete this request.");
                         }
                         // Check that prompt is set to none, throw error if it is set to anything else.
                         if (request.prompt && request.prompt !== PromptValue.NONE) {
+                            acquireTokenMeasurement.endMeasurement({
+                                success: false
+                            });
                             throw BrowserAuthError.createSilentPromptValueError(request.prompt);
                         }
                         return [4 /*yield*/, this.initializeAuthorizationRequest(__assign$1(__assign$1({}, request), { prompt: PromptValue.NONE }), exports.InteractionType.Silent)];
                     case 1:
                         silentRequest = _a.sent();
+                        this.browserStorage.updateCacheEntries(silentRequest.state, silentRequest.nonce, silentRequest.authority, silentRequest.loginHint || Constants.EMPTY_STRING, silentRequest.account || null);
                         serverTelemetryManager = this.initializeServerTelemetryManager(this.apiId);
                         _a.label = 2;
                     case 2:
@@ -12157,14 +12795,21 @@ var SilentIframeClient = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.initializeAuthorizationCodeRequest(silentRequest)];
                     case 3:
                         authCodeRequest = _a.sent();
-                        return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, silentRequest.authority)];
+                        return [4 /*yield*/, this.createAuthCodeClient(serverTelemetryManager, silentRequest.authority, silentRequest.azureCloudOptions)];
                     case 4:
                         authClient = _a.sent();
                         this.logger.verbose("Auth code client created");
                         return [4 /*yield*/, authClient.getAuthCodeUrl(silentRequest)];
                     case 5:
                         navigateUrl = _a.sent();
-                        return [4 /*yield*/, this.silentTokenHelper(navigateUrl, authCodeRequest, authClient, this.logger)];
+                        return [4 /*yield*/, this.silentTokenHelper(navigateUrl, authCodeRequest, authClient, this.logger)
+                                .then(function (result) {
+                                acquireTokenMeasurement.endMeasurement({
+                                    success: true,
+                                    fromCache: false
+                                });
+                                return result;
+                            })];
                     case 6: return [2 /*return*/, _a.sent()];
                     case 7:
                         e_1 = _a.sent();
@@ -12173,6 +12818,9 @@ var SilentIframeClient = /** @class */ (function (_super) {
                         }
                         serverTelemetryManager.cacheFailedRequest(e_1);
                         this.browserStorage.cleanRequestByState(silentRequest.state);
+                        acquireTokenMeasurement.endMeasurement({
+                            success: false
+                        });
                         throw e_1;
                     case 8: return [2 /*return*/];
                 }
@@ -12230,7 +12878,7 @@ var SilentRefreshClient = /** @class */ (function (_super) {
      */
     SilentRefreshClient.prototype.acquireToken = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var silentRequest, _a, serverTelemetryManager, refreshTokenClient;
+            var silentRequest, _a, acquireTokenMeasurement, serverTelemetryManager, refreshTokenClient;
             var _this = this;
             return __generator$1(this, function (_b) {
                 switch (_b.label) {
@@ -12239,17 +12887,29 @@ var SilentRefreshClient = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.initializeBaseRequest(request)];
                     case 1:
                         silentRequest = __assign$1.apply(void 0, _a.concat([_b.sent()]));
+                        acquireTokenMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.SilentRefreshClientAcquireToken, silentRequest.correlationId);
                         serverTelemetryManager = this.initializeServerTelemetryManager(exports.ApiId.acquireTokenSilent_silentFlow);
-                        return [4 /*yield*/, this.createRefreshTokenClient(serverTelemetryManager, silentRequest.authority)];
+                        return [4 /*yield*/, this.createRefreshTokenClient(serverTelemetryManager, silentRequest.authority, silentRequest.azureCloudOptions)];
                     case 2:
                         refreshTokenClient = _b.sent();
                         this.logger.verbose("Refresh token client created");
                         // Send request to renew token. Auth module will throw errors if token cannot be renewed.
-                        return [2 /*return*/, refreshTokenClient.acquireTokenByRefreshToken(silentRequest).catch(function (e) {
+                        return [2 /*return*/, refreshTokenClient.acquireTokenByRefreshToken(silentRequest)
+                                .then(function (result) {
+                                acquireTokenMeasurement.endMeasurement({
+                                    success: true,
+                                    fromCache: result.fromCache
+                                });
+                                return result;
+                            })
+                                .catch(function (e) {
                                 if (e instanceof AuthError) {
                                     e.setCorrelationId(_this.correlationId);
                                 }
                                 serverTelemetryManager.cacheFailedRequest(e);
+                                acquireTokenMeasurement.endMeasurement({
+                                    success: false
+                                });
                                 throw e;
                             })];
                 }
@@ -12268,12 +12928,12 @@ var SilentRefreshClient = /** @class */ (function (_super) {
      * @param serverTelemetryManager
      * @param authorityUrl
      */
-    SilentRefreshClient.prototype.createRefreshTokenClient = function (serverTelemetryManager, authorityUrl) {
+    SilentRefreshClient.prototype.createRefreshTokenClient = function (serverTelemetryManager, authorityUrl, azureCloudOptions) {
         return __awaiter$1(this, void 0, void 0, function () {
             var clientConfig;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl)];
+                    case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl, azureCloudOptions)];
                     case 1:
                         clientConfig = _a.sent();
                         return [2 /*return*/, new RefreshTokenClient(clientConfig)];
@@ -12316,13 +12976,14 @@ var TokenCache = /** @class */ (function () {
             this.loadAccessToken(request, response, request.account.homeAccountId, request.account.environment, request.account.tenantId, options);
         }
         else if (request.authority) {
+            var authorityUrl = Authority.generateAuthority(request.authority, request.azureCloudOptions);
             var authorityOptions = {
                 protocolMode: this.config.auth.protocolMode,
                 knownAuthorities: this.config.auth.knownAuthorities,
                 cloudDiscoveryMetadata: this.config.auth.cloudDiscoveryMetadata,
-                authorityMetadata: this.config.auth.authorityMetadata
+                authorityMetadata: this.config.auth.authorityMetadata,
             };
-            var authority = new Authority(request.authority, this.config.system.networkClient, this.storage, authorityOptions);
+            var authority = new Authority(authorityUrl, this.config.system.networkClient, this.storage, authorityOptions);
             // "clientInfo" from options takes precedence over "clientInfo" in response
             if (options.clientInfo) {
                 this.logger.trace("TokenCache - homeAccountId from options");
@@ -12421,8 +13082,8 @@ var HybridSpaAuthorizationCodeClient = /** @class */ (function (_super) {
  */
 var SilentAuthCodeClient = /** @class */ (function (_super) {
     __extends$1(SilentAuthCodeClient, _super);
-    function SilentAuthCodeClient(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, apiId, correlationId) {
-        var _this = _super.call(this, config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, correlationId) || this;
+    function SilentAuthCodeClient(config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, apiId, performanceClient, correlationId) {
+        var _this = _super.call(this, config, storageImpl, browserCrypto, logger, eventHandler, navigationClient, performanceClient, correlationId) || this;
         _this.apiId = apiId;
         return _this;
     }
@@ -12444,6 +13105,7 @@ var SilentAuthCodeClient = /** @class */ (function (_super) {
                         return [4 /*yield*/, this.initializeAuthorizationRequest(request, exports.InteractionType.Silent)];
                     case 1:
                         silentRequest = _a.sent();
+                        this.browserStorage.updateCacheEntries(silentRequest.state, silentRequest.nonce, silentRequest.authority, silentRequest.loginHint || Constants.EMPTY_STRING, silentRequest.account || null);
                         serverTelemetryManager = this.initializeServerTelemetryManager(this.apiId);
                         _a.label = 2;
                     case 2:
@@ -12485,6 +13147,110 @@ var SilentAuthCodeClient = /** @class */ (function (_super) {
     return SilentAuthCodeClient;
 }(StandardInteractionClient));
 
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+var BrowserPerformanceMeasurement = /** @class */ (function () {
+    function BrowserPerformanceMeasurement(name, correlationId) {
+        this.correlationId = correlationId;
+        this.measureName = "msal.measure." + name + "." + this.correlationId;
+        this.startMark = "msal.start." + name + "." + this.correlationId;
+        this.endMark = "msal.end." + name + "." + this.correlationId;
+    }
+    BrowserPerformanceMeasurement.supportsBrowserPerformance = function () {
+        return typeof window !== "undefined" &&
+            typeof window.performance !== "undefined" &&
+            typeof window.performance.mark === "function" &&
+            typeof window.performance.measure === "function" &&
+            typeof window.performance.clearMarks === "function" &&
+            typeof window.performance.clearMeasures === "function" &&
+            typeof window.performance.getEntriesByName === "function";
+    };
+    BrowserPerformanceMeasurement.prototype.startMeasurement = function () {
+        if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
+            try {
+                window.performance.mark(this.startMark);
+            }
+            catch (e) {
+                // Silently catch
+            }
+        }
+    };
+    BrowserPerformanceMeasurement.prototype.endMeasurement = function () {
+        if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
+            try {
+                window.performance.mark(this.endMark);
+                window.performance.measure(this.measureName, this.startMark, this.endMark);
+            }
+            catch (e) {
+                // Silently catch
+            }
+        }
+    };
+    BrowserPerformanceMeasurement.prototype.flushMeasurement = function () {
+        if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
+            try {
+                var entriesForMeasurement = window.performance.getEntriesByName(this.measureName, "measure");
+                if (entriesForMeasurement.length > 0) {
+                    var durationMs = entriesForMeasurement[0].duration;
+                    window.performance.clearMeasures(this.measureName);
+                    window.performance.clearMarks(this.startMark);
+                    window.performance.clearMarks(this.endMark);
+                    return durationMs;
+                }
+            }
+            catch (e) {
+                // Silently catch and return null
+            }
+        }
+        return null;
+    };
+    return BrowserPerformanceMeasurement;
+}());
+
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ */
+var BrowserPerformanceClient = /** @class */ (function (_super) {
+    __extends$1(BrowserPerformanceClient, _super);
+    function BrowserPerformanceClient(clientId, authority, logger, libraryName, libraryVersion, applicationTelemetry) {
+        var _this = _super.call(this, clientId, authority, logger, libraryName, libraryVersion, applicationTelemetry) || this;
+        _this.browserCrypto = new BrowserCrypto(_this.logger);
+        _this.guidGenerator = new GuidGenerator(_this.browserCrypto);
+        return _this;
+    }
+    BrowserPerformanceClient.prototype.startPerformanceMeasuremeant = function (measureName, correlationId) {
+        return new BrowserPerformanceMeasurement(measureName, correlationId);
+    };
+    BrowserPerformanceClient.prototype.generateId = function () {
+        return this.guidGenerator.generateGuid();
+    };
+    BrowserPerformanceClient.prototype.getPageVisibility = function () {
+        var _a;
+        return ((_a = document.visibilityState) === null || _a === void 0 ? void 0 : _a.toString()) || null;
+    };
+    /**
+     * Starts measuring performance for a given operation. Returns a function that should be used to end the measurement.
+     * Also captures browser page visibilityState.
+     *
+     * @param {PerformanceEvents} measureName
+     * @param {?string} [correlationId]
+     * @returns {((event?: Partial<PerformanceEvent>) => PerformanceEvent| null)}
+     */
+    BrowserPerformanceClient.prototype.startMeasurement = function (measureName, correlationId) {
+        var _this = this;
+        // Capture page visibilityState and then invoke start/end measurement
+        var startPageVisibility = this.getPageVisibility();
+        var inProgressEvent = _super.prototype.startMeasurement.call(this, measureName, correlationId);
+        return __assign$1(__assign$1({}, inProgressEvent), { endMeasurement: function (event) {
+                return inProgressEvent.endMeasurement(__assign$1({ startPageVisibility: startPageVisibility, endPageVisibility: _this.getPageVisibility() }, event));
+            } });
+    };
+    return BrowserPerformanceClient;
+}(PerformanceClient));
+
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -12530,8 +13296,12 @@ var ClientApplication = /** @class */ (function () {
         this.redirectResponse = new Map();
         // Initial hybrid spa map
         this.hybridAuthCodeResponses = new Map();
+        // Initialize performance client
+        this.performanceClient = this.isBrowserEnvironment ?
+            new BrowserPerformanceClient(this.config.auth.clientId, this.config.auth.authority, this.logger, name, version, this.config.telemetry.application) :
+            new StubPerformanceClient(this.config.auth.clientId, this.config.auth.authority, this.logger, name, version, this.config.telemetry.application);
         // Initialize the crypto class.
-        this.browserCrypto = this.isBrowserEnvironment ? new CryptoOps(this.logger) : DEFAULT_CRYPTO_IMPLEMENTATION;
+        this.browserCrypto = this.isBrowserEnvironment ? new CryptoOps(this.logger, this.performanceClient) : DEFAULT_CRYPTO_IMPLEMENTATION;
         this.eventHandler = new EventHandler(this.logger, this.browserCrypto);
         // Initialize the browser storage class.
         this.browserStorage = this.isBrowserEnvironment ?
@@ -12561,8 +13331,8 @@ var ClientApplication = /** @class */ (function () {
                     if (typeof response === "undefined") {
                         this.eventHandler.emitEvent(exports.EventType.HANDLE_REDIRECT_START, exports.InteractionType.Redirect);
                         this.logger.verbose("handleRedirectPromise has been called for the first time, storing the promise");
-                        correlationId = this.browserStorage.getTemporaryCache(TemporaryCacheKeys.CORRELATION_ID, true) || "";
-                        redirectClient = new RedirectClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, correlationId);
+                        correlationId = this.browserStorage.getTemporaryCache(exports.TemporaryCacheKeys.CORRELATION_ID, true) || Constants.EMPTY_STRING;
+                        redirectClient = new RedirectClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.performanceClient, correlationId);
                         response = redirectClient.handleRedirectPromise(hash)
                             .then(function (result) {
                             if (result) {
@@ -12614,12 +13384,12 @@ var ClientApplication = /** @class */ (function () {
      */
     ClientApplication.prototype.acquireTokenRedirect = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var isLoggedIn, redirectClient;
+            var correlationId, isLoggedIn, redirectClient;
             var _this = this;
             return __generator$1(this, function (_a) {
-                // Preflight request
+                correlationId = this.getRequestCorrelationId(request);
+                this.logger.verbose("acquireTokenRedirect called", correlationId);
                 this.preflightBrowserEnvironmentCheck(exports.InteractionType.Redirect);
-                this.logger.verbose("acquireTokenRedirect called");
                 isLoggedIn = this.getAllAccounts().length > 0;
                 if (isLoggedIn) {
                     this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_START, exports.InteractionType.Redirect, request);
@@ -12627,8 +13397,8 @@ var ClientApplication = /** @class */ (function () {
                 else {
                     this.eventHandler.emitEvent(exports.EventType.LOGIN_START, exports.InteractionType.Redirect, request);
                 }
-                redirectClient = new RedirectClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, request.correlationId);
-                return [2 /*return*/, redirectClient.acquireToken(request).catch(function (e) {
+                redirectClient = new RedirectClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.performanceClient, correlationId);
+                return [2 /*return*/, redirectClient.acquireToken(__assign$1(__assign$1({}, request), { correlationId: correlationId })).catch(function (e) {
                         // If logged in, emit acquire token events
                         if (isLoggedIn) {
                             _this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Redirect, null, e);
@@ -12652,9 +13422,10 @@ var ClientApplication = /** @class */ (function () {
      */
     ClientApplication.prototype.acquireTokenPopup = function (request) {
         var _this = this;
+        var correlationId = this.getRequestCorrelationId(request);
         try {
+            this.logger.verbose("acquireTokenPopup called", correlationId);
             this.preflightBrowserEnvironmentCheck(exports.InteractionType.Popup);
-            this.logger.verbose("acquireTokenPopup called", request.correlationId);
         }
         catch (e) {
             // Since this function is syncronous we need to reject
@@ -12668,8 +13439,8 @@ var ClientApplication = /** @class */ (function () {
         else {
             this.eventHandler.emitEvent(exports.EventType.LOGIN_START, exports.InteractionType.Popup, request);
         }
-        var popupClient = new PopupClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, request.correlationId);
-        return popupClient.acquireToken(request).then(function (result) {
+        var popupClient = new PopupClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.performanceClient, correlationId);
+        return popupClient.acquireToken(__assign$1(__assign$1({}, request), { correlationId: correlationId })).then(function (result) {
             // If logged in, emit acquire token events
             var isLoggingIn = loggedInAccounts.length < _this.getAllAccounts().length;
             if (isLoggingIn) {
@@ -12709,25 +13480,35 @@ var ClientApplication = /** @class */ (function () {
      */
     ClientApplication.prototype.ssoSilent = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var silentIframeClient, silentTokenResult, e_1;
+            var correlationId, ssoSilentMeasurement, silentIframeClient, silentTokenResult, e_1;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        correlationId = this.getRequestCorrelationId(request);
                         this.preflightBrowserEnvironmentCheck(exports.InteractionType.Silent);
-                        this.logger.verbose("ssoSilent called", request.correlationId);
+                        ssoSilentMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.SsoSilent, correlationId);
+                        this.logger.verbose("ssoSilent called", correlationId);
                         this.eventHandler.emitEvent(exports.EventType.SSO_SILENT_START, exports.InteractionType.Silent, request);
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        silentIframeClient = new SilentIframeClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, exports.ApiId.ssoSilent, request.correlationId);
-                        return [4 /*yield*/, silentIframeClient.acquireToken(request)];
+                        silentIframeClient = new SilentIframeClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, exports.ApiId.ssoSilent, this.performanceClient, correlationId);
+                        return [4 /*yield*/, silentIframeClient.acquireToken(__assign$1(__assign$1({}, request), { correlationId: correlationId }))];
                     case 2:
                         silentTokenResult = _a.sent();
                         this.eventHandler.emitEvent(exports.EventType.SSO_SILENT_SUCCESS, exports.InteractionType.Silent, silentTokenResult);
+                        ssoSilentMeasurement.endMeasurement({
+                            success: true
+                        });
+                        ssoSilentMeasurement.flushMeasurement();
                         return [2 /*return*/, silentTokenResult];
                     case 3:
                         e_1 = _a.sent();
                         this.eventHandler.emitEvent(exports.EventType.SSO_SILENT_FAILURE, exports.InteractionType.Silent, null, e_1);
+                        ssoSilentMeasurement.endMeasurement({
+                            success: false
+                        });
+                        ssoSilentMeasurement.flushMeasurement();
                         throw e_1;
                     case 4: return [2 /*return*/];
                 }
@@ -12746,38 +13527,56 @@ var ClientApplication = /** @class */ (function () {
      */
     ClientApplication.prototype.acquireTokenByCode = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var response;
+            var correlationId, atbcMeasurement, response;
             var _this = this;
             return __generator$1(this, function (_a) {
+                correlationId = this.getRequestCorrelationId(request);
                 this.preflightBrowserEnvironmentCheck(exports.InteractionType.Silent);
-                this.logger.trace("acquireTokenByCode called", request.correlationId);
+                this.logger.trace("acquireTokenByCode called", correlationId);
                 this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_BY_CODE_START, exports.InteractionType.Silent, request);
+                atbcMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.AcquireTokenByCode, request.correlationId);
                 try {
                     if (!request.code) {
                         throw BrowserAuthError.createAuthCodeRequiredError();
                     }
                     response = this.hybridAuthCodeResponses.get(request.code);
                     if (!response) {
-                        this.logger.verbose("Initiating new acquireTokenByCode request", request.correlationId);
-                        response = this.acquireTokenByCodeAsync(request)
+                        this.logger.verbose("Initiating new acquireTokenByCode request", correlationId);
+                        response = this.acquireTokenByCodeAsync(__assign$1(__assign$1({}, request), { correlationId: correlationId }))
                             .then(function (result) {
                             _this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_BY_CODE_SUCCESS, exports.InteractionType.Silent, result);
                             _this.hybridAuthCodeResponses.delete(request.code);
+                            atbcMeasurement.endMeasurement({
+                                success: true
+                            });
+                            atbcMeasurement.flushMeasurement();
                             return result;
                         })
                             .catch(function (error) {
                             _this.hybridAuthCodeResponses.delete(request.code);
+                            _this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_BY_CODE_FAILURE, exports.InteractionType.Silent, null, error);
+                            atbcMeasurement.endMeasurement({
+                                success: false
+                            });
+                            atbcMeasurement.flushMeasurement();
                             throw error;
                         });
                         this.hybridAuthCodeResponses.set(request.code, response);
                     }
                     else {
                         this.logger.verbose("Existing acquireTokenByCode request found", request.correlationId);
+                        atbcMeasurement.endMeasurement({
+                            success: true
+                        });
+                        atbcMeasurement.discardMeasurement();
                     }
                     return [2 /*return*/, response];
                 }
                 catch (e) {
                     this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_BY_CODE_FAILURE, exports.InteractionType.Silent, null, e);
+                    atbcMeasurement.endMeasurement({
+                        success: false
+                    });
                     throw e;
                 }
                 return [2 /*return*/];
@@ -12796,7 +13595,7 @@ var ClientApplication = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.logger.trace("acquireTokenByCodeAsync called", request.correlationId);
-                        silentAuthCodeClient = new SilentAuthCodeClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, exports.ApiId.acquireTokenByCode, request.correlationId);
+                        silentAuthCodeClient = new SilentAuthCodeClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, exports.ApiId.acquireTokenByCode, this.performanceClient, request.correlationId);
                         return [4 /*yield*/, silentAuthCodeClient.acquireToken(request)];
                     case 1:
                         silentTokenResult = _a.sent();
@@ -12818,22 +13617,47 @@ var ClientApplication = /** @class */ (function () {
      */
     ClientApplication.prototype.acquireTokenByRefreshToken = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var silentRefreshClient;
+            var atbrtMeasurement, silentRefreshClient;
             var _this = this;
             return __generator$1(this, function (_a) {
-                this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_NETWORK_START, exports.InteractionType.Silent, request);
                 // block the reload if it occurred inside a hidden iframe
                 BrowserUtils.blockReloadInHiddenIframes();
-                silentRefreshClient = new SilentRefreshClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, request.correlationId);
-                return [2 /*return*/, silentRefreshClient.acquireToken(request).catch(function (e) {
+                atbrtMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.AcquireTokenByRefreshToken, request.correlationId);
+                this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_NETWORK_START, exports.InteractionType.Silent, request);
+                silentRefreshClient = new SilentRefreshClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.performanceClient, request.correlationId);
+                return [2 /*return*/, silentRefreshClient.acquireToken(request)
+                        .then(function (result) {
+                        atbrtMeasurement.endMeasurement({
+                            success: true,
+                            fromCache: result.fromCache
+                        });
+                        return result;
+                    })
+                        .catch(function (e) {
                         var isServerError = e instanceof ServerError;
                         var isInteractionRequiredError = e instanceof InteractionRequiredAuthError;
                         var isInvalidGrantError = (e.errorCode === BrowserConstants.INVALID_GRANT_ERROR);
                         if (isServerError && isInvalidGrantError && !isInteractionRequiredError) {
                             _this.logger.verbose("Refresh token expired or invalid, attempting acquire token by iframe", request.correlationId);
-                            var silentIframeClient = new SilentIframeClient(_this.config, _this.browserStorage, _this.browserCrypto, _this.logger, _this.eventHandler, _this.navigationClient, exports.ApiId.acquireTokenSilent_authCode, request.correlationId);
-                            return silentIframeClient.acquireToken(request);
+                            var silentIframeClient = new SilentIframeClient(_this.config, _this.browserStorage, _this.browserCrypto, _this.logger, _this.eventHandler, _this.navigationClient, exports.ApiId.acquireTokenSilent_authCode, _this.performanceClient, request.correlationId);
+                            return silentIframeClient.acquireToken(request)
+                                .then(function (result) {
+                                atbrtMeasurement.endMeasurement({
+                                    success: true,
+                                    fromCache: result.fromCache
+                                });
+                                return result;
+                            })
+                                .catch(function (error) {
+                                atbrtMeasurement.endMeasurement({
+                                    success: false
+                                });
+                                throw error;
+                            });
                         }
+                        atbrtMeasurement.endMeasurement({
+                            success: false
+                        });
                         throw e;
                     })];
             });
@@ -12848,9 +13672,11 @@ var ClientApplication = /** @class */ (function () {
      */
     ClientApplication.prototype.logout = function (logoutRequest) {
         return __awaiter$1(this, void 0, void 0, function () {
+            var correlationId;
             return __generator$1(this, function (_a) {
-                this.logger.warning("logout API is deprecated and will be removed in msal-browser v3.0.0. Use logoutRedirect instead.");
-                return [2 /*return*/, this.logoutRedirect(logoutRequest)];
+                correlationId = this.getRequestCorrelationId(logoutRequest);
+                this.logger.warning("logout API is deprecated and will be removed in msal-browser v3.0.0. Use logoutRedirect instead.", correlationId);
+                return [2 /*return*/, this.logoutRedirect(__assign$1({ correlationId: correlationId }, logoutRequest))];
             });
         });
     };
@@ -12861,11 +13687,12 @@ var ClientApplication = /** @class */ (function () {
      */
     ClientApplication.prototype.logoutRedirect = function (logoutRequest) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var redirectClient;
+            var correlationId, redirectClient;
             return __generator$1(this, function (_a) {
+                correlationId = this.getRequestCorrelationId(logoutRequest);
                 this.preflightBrowserEnvironmentCheck(exports.InteractionType.Redirect);
-                redirectClient = new RedirectClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, logoutRequest === null || logoutRequest === void 0 ? void 0 : logoutRequest.correlationId);
-                return [2 /*return*/, redirectClient.logout(logoutRequest)];
+                redirectClient = new RedirectClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.performanceClient, correlationId);
+                return [2 /*return*/, redirectClient.logout(__assign$1({ correlationId: correlationId }, logoutRequest))];
             });
         });
     };
@@ -12875,9 +13702,10 @@ var ClientApplication = /** @class */ (function () {
      */
     ClientApplication.prototype.logoutPopup = function (logoutRequest) {
         try {
+            var correlationId = this.getRequestCorrelationId(logoutRequest);
             this.preflightBrowserEnvironmentCheck(exports.InteractionType.Popup);
-            var popupClient = new PopupClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, logoutRequest === null || logoutRequest === void 0 ? void 0 : logoutRequest.correlationId);
-            return popupClient.logout(logoutRequest);
+            var popupClient = new PopupClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.performanceClient, correlationId);
+            return popupClient.logout(__assign$1({ correlationId: correlationId }, logoutRequest));
         }
         catch (e) {
             // Since this function is syncronous we need to reject
@@ -12989,6 +13817,21 @@ var ClientApplication = /** @class */ (function () {
             !this.config.cache.storeAuthStateInCookie) {
             throw BrowserConfigurationAuthError.createInMemoryRedirectUnavailableError();
         }
+        if (interactionType === exports.InteractionType.Redirect || interactionType === exports.InteractionType.Popup) {
+            this.preflightInteractiveRequest();
+        }
+    };
+    /**
+     * Helper to validate app environment before making a request.
+     * @param request
+     * @param interactionType
+     */
+    ClientApplication.prototype.preflightInteractiveRequest = function () {
+        this.logger.verbose("preflightInteractiveRequest called, validating app environment");
+        // block the reload if it occurred inside a hidden iframe
+        BrowserUtils.blockReloadInHiddenIframes();
+        // Set interaction in progress temporary cache or throw if alread set.
+        this.browserStorage.setInteractionInProgress(true);
     };
     /**
      * Adds event callbacks to array
@@ -13004,6 +13847,24 @@ var ClientApplication = /** @class */ (function () {
     ClientApplication.prototype.removeEventCallback = function (callbackId) {
         this.eventHandler.removeEventCallback(callbackId);
     };
+    /**
+     * Registers a callback to receive performance events.
+     *
+     * @param {PerformanceCallbackFunction} callback
+     * @returns {string}
+     */
+    ClientApplication.prototype.addPerformanceCallback = function (callback) {
+        return this.performanceClient.addPerformanceCallback(callback);
+    };
+    /**
+     * Removes a callback registered with addPerformanceCallback.
+     *
+     * @param {string} callbackId
+     * @returns {boolean}
+     */
+    ClientApplication.prototype.removePerformanceCallback = function (callbackId) {
+        return this.performanceClient.removePerformanceCallback(callbackId);
+    };
     /**
      * Adds event listener that emits an event when a user account is added or removed from localstorage in a different browser tab or window
      */
@@ -13057,6 +13918,26 @@ var ClientApplication = /** @class */ (function () {
     ClientApplication.prototype.getConfiguration = function () {
         return this.config;
     };
+    /**
+     * Generates a correlation id for a request if none is provided.
+     *
+     * @protected
+     * @param {?Partial<BaseAuthRequest>} [request]
+     * @returns {string}
+     */
+    ClientApplication.prototype.getRequestCorrelationId = function (request) {
+        if (request === null || request === void 0 ? void 0 : request.correlationId) {
+            return request.correlationId;
+        }
+        if (this.isBrowserEnvironment) {
+            return this.browserCrypto.createNewGuid();
+        }
+        /*
+         * Included for fallback for non-browser environments,
+         * and to ensure this method always returns a string.
+         */
+        return Constants.EMPTY_STRING;
+    };
     return ClientApplication;
 }());
 
@@ -13075,12 +13956,13 @@ var SilentCacheClient = /** @class */ (function (_super) {
      */
     SilentCacheClient.prototype.acquireToken = function (silentRequest) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var serverTelemetryManager, silentAuthClient, cachedToken, error_1;
+            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)];
+                        return [4 /*yield*/, this.createSilentFlowClient(serverTelemetryManager, silentRequest.authority, silentRequest.azureCloudOptions)];
                     case 1:
                         silentAuthClient = _a.sent();
                         this.logger.verbose("Silent auth client created");
@@ -13091,12 +13973,19 @@ var SilentCacheClient = /** @class */ (function (_super) {
                     case 3:
                         cachedToken = _a.sent();
                         this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Silent, cachedToken);
+                        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({
+                            success: false
+                        });
                         throw error_1;
                     case 5: return [2 /*return*/];
                 }
@@ -13115,12 +14004,12 @@ var SilentCacheClient = /** @class */ (function (_super) {
      * @param serverTelemetryManager
      * @param authorityUrl
      */
-    SilentCacheClient.prototype.createSilentFlowClient = function (serverTelemetryManager, authorityUrl) {
+    SilentCacheClient.prototype.createSilentFlowClient = function (serverTelemetryManager, authorityUrl, azureCloudOptions) {
         return __awaiter$1(this, void 0, void 0, function () {
             var clientConfig;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl)];
+                    case 0: return [4 /*yield*/, this.getClientConfiguration(serverTelemetryManager, authorityUrl, azureCloudOptions)];
                     case 1:
                         clientConfig = _a.sent();
                         return [2 /*return*/, new SilentFlowClient(clientConfig)];
@@ -13191,9 +14080,11 @@ var PublicClientApplication = /** @class */ (function (_super) {
      */
     PublicClientApplication.prototype.loginRedirect = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
+            var correlationId;
             return __generator$1(this, function (_a) {
-                this.logger.verbose("loginRedirect called");
-                return [2 /*return*/, this.acquireTokenRedirect(request || DEFAULT_REQUEST)];
+                correlationId = this.getRequestCorrelationId(request);
+                this.logger.verbose("loginRedirect called", correlationId);
+                return [2 /*return*/, this.acquireTokenRedirect(__assign$1({ correlationId: correlationId }, (request || DEFAULT_REQUEST)))];
             });
         });
     };
@@ -13205,8 +14096,9 @@ var PublicClientApplication = /** @class */ (function (_super) {
      * @returns A promise that is fulfilled when this function has completed, or rejected if an error was raised.
      */
     PublicClientApplication.prototype.loginPopup = function (request) {
-        this.logger.verbose("loginPopup called");
-        return this.acquireTokenPopup(request || DEFAULT_REQUEST);
+        var correlationId = this.getRequestCorrelationId(request);
+        this.logger.verbose("loginPopup called", correlationId);
+        return this.acquireTokenPopup(__assign$1({ correlationId: correlationId }, (request || DEFAULT_REQUEST)));
     };
     /**
      * Silently acquire an access token for a given set of scopes. Returns currently processing promise if parallel requests are made.
@@ -13216,18 +14108,20 @@ var PublicClientApplication = /** @class */ (function (_super) {
      */
     PublicClientApplication.prototype.acquireTokenSilent = function (request) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var account, thumbprint, silentRequestKey, cachedResponse, response;
+            var correlationId, atsMeasurement, account, thumbprint, silentRequestKey, cachedResponse, response;
             var _this = this;
             return __generator$1(this, function (_a) {
+                correlationId = this.getRequestCorrelationId(request);
+                atsMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.AcquireTokenSilent, correlationId);
                 this.preflightBrowserEnvironmentCheck(exports.InteractionType.Silent);
-                this.logger.verbose("acquireTokenSilent called", request.correlationId);
+                this.logger.verbose("acquireTokenSilent called", correlationId);
                 account = request.account || this.getActiveAccount();
                 if (!account) {
                     throw BrowserAuthError.createNoAccountError();
                 }
                 thumbprint = {
                     clientId: this.config.auth.clientId,
-                    authority: request.authority || "",
+                    authority: request.authority || Constants.EMPTY_STRING,
                     scopes: request.scopes,
                     homeAccountIdentifier: account.homeAccountId,
                     claims: request.claims,
@@ -13240,21 +14134,35 @@ var PublicClientApplication = /** @class */ (function (_super) {
                 silentRequestKey = JSON.stringify(thumbprint);
                 cachedResponse = this.activeSilentTokenRequests.get(silentRequestKey);
                 if (typeof cachedResponse === "undefined") {
-                    this.logger.verbose("acquireTokenSilent called for the first time, storing active request", request.correlationId);
-                    response = this.acquireTokenSilentAsync(request, account)
+                    this.logger.verbose("acquireTokenSilent called for the first time, storing active request", correlationId);
+                    response = this.acquireTokenSilentAsync(__assign$1(__assign$1({}, request), { correlationId: correlationId }), account)
                         .then(function (result) {
                         _this.activeSilentTokenRequests.delete(silentRequestKey);
+                        atsMeasurement.endMeasurement({
+                            success: true,
+                            fromCache: result.fromCache
+                        });
+                        atsMeasurement.flushMeasurement();
                         return result;
                     })
                         .catch(function (error) {
                         _this.activeSilentTokenRequests.delete(silentRequestKey);
+                        atsMeasurement.endMeasurement({
+                            success: false
+                        });
+                        atsMeasurement.flushMeasurement();
                         throw error;
                     });
                     this.activeSilentTokenRequests.set(silentRequestKey, response);
                     return [2 /*return*/, response];
                 }
                 else {
-                    this.logger.verbose("acquireTokenSilent has been called previously, returning the result from the first call", request.correlationId);
+                    this.logger.verbose("acquireTokenSilent has been called previously, returning the result from the first call", correlationId);
+                    atsMeasurement.endMeasurement({
+                        success: true
+                    });
+                    // Discard measurements for memoized calls, as they are usually only a couple of ms and will artificially deflate metrics
+                    atsMeasurement.discardMeasurement();
                     return [2 /*return*/, cachedResponse];
                 }
             });
@@ -13268,17 +14176,26 @@ var PublicClientApplication = /** @class */ (function (_super) {
      */
     PublicClientApplication.prototype.acquireTokenSilentAsync = function (request, account) {
         return __awaiter$1(this, void 0, void 0, function () {
-            var silentCacheClient, silentRequest;
+            var astsAsyncMeasurement, silentCacheClient, silentRequest;
             var _this = this;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        silentCacheClient = new SilentCacheClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, request.correlationId);
+                        astsAsyncMeasurement = this.performanceClient.startMeasurement(exports.PerformanceEvents.AcquireTokenSilentAsync, request.correlationId);
+                        silentCacheClient = new SilentCacheClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, this.performanceClient, request.correlationId);
                         return [4 /*yield*/, silentCacheClient.initializeSilentRequest(request, account)];
                     case 1:
                         silentRequest = _a.sent();
                         this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_START, exports.InteractionType.Silent, request);
-                        return [2 /*return*/, silentCacheClient.acquireToken(silentRequest).catch(function () { return __awaiter$1(_this, void 0, void 0, function () {
+                        return [2 /*return*/, silentCacheClient.acquireToken(silentRequest)
+                                .then(function (result) {
+                                astsAsyncMeasurement.endMeasurement({
+                                    success: true,
+                                    fromCache: result.fromCache
+                                });
+                                return result;
+                            })
+                                .catch(function () { return __awaiter$1(_this, void 0, void 0, function () {
                                 var tokenRenewalResult, tokenRenewalError_1;
                                 return __generator$1(this, function (_a) {
                                     switch (_a.label) {
@@ -13288,10 +14205,17 @@ var PublicClientApplication = /** @class */ (function (_super) {
                                         case 1:
                                             tokenRenewalResult = _a.sent();
                                             this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Silent, tokenRenewalResult);
+                                            astsAsyncMeasurement.endMeasurement({
+                                                success: true,
+                                                fromCache: tokenRenewalResult.fromCache
+                                            });
                                             return [2 /*return*/, tokenRenewalResult];
                                         case 2:
                                             tokenRenewalError_1 = _a.sent();
                                             this.eventHandler.emitEvent(exports.EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Silent, null, tokenRenewalError_1);
+                                            astsAsyncMeasurement.endMeasurement({
+                                                success: false
+                                            });
                                             throw tokenRenewalError_1;
                                         case 3: return [2 /*return*/];
                                     }
@@ -13360,6 +14284,12 @@ var stubbedPublicClientApplication = {
     removeEventCallback: function () {
         return;
     },
+    addPerformanceCallback: function () {
+        return "";
+    },
+    removePerformanceCallback: function () {
+        return false;
+    },
     enableAccountStorageEvents: function () {
         return;
     },
@@ -13523,21 +14453,35 @@ exports.AuthErrorMessage = AuthErrorMessage;
 exports.AuthenticationHeaderParser = AuthenticationHeaderParser;
 exports.BrowserAuthError = BrowserAuthError;
 exports.BrowserAuthErrorMessage = BrowserAuthErrorMessage;
+exports.BrowserCacheManager = BrowserCacheManager;
 exports.BrowserConfigurationAuthError = BrowserConfigurationAuthError;
 exports.BrowserConfigurationAuthErrorMessage = BrowserConfigurationAuthErrorMessage;
+exports.BrowserConstants = BrowserConstants;
+exports.BrowserPerformanceClient = BrowserPerformanceClient;
 exports.BrowserUtils = BrowserUtils;
 exports.ClientAuthError = ClientAuthError;
 exports.ClientAuthErrorMessage = ClientAuthErrorMessage;
 exports.ClientConfigurationError = ClientConfigurationError;
 exports.ClientConfigurationErrorMessage = ClientConfigurationErrorMessage;
+exports.DEFAULT_IFRAME_TIMEOUT_MS = DEFAULT_IFRAME_TIMEOUT_MS;
+exports.EventHandler = EventHandler;
 exports.EventMessageUtils = EventMessageUtils;
 exports.InteractionRequiredAuthError = InteractionRequiredAuthError;
 exports.InteractionRequiredAuthErrorMessage = InteractionRequiredAuthErrorMessage;
 exports.Logger = Logger;
 exports.NavigationClient = NavigationClient;
+exports.OIDC_DEFAULT_SCOPES = OIDC_DEFAULT_SCOPES;
+exports.PopupClient = PopupClient;
+exports.PopupUtils = PopupUtils;
 exports.PublicClientApplication = PublicClientApplication;
+exports.RedirectClient = RedirectClient;
+exports.RedirectHandler = RedirectHandler;
 exports.ServerError = ServerError;
 exports.SignedHttpRequest = SignedHttpRequest;
+exports.SilentCacheClient = SilentCacheClient;
+exports.SilentIframeClient = SilentIframeClient;
+exports.SilentRefreshClient = SilentRefreshClient;
+exports.StandardInteractionClient = StandardInteractionClient;
 exports.StringUtils = StringUtils;
 exports.UrlString = UrlString;
 exports.stubbedPublicClientApplication = stubbedPublicClientApplication;