@azure/msal-browser 3.0.0-beta.0 → 3.0.0

package/lib/msal-browser.js

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v3.0.0-beta.0 2023-06-19 */
+/*! @azure/msal-browser v3.0.0 2023-08-08 */
 'use strict';
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -6,7 +6,7 @@
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.msal = {}));
 })(this, (function (exports) { 'use strict';
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -203,11 +203,17 @@
         S256: "S256",
     };
     /**
-     * allowed values for response_mode
+     * allowed values for server response type
      */
-    const ResponseMode = {
+    const ServerResponseType = {
         QUERY: "query",
         FRAGMENT: "fragment",
+    };
+    /**
+     * allowed values for response_mode
+     */
+    const ResponseMode = {
+        ...ServerResponseType,
         FORM_POST: "form_post",
     };
     /**
@@ -360,7 +366,7 @@
         Pop: "pop",
     };
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -414,7 +420,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -459,7 +465,7 @@
         },
     };
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -981,7 +987,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1108,7 +1114,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1308,12 +1314,12 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
     /* eslint-disable header/header */
     const name$1 = "@azure/msal-common";
-    const version$1 = "14.0.0-beta.0";
+    const version$1 = "14.0.0";
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1325,15 +1331,15 @@
         AzurePublic: "https://login.microsoftonline.com",
         // Microsoft PPE
         AzurePpe: "https://login.windows-ppe.net",
-        // Microsoft Chinese national cloud
+        // Microsoft Chinese national/regional cloud
         AzureChina: "https://login.chinacloudapi.cn",
-        // Microsoft German national cloud ("Black Forest")
+        // Microsoft German national/regional cloud ("Black Forest")
         AzureGermany: "https://login.microsoftonline.de",
         // US Government cloud
         AzureUsGovernment: "https://login.microsoftonline.us",
     };
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1433,12 +1439,20 @@
         },
         invalidAuthenticationHeader: {
             code: "invalid_authentication_header",
-            desc: "Invalid authentication header provided"
+            desc: "Invalid authentication header provided",
+        },
+        cannotSetOIDCOptions: {
+            code: "cannot_set_OIDCOptions",
+            desc: "Cannot set OIDCOptions parameter. Please change the protocol mode to OIDC or use a non-Microsoft authority.",
+        },
+        cannotAllowNativeBroker: {
+            code: "cannot_allow_native_broker",
+            desc: "Cannot set allowNativeBroker parameter to true when not in AAD protocol mode.",
         },
         authorityMismatch: {
             code: "authority_mismatch",
-            desc: "Authority mismatch error. Authority provided in login request or PublicClientApplication config does not match the environment of the provided account. Please use a matching account or make an interactive request to login to this authority."
-        }
+            desc: "Authority mismatch error. Authority provided in login request or PublicClientApplication config does not match the environment of the provided account. Please use a matching account or make an interactive request to login to this authority.",
+        },
     };
     /**
      * Error thrown when there is an error in configuration of the MSAL.js library.
@@ -1587,6 +1601,18 @@
         static createInvalidAuthenticationHeaderError(invalidHeaderName, details) {
             return new ClientConfigurationError(ClientConfigurationErrorMessage.invalidAuthenticationHeader.code, `${ClientConfigurationErrorMessage.invalidAuthenticationHeader.desc}. Invalid header: ${invalidHeaderName}. Details: ${details}`);
         }
+        /**
+         * Throws error when provided non-default OIDCOptions when not in OIDC protocol mode
+         */
+        static createCannotSetOIDCOptionsError() {
+            return new ClientConfigurationError(ClientConfigurationErrorMessage.cannotSetOIDCOptions.code, ClientConfigurationErrorMessage.cannotSetOIDCOptions.desc);
+        }
+        /**
+         * Throws error when allowNativeBroker is set to true when not in AAD protocol mode
+         */
+        static createCannotAllowNativeBrokerError() {
+            return new ClientConfigurationError(ClientConfigurationErrorMessage.cannotAllowNativeBroker.code, ClientConfigurationErrorMessage.cannotAllowNativeBroker.desc);
+        }
         /**
          * Create an error when the authority provided in request does not match authority provided in account or MSAL.js configuration.
          */
@@ -1595,7 +1621,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1795,7 +1821,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1835,7 +1861,7 @@
         };
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1847,10 +1873,23 @@
         Default: 0,
         Adfs: 1,
         Dsts: 2,
-        Ciam: 3
+        Ciam: 3,
+    };
+
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
+    /*
+     * Copyright (c) Microsoft Corporation. All rights reserved.
+     * Licensed under the MIT License.
+     */
+    /**
+     * Protocol modes supported by MSAL.
+     */
+    const ProtocolMode = {
+        AAD: "AAD",
+        OIDC: "OIDC",
     };
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1872,7 +1911,6 @@
      *      username: primary username that represents the user, usually corresponds to preferred_username in the v2 endpt
      *      authorityType: Accounts authority type as a string
      *      name: Full name for the account, including given name and family name,
-     *      clientInfo: Full base64 encoded client info received from ESTS
      *      lastModificationTime: last time this entity was modified in the cache
      *      lastModificationApp:
      *      idTokenClaims: Object containing claims parsed from ID token
@@ -1899,24 +1937,6 @@
                 localAccountId: this.localAccountId,
             });
         }
-        /**
-         * returns the type of the cache (in this case account)
-         */
-        generateType() {
-            switch (this.authorityType) {
-                case CacheAccountType.ADFS_ACCOUNT_TYPE:
-                    return CacheType.ADFS;
-                case CacheAccountType.MSAV1_ACCOUNT_TYPE:
-                    return CacheType.MSA;
-                case CacheAccountType.MSSTS_ACCOUNT_TYPE:
-                    return CacheType.MSSTS;
-                case CacheAccountType.GENERIC_ACCOUNT_TYPE:
-                    return CacheType.GENERIC;
-                default: {
-                    throw ClientAuthError.createUnexpectedAccountTypeError();
-                }
-            }
-        }
         /**
          * Returns the AccountInfo interface for this account.
          */
@@ -1930,6 +1950,7 @@
                 name: this.name,
                 idTokenClaims: this.idTokenClaims,
                 nativeAccountId: this.nativeAccountId,
+                authorityType: this.authorityType,
             };
         }
         /**
@@ -1946,84 +1967,74 @@
         }
         /**
          * Build Account cache from IdToken, clientInfo and authority/policy. Associated with AAD.
-         * @param clientInfo
-         * @param authority
-         * @param idToken
-         * @param policy
+         * @param accountDetails
          */
-        static createAccount(clientInfo, homeAccountId, idToken, authority, cloudGraphHostName, msGraphHost, environment, nativeAccountId) {
+        static createAccount(accountDetails, authority) {
             const account = new AccountEntity();
-            account.authorityType = CacheAccountType.MSSTS_ACCOUNT_TYPE;
-            account.clientInfo = clientInfo;
-            account.homeAccountId = homeAccountId;
-            account.nativeAccountId = nativeAccountId;
-            const env = environment || (authority && authority.getPreferredCache());
+            if (authority.authorityType === AuthorityType.Adfs) {
+                account.authorityType = CacheAccountType.ADFS_ACCOUNT_TYPE;
+            }
+            else if (authority.protocolMode === ProtocolMode.AAD) {
+                account.authorityType = CacheAccountType.MSSTS_ACCOUNT_TYPE;
+            }
+            else {
+                account.authorityType = CacheAccountType.GENERIC_ACCOUNT_TYPE;
+            }
+            account.clientInfo = accountDetails.clientInfo;
+            account.homeAccountId = accountDetails.homeAccountId;
+            account.nativeAccountId = accountDetails.nativeAccountId;
+            const env = accountDetails.environment ||
+                (authority && authority.getPreferredCache());
             if (!env) {
                 throw ClientAuthError.createInvalidCacheEnvironmentError();
             }
             account.environment = env;
             // non AAD scenarios can have empty realm
-            account.realm = idToken?.claims?.tid || Constants.EMPTY_STRING;
-            if (idToken) {
-                account.idTokenClaims = idToken.claims;
-                // How do you account for MSA CID here?
-                account.localAccountId =
-                    idToken?.claims?.oid ||
-                        idToken?.claims?.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.
-                 */
-                const preferredUsername = idToken?.claims?.preferred_username;
-                const email = idToken?.claims?.emails
-                    ? idToken.claims.emails[0]
-                    : null;
-                account.username =
-                    preferredUsername || email || Constants.EMPTY_STRING;
-                account.name = idToken?.claims?.name;
-            }
-            account.cloudGraphHostName = cloudGraphHostName;
-            account.msGraphHost = msGraphHost;
+            account.realm =
+                accountDetails.idTokenClaims.tid || Constants.EMPTY_STRING;
+            account.idTokenClaims = accountDetails.idTokenClaims;
+            // How do you account for MSA CID here?
+            account.localAccountId =
+                accountDetails.idTokenClaims.oid ||
+                    accountDetails.idTokenClaims.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.
+             */
+            const preferredUsername = accountDetails.idTokenClaims.preferred_username ||
+                accountDetails.idTokenClaims.upn;
+            const email = accountDetails.idTokenClaims.emails
+                ? accountDetails.idTokenClaims.emails[0]
+                : null;
+            account.username = preferredUsername || email || Constants.EMPTY_STRING;
+            account.name = accountDetails.idTokenClaims.name;
+            account.cloudGraphHostName = accountDetails.cloudGraphHostName;
+            account.msGraphHost = accountDetails.msGraphHost;
             return account;
         }
         /**
-         * Builds non-AAD/ADFS account.
-         * @param authority
-         * @param idToken
+         * Creates an AccountEntity object from AccountInfo
+         * @param accountInfo
+         * @param cloudGraphHostName
+         * @param msGraphHost
+         * @returns
          */
-        static createGenericAccount(homeAccountId, idToken, authority, cloudGraphHostName, msGraphHost, environment) {
+        static createFromAccountInfo(accountInfo, cloudGraphHostName, msGraphHost) {
             const account = new AccountEntity();
             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 = Constants.EMPTY_STRING;
-            const env = environment || (authority && authority.getPreferredCache());
-            if (!env) {
-                throw ClientAuthError.createInvalidCacheEnvironmentError();
-            }
-            if (idToken) {
-                // How do you account for MSA CID here?
-                account.localAccountId =
-                    idToken?.claims?.oid ||
-                        idToken?.claims?.sub ||
-                        Constants.EMPTY_STRING;
-                // upn claim for most ADFS scenarios
-                account.username = idToken?.claims?.upn || Constants.EMPTY_STRING;
-                account.name = idToken?.claims?.name || Constants.EMPTY_STRING;
-                account.idTokenClaims = idToken?.claims;
-            }
-            account.environment = env;
+                accountInfo.authorityType || CacheAccountType.GENERIC_ACCOUNT_TYPE;
+            account.homeAccountId = accountInfo.homeAccountId;
+            account.localAccountId = accountInfo.localAccountId;
+            account.nativeAccountId = accountInfo.nativeAccountId;
+            account.realm = accountInfo.tenantId;
+            account.environment = accountInfo.environment;
+            account.username = accountInfo.username;
+            account.name = accountInfo.name;
+            account.idTokenClaims = accountInfo.idTokenClaims;
             account.cloudGraphHostName = cloudGraphHostName;
             account.msGraphHost = msGraphHost;
-            /*
-             * add uniqueName to claims
-             * account.name = idToken.claims.uniqueName;
-             */
             return account;
         }
         /**
@@ -2031,9 +2042,9 @@
          * @param serverClientInfo
          * @param authType
          */
-        static generateHomeAccountId(serverClientInfo, authType, logger, cryptoObj, idToken) {
-            const accountId = idToken?.claims?.sub
-                ? idToken.claims.sub
+        static generateHomeAccountId(serverClientInfo, authType, logger, cryptoObj, idTokenClaims) {
+            const accountId = idTokenClaims?.sub
+                ? idTokenClaims.sub
                 : Constants.EMPTY_STRING;
             // since ADFS does not have tid and does not set client_info
             if (authType === AuthorityType.Adfs ||
@@ -2101,7 +2112,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2152,7 +2163,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2218,20 +2229,21 @@
          * saves a cache record
          * @param cacheRecord
          */
-        async saveCacheRecord(cacheRecord) {
+        async saveCacheRecord(cacheRecord, storeInCache) {
             if (!cacheRecord) {
                 throw ClientAuthError.createNullOrUndefinedCacheRecord();
             }
             if (!!cacheRecord.account) {
                 this.setAccount(cacheRecord.account);
             }
-            if (!!cacheRecord.idToken) {
+            if (!!cacheRecord.idToken && storeInCache?.idToken !== false) {
                 this.setIdTokenCredential(cacheRecord.idToken);
             }
-            if (!!cacheRecord.accessToken) {
+            if (!!cacheRecord.accessToken && storeInCache?.accessToken !== false) {
                 await this.saveAccessToken(cacheRecord.accessToken);
             }
-            if (!!cacheRecord.refreshToken) {
+            if (!!cacheRecord.refreshToken &&
+                storeInCache?.refreshToken !== false) {
                 this.setRefreshTokenCredential(cacheRecord.refreshToken);
             }
             if (!!cacheRecord.appMetadata) {
@@ -3166,7 +3178,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3186,6 +3198,9 @@
         logLevel: exports.LogLevel.Info,
         correlationId: Constants.EMPTY_STRING,
     };
+    const DEFAULT_CACHE_OPTIONS = {
+        claimsBasedCachingEnabled: false,
+    };
     const DEFAULT_NETWORK_IMPLEMENTATION = {
         async sendGetRequestAsync() {
             const notImplErr = "Network interface - sendGetRequestAsync() has not been implemented";
@@ -3223,7 +3238,7 @@
      *
      * @returns Configuration
      */
-    function buildClientConfiguration({ authOptions: userAuthOptions, systemOptions: userSystemOptions, loggerOptions: userLoggerOption, storageInterface: storageImplementation, networkInterface: networkImplementation, cryptoInterface: cryptoImplementation, clientCredentials: clientCredentials, libraryInfo: libraryInfo, telemetry: telemetry, serverTelemetryManager: serverTelemetryManager, persistencePlugin: persistencePlugin, serializableCache: serializableCache, }) {
+    function buildClientConfiguration({ authOptions: userAuthOptions, systemOptions: userSystemOptions, loggerOptions: userLoggerOption, cacheOptions: userCacheOptions, storageInterface: storageImplementation, networkInterface: networkImplementation, cryptoInterface: cryptoImplementation, clientCredentials: clientCredentials, libraryInfo: libraryInfo, telemetry: telemetry, serverTelemetryManager: serverTelemetryManager, persistencePlugin: persistencePlugin, serializableCache: serializableCache, }) {
         const loggerOptions = {
             ...DEFAULT_LOGGER_IMPLEMENTATION,
             ...userLoggerOption,
@@ -3232,6 +3247,7 @@
             authOptions: buildAuthOptions(userAuthOptions),
             systemOptions: { ...DEFAULT_SYSTEM_OPTIONS, ...userSystemOptions },
             loggerOptions: loggerOptions,
+            cacheOptions: { ...DEFAULT_CACHE_OPTIONS, ...userCacheOptions },
             storageInterface: storageImplementation ||
                 new DefaultStorageClass(userAuthOptions.clientId, DEFAULT_CRYPTO_IMPLEMENTATION, new Logger(loggerOptions)),
             networkInterface: networkImplementation || DEFAULT_NETWORK_IMPLEMENTATION,
@@ -3256,8 +3272,15 @@
             ...authOptions,
         };
     }
+    /**
+     * Returns true if config has protocolMode set to ProtocolMode.OIDC, false otherwise
+     * @param ClientConfiguration
+     */
+    function isOidcProtocolMode(config) {
+        return (config.authOptions.authority.options.protocolMode === ProtocolMode.OIDC);
+    }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3274,7 +3297,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3371,7 +3394,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3407,7 +3430,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3417,7 +3440,7 @@
         UPN: "UPN",
     };
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3498,11 +3521,11 @@
                 }
             });
             // remove empty string parameters
-            return Object.fromEntries(Object.entries(eQParams).filter(kv => kv[1] !== ""));
+            return Object.fromEntries(Object.entries(eQParams).filter((kv) => kv[1] !== ""));
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3542,9 +3565,15 @@
          * @param scopeSet
          * @param addOidcScopes
          */
-        addScopes(scopes, addOidcScopes = true) {
+        addScopes(scopes, addOidcScopes = true, defaultScopes = OIDC_DEFAULT_SCOPES) {
+            // Always add openid to the scopes when adding OIDC scopes
+            if (addOidcScopes &&
+                !defaultScopes.includes("openid") &&
+                !scopes.includes("openid")) {
+                defaultScopes.push("openid");
+            }
             const requestScopes = addOidcScopes
-                ? [...(scopes || []), ...OIDC_DEFAULT_SCOPES]
+                ? [...(scopes || []), ...defaultScopes]
                 : scopes || [];
             const scopeSet = new ScopeSet(requestScopes);
             this.parameters.set(AADServerParamKeys.SCOPE, encodeURIComponent(scopeSet.printScopes()));
@@ -3879,7 +3908,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3974,7 +4003,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4113,7 +4142,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4172,7 +4201,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4219,7 +4248,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4333,7 +4362,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4395,7 +4424,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4476,7 +4505,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4491,7 +4520,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4565,7 +4594,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4749,6 +4778,30 @@
             }
             return Constants.EMPTY_STRING;
         }
+        /**
+         * Parses query server response string from given string.
+         * Extract hash between '?code=' and '#' if trailing '# is present.
+         * Returns empty string if no query symbol is found.
+         * @param queryString
+         */
+        static parseQueryServerResponse(queryString) {
+            const queryIndex1 = queryString.indexOf("?code");
+            const queryIndex2 = queryString.indexOf("/?code");
+            const hashIndex = queryString.indexOf("#");
+            if (queryIndex2 > -1 && hashIndex > -1) {
+                return queryString.substring(queryIndex2 + 2, hashIndex);
+            }
+            else if (queryIndex2 > -1) {
+                return queryString.substring(queryIndex2 + 2);
+            }
+            else if (queryIndex1 > -1 && hashIndex > -1) {
+                return queryString.substring(queryIndex1 + 1, hashIndex);
+            }
+            else if (queryIndex1 > -1) {
+                return queryString.substring(queryIndex1 + 1);
+            }
+            return Constants.EMPTY_STRING;
+        }
         static constructAuthorityUriFromObject(urlObject) {
             return new UrlString(urlObject.Protocol +
                 "//" +
@@ -4794,6 +4847,21 @@
             }
             return deserializedQueryString;
         }
+        /**
+         * Returns either deserialized query string or deserialized hash, depending on the serverResponseType
+         * as a server auth code response object.
+         */
+        static getDeserializedCodeResponse(serverResponseType, hashFragment) {
+            const hashUrlString = new UrlString(hashFragment);
+            let serverParams;
+            if (serverResponseType === ServerResponseType.QUERY) {
+                serverParams = UrlString.getDeserializedQueryString(hashFragment);
+            }
+            else {
+                serverParams = UrlString.getDeserializedHash(hashUrlString.getHash());
+            }
+            return serverParams;
+        }
         /**
          * Check if the hash of the URL string contains known properties
          */
@@ -4810,7 +4878,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5013,6 +5081,7 @@
         UpdateCloudDiscoveryMetadataMeasurement: "updateCloudDiscoveryMetadataMeasurement",
         UsernamePasswordClientAcquireToken: "usernamePasswordClientAcquireToken",
         NativeMessageHandlerHandshake: "nativeMessageHandlerHandshake",
+        NativeGenerateAuthResult: "nativeGenerateAuthResult",
     };
     /**
      * State of the performance event.
@@ -5037,7 +5106,7 @@
         "status",
     ]);
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5122,7 +5191,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5191,7 +5260,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5218,7 +5287,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5245,12 +5314,25 @@
          */
         validateServerAuthorizationCodeResponse(serverResponseHash, cachedState, cryptoObj) {
             if (!serverResponseHash.state || !cachedState) {
-                throw !serverResponseHash.state
-                    ? ClientAuthError.createStateNotFoundError("Server State")
-                    : ClientAuthError.createStateNotFoundError("Cached State");
+                throw serverResponseHash.state
+                    ? ClientAuthError.createStateNotFoundError("Cached State")
+                    : ClientAuthError.createStateNotFoundError("Server State");
+            }
+            let decodedServerResponseHash;
+            let decodedCachedState;
+            try {
+                decodedServerResponseHash = decodeURIComponent(serverResponseHash.state);
+            }
+            catch (e) {
+                throw ClientAuthError.createInvalidStateError(serverResponseHash.state, `Server response hash URI could not be decoded`);
+            }
+            try {
+                decodedCachedState = decodeURIComponent(cachedState);
+            }
+            catch (e) {
+                throw ClientAuthError.createInvalidStateError(serverResponseHash.state, `Cached state URI could not be decoded`);
             }
-            if (decodeURIComponent(serverResponseHash.state) !==
-                decodeURIComponent(cachedState)) {
+            if (decodedServerResponseHash !== decodedCachedState) {
                 throw ClientAuthError.createStateMismatchError();
             }
             // Check for error
@@ -5310,7 +5392,7 @@
                 }
             }
             // generate homeAccountId
-            this.homeAccountIdentifier = AccountEntity.generateHomeAccountId(serverTokenResponse.client_info || Constants.EMPTY_STRING, authority.authorityType, this.logger, this.cryptoObj, idTokenObj);
+            this.homeAccountIdentifier = AccountEntity.generateHomeAccountId(serverTokenResponse.client_info || Constants.EMPTY_STRING, authority.authorityType, this.logger, this.cryptoObj, idTokenObj?.claims);
             // save the response tokens
             let requestStateObj;
             if (!!authCodePayload && !!authCodePayload.state) {
@@ -5343,7 +5425,7 @@
                         return ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, idTokenObj, requestStateObj, undefined, serverRequestId);
                     }
                 }
-                await this.cacheStorage.saveCacheRecord(cacheRecord);
+                await this.cacheStorage.saveCacheRecord(cacheRecord, request.storeInCache);
             }
             finally {
                 if (this.persistencePlugin &&
@@ -5372,7 +5454,13 @@
             if (!StringUtils.isEmpty(serverTokenResponse.id_token) &&
                 !!idTokenObj) {
                 cachedIdToken = IdTokenEntity.createIdTokenEntity(this.homeAccountIdentifier, env, serverTokenResponse.id_token || Constants.EMPTY_STRING, this.clientId, idTokenObj.claims.tid || Constants.EMPTY_STRING);
-                cachedAccount = this.generateAccountEntity(serverTokenResponse, idTokenObj, authority, authCodePayload);
+                cachedAccount = AccountEntity.createAccount({
+                    homeAccountId: this.homeAccountIdentifier,
+                    idTokenClaims: idTokenObj.claims,
+                    clientInfo: serverTokenResponse.client_info,
+                    cloudGraphHostName: authCodePayload?.cloud_graph_host_name,
+                    msGraphHost: authCodePayload?.msgraph_host,
+                }, authority);
             }
             // AccessToken
             let cachedAccessToken = null;
@@ -5416,34 +5504,6 @@
             }
             return new CacheRecord(cachedAccount, cachedIdToken, cachedAccessToken, cachedRefreshToken, cachedAppMetadata);
         }
-        /**
-         * Generate Account
-         * @param serverTokenResponse
-         * @param idToken
-         * @param authority
-         */
-        generateAccountEntity(serverTokenResponse, idToken, authority, authCodePayload) {
-            const authorityType = authority.authorityType;
-            const cloudGraphHostName = authCodePayload
-                ? authCodePayload.cloud_graph_host_name
-                : Constants.EMPTY_STRING;
-            const 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");
-                return AccountEntity.createGenericAccount(this.homeAccountIdentifier, idToken, authority, cloudGraphHostName, msGraphhost);
-            }
-            // This fallback applies to B2C as well as they fall under an AAD account type.
-            if (StringUtils.isEmpty(serverTokenResponse.client_info) &&
-                authority.protocolMode === "AAD") {
-                throw ClientAuthError.createClientInfoEmptyError();
-            }
-            return serverTokenResponse.client_info
-                ? AccountEntity.createAccount(serverTokenResponse.client_info, this.homeAccountIdentifier, idToken, authority, cloudGraphHostName, msGraphhost)
-                : AccountEntity.createGenericAccount(this.homeAccountIdentifier, idToken, authority, cloudGraphHostName, msGraphhost);
-        }
         /**
          * Creates an @AuthenticationResult from @CacheRecord , @IdToken , and a boolean that states whether or not the result is from cache.
          *
@@ -5521,7 +5581,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5535,6 +5595,8 @@
             super(configuration, performanceClient);
             // Flag to indicate if client is for hybrid spa auth code redemption
             this.includeRedirectUri = true;
+            this.oidcDefaultScopes =
+                this.config.authOptions.authority.options.OIDCOptions?.defaultScopes;
         }
         /**
          * Creates the URL of the authorization request letting the user input credentials and consent to the
@@ -5573,7 +5635,7 @@
             const requestId = response.headers?.[HeaderNames.X_MS_REQUEST_ID];
             const httpVerAuthority = response.headers?.[HeaderNames.X_MS_HTTP_VERSION];
             if (httpVerAuthority) {
-                atsMeasurement?.addStaticFields({
+                atsMeasurement?.add({
                     httpVerAuthority,
                 });
             }
@@ -5584,14 +5646,14 @@
             return responseHandler
                 .handleServerTokenResponse(response.body, this.authority, reqTimestamp, request, authCodePayload, undefined, undefined, undefined, requestId)
                 .then((result) => {
-                atsMeasurement?.endMeasurement({
+                atsMeasurement?.end({
                     success: true,
                 });
                 return result;
             })
                 .catch((error) => {
                 this.logger.verbose("Error in fetching token in ACC", request.correlationId);
-                atsMeasurement?.endMeasurement({
+                atsMeasurement?.end({
                     errorCode: error.errorCode,
                     subErrorCode: error.subError,
                     success: false,
@@ -5607,10 +5669,8 @@
         handleFragmentResponse(hashFragment, cachedState) {
             // Handle responses.
             const responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, null, null);
-            // Deserialize hash fragment response parameters.
-            const hashUrlString = new UrlString(hashFragment);
-            // Deserialize hash fragment response parameters.
-            const serverParams = UrlString.getDeserializedHash(hashUrlString.getHash());
+            const serverParams = UrlString.getDeserializedCodeResponse(this.config.authOptions.authority.options.OIDCOptions
+                ?.serverResponseType, hashFragment);
             // Get code response
             responseHandler.validateServerAuthorizationCodeResponse(serverParams, cachedState, this.cryptoUtils);
             // throw when there is no auth code in the response
@@ -5696,14 +5756,14 @@
                 parameterBuilder.addRedirectUri(request.redirectUri);
             }
             // Add scope array, parameter builder will add default scopes and dedupe
-            parameterBuilder.addScopes(request.scopes);
+            parameterBuilder.addScopes(request.scopes, true, this.oidcDefaultScopes);
             // add code: user set, not validated
             parameterBuilder.addAuthorizationCode(request.code);
             // Add library metadata
             parameterBuilder.addLibraryInfo(this.config.libraryInfo);
             parameterBuilder.addApplicationTelemetry(this.config.telemetry.application);
             parameterBuilder.addThrottling();
-            if (this.serverTelemetryManager) {
+            if (this.serverTelemetryManager && !isOidcProtocolMode(this.config)) {
                 parameterBuilder.addServerTelemetry(this.serverTelemetryManager);
             }
             // add code_verifier if passed
@@ -5802,7 +5862,7 @@
                 ...(request.scopes || []),
                 ...(request.extraScopesToConsent || []),
             ];
-            parameterBuilder.addScopes(requestScopes);
+            parameterBuilder.addScopes(requestScopes, true, this.oidcDefaultScopes);
             // validate the redirectUri (to be a non null value)
             parameterBuilder.addRedirectUri(request.redirectUri);
             // generate the correlationId if not set by the user and add
@@ -5815,7 +5875,9 @@
             parameterBuilder.addResponseTypeCode();
             // add library info parameters
             parameterBuilder.addLibraryInfo(this.config.libraryInfo);
-            parameterBuilder.addApplicationTelemetry(this.config.telemetry.application);
+            if (!isOidcProtocolMode(this.config)) {
+                parameterBuilder.addApplicationTelemetry(this.config.telemetry.application);
+            }
             // add client_info=1
             parameterBuilder.addClientInfo();
             if (request.codeChallenge && request.codeChallengeMethod) {
@@ -5957,7 +6019,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5978,11 +6040,11 @@
             this.performanceClient?.setPreQueueTime(PerformanceEvents.RefreshTokenClientExecuteTokenRequest, request.correlationId);
             const response = await this.executeTokenRequest(request, this.authority);
             const httpVerToken = response.headers?.[HeaderNames.X_MS_HTTP_VERSION];
-            atsMeasurement?.addStaticFields({
+            atsMeasurement?.add({
                 refreshTokenSize: response.body.refresh_token?.length || 0,
             });
             if (httpVerToken) {
-                atsMeasurement?.addStaticFields({
+                atsMeasurement?.add({
                     httpVerToken,
                 });
             }
@@ -5994,14 +6056,14 @@
             return responseHandler
                 .handleServerTokenResponse(response.body, this.authority, reqTimestamp, request, undefined, undefined, true, request.forceCache, requestId)
                 .then((result) => {
-                atsMeasurement?.endMeasurement({
+                atsMeasurement?.end({
                     success: true,
                 });
                 return result;
             })
                 .catch((error) => {
                 this.logger.verbose("Error in fetching refresh token", request.correlationId);
-                atsMeasurement?.endMeasurement({
+                atsMeasurement?.end({
                     errorCode: error.errorCode,
                     subErrorCode: error.subError,
                     success: false,
@@ -6065,11 +6127,11 @@
             this.logger.verbose("RefreshTokenClientAcquireTokenWithCachedRefreshToken called", request.correlationId);
             const refreshToken = this.cacheManager.getRefreshToken(request.account, foci);
             if (!refreshToken) {
-                atsMeasurement?.discardMeasurement();
+                atsMeasurement?.discard();
                 throw InteractionRequiredAuthError.createNoTokensFoundError();
             }
             // attach cached RT size to the current measurement
-            atsMeasurement?.endMeasurement({
+            atsMeasurement?.end({
                 success: true,
             });
             const refreshTokenRequest = {
@@ -6110,13 +6172,13 @@
             };
             return this.executePostToTokenEndpoint(endpoint, requestBody, headers, thumbprint)
                 .then((result) => {
-                acquireTokenMeasurement?.endMeasurement({
+                acquireTokenMeasurement?.end({
                     success: true,
                 });
                 return result;
             })
                 .catch((error) => {
-                acquireTokenMeasurement?.endMeasurement({
+                acquireTokenMeasurement?.end({
                     success: false,
                 });
                 throw error;
@@ -6132,13 +6194,13 @@
             const acquireTokenMeasurement = this.performanceClient?.startMeasurement(PerformanceEvents.BaseClientCreateTokenRequestHeaders, correlationId);
             const parameterBuilder = new RequestParameterBuilder();
             parameterBuilder.addClientId(this.config.authOptions.clientId);
-            parameterBuilder.addScopes(request.scopes);
+            parameterBuilder.addScopes(request.scopes, true, this.config.authOptions.authority.options.OIDCOptions?.defaultScopes);
             parameterBuilder.addGrantType(GrantType.REFRESH_TOKEN_GRANT);
             parameterBuilder.addClientInfo();
             parameterBuilder.addLibraryInfo(this.config.libraryInfo);
             parameterBuilder.addApplicationTelemetry(this.config.telemetry.application);
             parameterBuilder.addThrottling();
-            if (this.serverTelemetryManager) {
+            if (this.serverTelemetryManager && !isOidcProtocolMode(this.config)) {
                 parameterBuilder.addServerTelemetry(this.serverTelemetryManager);
             }
             parameterBuilder.addCorrelationId(correlationId);
@@ -6163,7 +6225,7 @@
                     parameterBuilder.addSshJwk(request.sshJwk);
                 }
                 else {
-                    acquireTokenMeasurement?.endMeasurement({
+                    acquireTokenMeasurement?.end({
                         success: false,
                     });
                     throw ClientConfigurationError.createMissingSshJwkError();
@@ -6192,14 +6254,14 @@
                         break;
                 }
             }
-            acquireTokenMeasurement?.endMeasurement({
+            acquireTokenMeasurement?.end({
                 success: true,
             });
             return parameterBuilder.createQueryString();
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6244,6 +6306,12 @@
                 this.logger.info("SilentFlowClient:acquireCachedToken - Skipping cache because forceRefresh is true.");
                 throw ClientAuthError.createRefreshRequiredError();
             }
+            else if (!this.config.cacheOptions.claimsBasedCachingEnabled &&
+                !StringUtils.isEmptyObj(request.claims)) {
+                // Must refresh due to request parameters.
+                this.logger.info("SilentFlowClient:acquireCachedToken - Skipping cache because claims-based caching is disabled and claims were requested.");
+                throw ClientAuthError.createRefreshRequiredError();
+            }
             // We currently do not support silent flow for account === null use cases; This will be revisited for confidential flow usecases
             if (!request.account) {
                 throw ClientAuthError.createNoAccountInSilentRequestError();
@@ -6296,7 +6364,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6308,7 +6376,7 @@
             response.hasOwnProperty("jwks_uri"));
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -7185,21 +7253,16 @@
     };
     const EndpointMetadata = rawMetdataJSON.endpointMetadata;
     const InstanceDiscoveryMetadata = rawMetdataJSON.instanceDiscoveryMetadata;
+    const InstanceDiscoveryMetadataAliases = new Set();
+    for (const key in InstanceDiscoveryMetadata) {
+        for (const metadata of InstanceDiscoveryMetadata[key].metadata) {
+            for (const alias of metadata.aliases) {
+                InstanceDiscoveryMetadataAliases.add(alias);
+            }
+        }
+    }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
-    /*
-     * Copyright (c) Microsoft Corporation. All rights reserved.
-     * Licensed under the MIT License.
-     */
-    /**
-     * Protocol modes supported by MSAL.
-     */
-    const ProtocolMode = {
-        AAD: "AAD",
-        OIDC: "OIDC",
-    };
-
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7279,7 +7342,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -7289,7 +7352,7 @@
             response.hasOwnProperty("metadata"));
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -7299,7 +7362,7 @@
             response.hasOwnProperty("error_description"));
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7410,7 +7473,7 @@
         },
     };
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7583,10 +7646,10 @@
          * @private
          */
         canReplaceTenant(authorityUri) {
-            return authorityUri.PathSegments.length === 1
-                && !Authority.reservedTenantDomains.has(authorityUri.PathSegments[0])
-                && this.getAuthorityType(authorityUri) === AuthorityType.Default
-                && this.protocolMode === ProtocolMode.AAD;
+            return (authorityUri.PathSegments.length === 1 &&
+                !Authority.reservedTenantDomains.has(authorityUri.PathSegments[0]) &&
+                this.getAuthorityType(authorityUri) === AuthorityType.Default &&
+                this.protocolMode === ProtocolMode.AAD);
         }
         /**
          * Replaces tenant in url path with current tenant. Defaults to common.
@@ -7607,8 +7670,9 @@
             const currentAuthorityParts = this.canonicalAuthorityUrlComponents.PathSegments;
             currentAuthorityParts.forEach((currentPart, index) => {
                 let cachedPart = cachedAuthorityParts[index];
-                if (index === 0 && this.canReplaceTenant(cachedAuthorityUrlComponents)) {
-                    const tenantId = (new UrlString(this.metadata.authorization_endpoint)).getUrlComponents().PathSegments[0];
+                if (index === 0 &&
+                    this.canReplaceTenant(cachedAuthorityUrlComponents)) {
+                    const tenantId = new UrlString(this.metadata.authorization_endpoint).getUrlComponents().PathSegments[0];
                     /**
                      * Check if AAD canonical authority contains tenant domain name, for example "testdomain.onmicrosoft.com",
                      * by comparing its first path segment to the corresponding authorization endpoint path segment, which is
@@ -7629,8 +7693,9 @@
          * The default open id configuration endpoint for any canonical authority.
          */
         get defaultOpenIdConfigurationEndpoint() {
+            const canonicalAuthorityHost = this.hostnameAndPort;
             if (this.authorityType === AuthorityType.Adfs ||
-                this.protocolMode === ProtocolMode.OIDC) {
+                !this.isAliasOfKnownMicrosoftAuthority(canonicalAuthorityHost)) {
                 return `${this.canonicalAuthority}.well-known/openid-configuration`;
             }
             return `${this.canonicalAuthority}v2.0/.well-known/openid-configuration`;
@@ -7673,41 +7738,65 @@
          */
         async updateEndpointMetadata(metadataEntity) {
             this.performanceClient?.addQueueMeasurement(PerformanceEvents.AuthorityUpdateEndpointMetadata, this.correlationId);
+            this.logger.verbose("Attempting to get endpoint metadata from authority configuration");
             let metadata = this.getEndpointMetadataFromConfig();
             if (metadata) {
+                this.logger.verbose("Found endpoint metadata in authority configuration");
                 metadataEntity.updateEndpointMetadata(metadata, false);
                 return AuthorityMetadataSource.CONFIG;
             }
+            this.logger.verbose("Did not find endpoint metadata in the config... Attempting to get endpoint metadata from the hardcoded values.");
+            // skipAuthorityMetadataCache is used to bypass hardcoded authority metadata and force a network metadata cache lookup and network metadata request if no cached response is available.
+            if (this.authorityOptions.skipAuthorityMetadataCache) {
+                this.logger.verbose("Skipping hardcoded metadata cache since skipAuthorityMetadataCache is set to true. Attempting to get endpoint metadata from the network metadata cache.");
+            }
+            else {
+                let hardcodedMetadata = this.getEndpointMetadataFromHardcodedValues();
+                if (hardcodedMetadata) {
+                    this.logger.verbose("Found endpoint metadata from hardcoded values.");
+                    // If the user prefers to use an azure region replace the global endpoints with regional information.
+                    if (this.authorityOptions.azureRegionConfiguration?.azureRegion) {
+                        this.performanceClient?.setPreQueueTime(PerformanceEvents.AuthorityUpdateMetadataWithRegionalInformation, this.correlationId);
+                        this.logger.verbose("Found azure region configuration. Updating endpoints with regional information.");
+                        hardcodedMetadata =
+                            await this.updateMetadataWithRegionalInformation(hardcodedMetadata);
+                    }
+                    metadataEntity.updateEndpointMetadata(hardcodedMetadata, false);
+                    return AuthorityMetadataSource.HARDCODED_VALUES;
+                }
+                else {
+                    this.logger.verbose("Did not find endpoint metadata in hardcoded values... Attempting to get endpoint metadata from the network metadata cache.");
+                }
+            }
+            // Check cached metadata entity expiration status
+            const metadataEntityExpired = metadataEntity.isExpired();
             if (this.isAuthoritySameType(metadataEntity) &&
                 metadataEntity.endpointsFromNetwork &&
-                !metadataEntity.isExpired()) {
+                !metadataEntityExpired) {
                 // No need to update
+                this.logger.verbose("Found endpoint metadata in the cache.");
                 return AuthorityMetadataSource.CACHE;
             }
+            else if (metadataEntityExpired) {
+                this.logger.verbose("The metadata entity is expired.");
+            }
+            this.logger.verbose("Did not find cached endpoint metadata... Attempting to get endpoint metadata from the network.");
             this.performanceClient?.setPreQueueTime(PerformanceEvents.AuthorityGetEndpointMetadataFromNetwork, this.correlationId);
             metadata = await this.getEndpointMetadataFromNetwork();
             if (metadata) {
+                this.logger.verbose("Endpoint metadata was successfully returned from getEndpointMetadataFromNetwork()");
                 // If the user prefers to use an azure region replace the global endpoints with regional information.
                 if (this.authorityOptions.azureRegionConfiguration?.azureRegion) {
                     this.performanceClient?.setPreQueueTime(PerformanceEvents.AuthorityUpdateMetadataWithRegionalInformation, this.correlationId);
+                    this.logger.verbose("Found azure region configuration. Updating endpoints with regional information.");
                     metadata = await this.updateMetadataWithRegionalInformation(metadata);
                 }
                 metadataEntity.updateEndpointMetadata(metadata, true);
                 return AuthorityMetadataSource.NETWORK;
             }
-            let harcodedMetadata = this.getEndpointMetadataFromHardcodedValues();
-            if (harcodedMetadata &&
-                !this.authorityOptions.skipAuthorityMetadataCache) {
-                // If the user prefers to use an azure region replace the global endpoints with regional information.
-                if (this.authorityOptions.azureRegionConfiguration?.azureRegion) {
-                    this.performanceClient?.setPreQueueTime(PerformanceEvents.AuthorityUpdateMetadataWithRegionalInformation, this.correlationId);
-                    harcodedMetadata =
-                        await this.updateMetadataWithRegionalInformation(harcodedMetadata);
-                }
-                metadataEntity.updateEndpointMetadata(harcodedMetadata, false);
-                return AuthorityMetadataSource.HARDCODED_VALUES;
-            }
             else {
+                // Metadata could not be obtained from the config, cache, network or hardcoded values
+                this.logger.error("Did not find endpoint metadata from network... Metadata could not be obtained from config, cache, network or hardcoded values. Throwing Untrusted Authority Error.");
                 throw ClientAuthError.createUnableToGetOpenidConfigError(this.defaultOpenIdConfigurationEndpoint);
             }
         }
@@ -7756,17 +7845,23 @@
                 const response = await this.networkInterface.sendGetRequestAsync(openIdConfigurationEndpoint, options);
                 const isValidResponse = isOpenIdConfigResponse(response.body);
                 if (isValidResponse) {
-                    perfEvent?.endMeasurement({ success: true });
+                    perfEvent?.end({ success: true });
                     return response.body;
                 }
                 else {
-                    perfEvent?.endMeasurement({ success: false, errorCode: "invalid_response" });
+                    perfEvent?.end({
+                        success: false,
+                        errorCode: "invalid_response",
+                    });
                     this.logger.verbose(`Authority.getEndpointMetadataFromNetwork: could not parse response as OpenID configuration`);
                     return null;
                 }
             }
             catch (e) {
-                perfEvent?.endMeasurement({ success: false, errorCode: "request_failure" });
+                perfEvent?.end({
+                    success: false,
+                    errorCode: "request_failure",
+                });
                 this.logger.verbose(`Authority.getEndpointMetadataFromNetwork: ${e}`);
                 return null;
             }
@@ -7782,37 +7877,32 @@
         }
         /**
          * Update the retrieved metadata with regional information.
+         * User selected Azure region will be used if configured.
          */
         async updateMetadataWithRegionalInformation(metadata) {
             this.performanceClient?.addQueueMeasurement(PerformanceEvents.AuthorityUpdateMetadataWithRegionalInformation, this.correlationId);
-            this.performanceClient?.setPreQueueTime(PerformanceEvents.RegionDiscoveryDetectRegion, this.correlationId);
-            const autodetectedRegionName = await this.regionDiscovery.detectRegion(this.authorityOptions.azureRegionConfiguration?.environmentRegion, this.regionDiscoveryMetadata);
-            const azureRegion = this.authorityOptions.azureRegionConfiguration?.azureRegion ===
-                Constants.AZURE_REGION_AUTO_DISCOVER_FLAG
-                ? autodetectedRegionName
-                : this.authorityOptions.azureRegionConfiguration?.azureRegion;
-            if (this.authorityOptions.azureRegionConfiguration?.azureRegion ===
-                Constants.AZURE_REGION_AUTO_DISCOVER_FLAG) {
-                this.regionDiscoveryMetadata.region_outcome = autodetectedRegionName
-                    ? RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_SUCCESSFUL
-                    : RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_FAILED;
-            }
-            else {
-                if (autodetectedRegionName) {
+            const userConfiguredAzureRegion = this.authorityOptions.azureRegionConfiguration?.azureRegion;
+            if (userConfiguredAzureRegion) {
+                if (userConfiguredAzureRegion !==
+                    Constants.AZURE_REGION_AUTO_DISCOVER_FLAG) {
                     this.regionDiscoveryMetadata.region_outcome =
-                        this.authorityOptions.azureRegionConfiguration
-                            ?.azureRegion === autodetectedRegionName
-                            ? RegionDiscoveryOutcomes.CONFIGURED_MATCHES_DETECTED
-                            : RegionDiscoveryOutcomes.CONFIGURED_NOT_DETECTED;
+                        RegionDiscoveryOutcomes.CONFIGURED_NO_AUTO_DETECTION;
+                    this.regionDiscoveryMetadata.region_used =
+                        userConfiguredAzureRegion;
+                    return Authority.replaceWithRegionalInformation(metadata, userConfiguredAzureRegion);
                 }
-                else {
+                this.performanceClient?.setPreQueueTime(PerformanceEvents.RegionDiscoveryDetectRegion, this.correlationId);
+                const autodetectedRegionName = await this.regionDiscovery.detectRegion(this.authorityOptions.azureRegionConfiguration
+                    ?.environmentRegion, this.regionDiscoveryMetadata);
+                if (autodetectedRegionName) {
                     this.regionDiscoveryMetadata.region_outcome =
-                        RegionDiscoveryOutcomes.CONFIGURED_NO_AUTO_DETECTION;
+                        RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_SUCCESSFUL;
+                    this.regionDiscoveryMetadata.region_used =
+                        autodetectedRegionName;
+                    return Authority.replaceWithRegionalInformation(metadata, autodetectedRegionName);
                 }
-            }
-            if (azureRegion) {
-                this.regionDiscoveryMetadata.region_used = azureRegion;
-                return Authority.replaceWithRegionalInformation(metadata, azureRegion);
+                this.regionDiscoveryMetadata.region_outcome =
+                    RegionDiscoveryOutcomes.AUTO_DETECTION_REQUESTED_FAILED;
             }
             return metadata;
         }
@@ -7824,7 +7914,7 @@
          */
         async updateCloudDiscoveryMetadata(metadataEntity) {
             this.performanceClient?.addQueueMeasurement(PerformanceEvents.AuthorityUpdateCloudDiscoveryMetadata, this.correlationId);
-            this.logger.verbose("Attempting to get cloud discovery metadata in the config");
+            this.logger.verbose("Attempting to get cloud discovery metadata  from authority configuration");
             this.logger.verbosePii(`Known Authorities: ${this.authorityOptions.knownAuthorities ||
             Constants.NOT_APPLICABLE}`);
             this.logger.verbosePii(`Authority Metadata: ${this.authorityOptions.authorityMetadata ||
@@ -7832,17 +7922,29 @@
             this.logger.verbosePii(`Canonical Authority: ${metadataEntity.canonical_authority || Constants.NOT_APPLICABLE}`);
             let metadata = this.getCloudDiscoveryMetadataFromConfig();
             if (metadata) {
-                this.logger.verbose("Found cloud discovery metadata in the config.");
+                this.logger.verbose("Found cloud discovery metadata in authority configuration");
                 metadataEntity.updateCloudDiscoveryMetadata(metadata, false);
                 return AuthorityMetadataSource.CONFIG;
             }
-            // If the cached metadata came from config but that config was not passed to this instance, we must go to the network
-            this.logger.verbose("Did not find cloud discovery metadata in the config... Attempting to get cloud discovery metadata from the cache.");
+            // If the cached metadata came from config but that config was not passed to this instance, we must go to hardcoded values
+            this.logger.verbose("Did not find cloud discovery metadata in the config... Attempting to get cloud discovery metadata from the hardcoded values.");
+            if (this.options.skipAuthorityMetadataCache) {
+                this.logger.verbose("Skipping hardcoded cloud discovery metadata cache since skipAuthorityMetadataCache is set to true. Attempting to get cloud discovery metadata from the network metadata cache.");
+            }
+            else {
+                const hardcodedMetadata = this.getCloudDiscoveryMetadataFromHardcodedValues();
+                if (hardcodedMetadata) {
+                    this.logger.verbose("Found cloud discovery metadata from hardcoded values.");
+                    metadataEntity.updateCloudDiscoveryMetadata(hardcodedMetadata, false);
+                    return AuthorityMetadataSource.HARDCODED_VALUES;
+                }
+                this.logger.verbose("Did not find cloud discovery metadata in hardcoded values... Attempting to get cloud discovery metadata from the network metadata cache.");
+            }
             const metadataEntityExpired = metadataEntity.isExpired();
             if (this.isAuthoritySameType(metadataEntity) &&
                 metadataEntity.aliasesFromNetwork &&
                 !metadataEntityExpired) {
-                this.logger.verbose("Found metadata in the cache.");
+                this.logger.verbose("Found cloud discovery metadata in the cache.");
                 // No need to update
                 return AuthorityMetadataSource.CACHE;
             }
@@ -7857,15 +7959,8 @@
                 metadataEntity.updateCloudDiscoveryMetadata(metadata, true);
                 return AuthorityMetadataSource.NETWORK;
             }
-            this.logger.verbose("Did not find cloud discovery metadata from the network... Attempting to get cloud discovery metadata from hardcoded values.");
-            const harcodedMetadata = this.getCloudDiscoveryMetadataFromHarcodedValues();
-            if (harcodedMetadata && !this.options.skipAuthorityMetadataCache) {
-                this.logger.verbose("Found cloud discovery metadata from hardcoded values.");
-                metadataEntity.updateCloudDiscoveryMetadata(harcodedMetadata, false);
-                return AuthorityMetadataSource.HARDCODED_VALUES;
-            }
             // Metadata could not be obtained from the config, cache, network or hardcoded values
-            this.logger.error("Did not find cloud discovery metadata from hardcoded values... Metadata could not be obtained from config, cache, network or hardcoded values. Throwing Untrusted Authority Error.");
+            this.logger.error("Did not find cloud discovery metadata from network... Metadata could not be obtained from config, cache, network or hardcoded values. Throwing Untrusted Authority Error.");
             throw ClientConfigurationError.createUntrustedAuthorityError();
         }
         /**
@@ -7970,9 +8065,11 @@
         /**
          * Get cloud discovery metadata for common authorities
          */
-        getCloudDiscoveryMetadataFromHarcodedValues() {
+        getCloudDiscoveryMetadataFromHardcodedValues() {
             if (this.canonicalAuthority in InstanceDiscoveryMetadata) {
-                return InstanceDiscoveryMetadata[this.canonicalAuthority];
+                const hardcodedMetadataResponse = InstanceDiscoveryMetadata[this.canonicalAuthority];
+                const metadata = Authority.getCloudDiscoveryMetadataFromNetworkResponse(hardcodedMetadataResponse.metadata, this.hostnameAndPort);
+                return metadata;
             }
             return null;
         }
@@ -8047,6 +8144,13 @@
         isAlias(host) {
             return this.metadata.aliases.indexOf(host) > -1;
         }
+        /**
+         * Returns whether or not the provided host is an alias of a known Microsoft authority for purposes of endpoint discovery
+         * @param host
+         */
+        isAliasOfKnownMicrosoftAuthority(host) {
+            return InstanceDiscoveryMetadataAliases.has(host);
+        }
         /**
          * Checks whether the provided host is that of a public cloud authority
          *
@@ -8088,15 +8192,17 @@
          * @param azureRegion string
          */
         static replaceWithRegionalInformation(metadata, azureRegion) {
-            metadata.authorization_endpoint =
-                Authority.buildRegionalAuthorityString(metadata.authorization_endpoint, azureRegion);
+            const regionalMetadata = { ...metadata };
+            regionalMetadata.authorization_endpoint =
+                Authority.buildRegionalAuthorityString(regionalMetadata.authorization_endpoint, azureRegion);
             // TODO: Enquire on whether we should leave the query string or remove it before releasing the feature
-            metadata.token_endpoint = Authority.buildRegionalAuthorityString(metadata.token_endpoint, azureRegion, Constants.REGIONAL_AUTH_NON_MSI_QUERY_STRING);
-            if (metadata.end_session_endpoint) {
-                metadata.end_session_endpoint =
-                    Authority.buildRegionalAuthorityString(metadata.end_session_endpoint, azureRegion);
+            regionalMetadata.token_endpoint =
+                Authority.buildRegionalAuthorityString(regionalMetadata.token_endpoint, azureRegion, Constants.REGIONAL_AUTH_NON_MSI_QUERY_STRING);
+            if (regionalMetadata.end_session_endpoint) {
+                regionalMetadata.end_session_endpoint =
+                    Authority.buildRegionalAuthorityString(regionalMetadata.end_session_endpoint, azureRegion);
             }
-            return metadata;
+            return regionalMetadata;
         }
         /**
          * Transform CIAM_AUTHORIY as per the below rules:
@@ -8108,11 +8214,14 @@
          * @param authority
          */
         static transformCIAMAuthority(authority) {
-            let ciamAuthority = authority.endsWith(Constants.FORWARD_SLASH) ? authority : `${authority}${Constants.FORWARD_SLASH}`;
+            let ciamAuthority = authority.endsWith(Constants.FORWARD_SLASH)
+                ? authority
+                : `${authority}${Constants.FORWARD_SLASH}`;
             const authorityUrl = new UrlString(authority);
             const authorityUrlComponents = authorityUrl.getUrlComponents();
             // check if transformation is needed
-            if (authorityUrlComponents.PathSegments.length === 0 && (authorityUrlComponents.HostNameAndPort.endsWith(Constants.CIAM_AUTH_URL))) {
+            if (authorityUrlComponents.PathSegments.length === 0 &&
+                authorityUrlComponents.HostNameAndPort.endsWith(Constants.CIAM_AUTH_URL)) {
                 const tenantIdOrDomain = authorityUrlComponents.HostNameAndPort.split(".")[0];
                 ciamAuthority = `${ciamAuthority}${tenantIdOrDomain}${Constants.AAD_TENANT_DOMAIN_SUFFIX}`;
             }
@@ -8120,15 +8229,15 @@
         }
     }
     // Reserved tenant domain names that will not be replaced with tenant id
-    Authority.reservedTenantDomains = (new Set([
+    Authority.reservedTenantDomains = new Set([
         "{tenant}",
         "{tenantid}",
         AADAuthorityConstants.COMMON,
         AADAuthorityConstants.CONSUMERS,
-        AADAuthorityConstants.ORGANIZATIONS
-    ]));
+        AADAuthorityConstants.ORGANIZATIONS,
+    ]);
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8178,7 +8287,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8208,7 +8317,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8234,7 +8343,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8251,7 +8360,7 @@
         },
     };
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8293,7 +8402,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8332,7 +8441,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8390,7 +8499,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8589,7 +8698,7 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8606,8 +8715,10 @@
          * @param {Logger} logger Logger used by the application
          * @param {string} libraryName Name of the library
          * @param {string} libraryVersion Version of the library
+         * @param {ApplicationTelemetry} applicationTelemetry application name and version
+         * @param {Set<String>} intFields integer fields to be truncated
          */
-        constructor(clientId, authority, logger, libraryName, libraryVersion, applicationTelemetry) {
+        constructor(clientId, authority, logger, libraryName, libraryVersion, applicationTelemetry, intFields) {
             this.authority = authority;
             this.libraryName = libraryName;
             this.libraryVersion = libraryVersion;
@@ -8618,6 +8729,10 @@
             this.eventsByCorrelationId = new Map();
             this.queueMeasurements = new Map();
             this.preQueueTimeByCorrelationId = new Map();
+            this.intFields = intFields || new Set();
+            for (const item of IntFields) {
+                this.intFields.add(item);
+            }
         }
         /**
          * Starts and returns an platform-specific implementation of IPerformanceMeasurement.
@@ -8632,13 +8747,6 @@
         ) {
             return {};
         }
-        /**
-         * Get integral fields.
-         * Override to change the set.
-         */
-        getIntFields() {
-            return IntFields;
-        }
         /**
          * Gets map of pre-queue times by correlation Id
          *
@@ -8756,7 +8864,7 @@
             this.cacheEventByCorrelationId(inProgressEvent);
             // Return the event and functions the caller can use to properly end/flush the measurement
             return {
-                endMeasurement: (event) => {
+                end: (event) => {
                     return this.endMeasurement({
                         // Initial set of event properties
                         ...inProgressEvent,
@@ -8764,14 +8872,14 @@
                         ...event,
                     }, performanceMeasurement);
                 },
-                discardMeasurement: () => {
+                discard: () => {
                     return this.discardMeasurements(inProgressEvent.correlationId);
                 },
-                addStaticFields: (fields) => {
-                    return this.addStaticFields(fields, inProgressEvent.correlationId);
+                add: (fields) => {
+                    return this.addFields(fields, inProgressEvent.correlationId);
                 },
-                increment: (counters) => {
-                    return this.increment(counters, inProgressEvent.correlationId);
+                increment: (fields) => {
+                    return this.incrementFields(fields, inProgressEvent.correlationId);
                 },
                 measurement: performanceMeasurement,
                 event: inProgressEvent,
@@ -8836,7 +8944,7 @@
                 status: PerformanceEventStatus.Completed,
                 incompleteSubsCount,
             };
-            this.truncateIntegralFields(finalEvent, this.getIntFields());
+            this.truncateIntegralFields(finalEvent);
             this.emitEvents([finalEvent], event.correlationId);
             return finalEvent;
         }
@@ -8845,7 +8953,7 @@
          * @param fields
          * @param correlationId
          */
-        addStaticFields(fields, correlationId) {
+        addFields(fields, correlationId) {
             this.logger.trace("PerformanceClient: Updating static fields");
             const event = this.eventsByCorrelationId.get(correlationId);
             if (event) {
@@ -8860,18 +8968,21 @@
         }
         /**
          * Increment counters to be emitted when the measurements are flushed
-         * @param counters {Counters}
+         * @param fields {string[]}
          * @param correlationId {string} correlation identifier
          */
-        increment(counters, correlationId) {
+        incrementFields(fields, correlationId) {
             this.logger.trace("PerformanceClient: Updating counters");
             const event = this.eventsByCorrelationId.get(correlationId);
             if (event) {
-                for (const counter in counters) {
+                for (const counter in fields) {
                     if (!event.hasOwnProperty(counter)) {
                         event[counter] = 0;
                     }
-                    event[counter] += counters[counter];
+                    else if (isNaN(Number(event[counter]))) {
+                        return;
+                    }
+                    event[counter] += fields[counter];
                 }
             }
             else {
@@ -8989,8 +9100,8 @@
          * @param {PerformanceEvent} event performance event to update.
          * @param {Set<string>} intFields integral fields.
          */
-        truncateIntegralFields(event, intFields) {
-            intFields.forEach((key) => {
+        truncateIntegralFields(event) {
+            this.intFields.forEach((key) => {
                 if (key in event && typeof event[key] === "number") {
                     event[key] = Math.floor(event[key]);
                 }
@@ -8998,16 +9109,22 @@
         }
     }
 
-    /*! @azure/msal-common v14.0.0-beta.0 2023-06-19 */
+    /*! @azure/msal-common v14.0.0 2023-08-08 */
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
      */
     class StubPerformanceMeasurement {
-        startMeasurement() { return; }
-        endMeasurement() { return; }
-        flushMeasurement() { return null; }
+        startMeasurement() {
+            return;
+        }
+        endMeasurement() {
+            return;
+        }
+        flushMeasurement() {
+            return null;
+        }
     }
     class StubPerformanceClient extends PerformanceClient {
         generateId() {
@@ -9019,8 +9136,36 @@
         calculateQueuedTime() {
             return 0;
         }
-        addQueueMeasurement() { return; }
-        setPreQueueTime() { return; }
+        addQueueMeasurement() {
+            return;
+        }
+        setPreQueueTime() {
+            return;
+        }
+        endMeasurement() {
+            return null;
+        }
+        discardMeasurements() {
+            return;
+        }
+        removePerformanceCallback() {
+            return true;
+        }
+        addPerformanceCallback() {
+            return "";
+        }
+        emitEvents() {
+            return;
+        }
+        addFields() {
+            return;
+        }
+        incrementFields() {
+            return;
+        }
+        cacheEventByCorrelationId() {
+            return;
+        }
     }
 
     /*
@@ -9203,9 +9348,9 @@
             code: "native_connection_not_established",
             desc: "Connection to native platform has not been established. Please install a compatible browser extension and run initialize(). For more please visit aka.ms/msaljs/browser-errors.",
         },
-        nativeBrokerCalledBeforeInitialize: {
-            code: "native_broker_called_before_initialize",
-            desc: "You must call and await the initialize function before attempting to call any other MSAL API when native brokering is enabled. For more please visit aka.ms/msaljs/browser-errors.",
+        uninitializedPublicClientApplication: {
+            code: "uninitialized_public_client_application",
+            desc: "You must call and await the initialize function before attempting to call any other MSAL API. For more please visit aka.ms/msaljs/browser-errors.",
         },
         nativePromptNotSupported: {
             code: "native_prompt_not_supported",
@@ -9495,8 +9640,8 @@
         /**
          * Create an error thrown when the initialize function hasn't been called
          */
-        static createNativeBrokerCalledBeforeInitialize() {
-            return new BrowserAuthError(BrowserAuthErrorMessage.nativeBrokerCalledBeforeInitialize.code, BrowserAuthErrorMessage.nativeBrokerCalledBeforeInitialize.desc);
+        static createUninitializedPublicClientApplication() {
+            return new BrowserAuthError(BrowserAuthErrorMessage.uninitializedPublicClientApplication.code, BrowserAuthErrorMessage.uninitializedPublicClientApplication.desc);
         }
         /**
          * Create an error thrown when requesting a token directly from the native platform with an unsupported prompt parameter e.g. select_account, login or create
@@ -11177,6 +11322,23 @@
         setRedirectRequestContext(value) {
             this.setTemporaryCache(TemporaryCacheKeys.REDIRECT_CONTEXT, value, true);
         }
+        /**
+         * Builds credential entities from AuthenticationResult object and saves the resulting credentials to the cache
+         * @param result
+         * @param request
+         */
+        async hydrateCache(result, request) {
+            const idTokenEntity = IdTokenEntity.createIdTokenEntity(result.account?.homeAccountId, result.account?.environment, result.idToken, this.clientId, result.tenantId);
+            let claimsHash;
+            if (request.claims) {
+                claimsHash = await this.cryptoImpl.hashString(request.claims);
+            }
+            const accessTokenEntity = AccessTokenEntity.createAccessTokenEntity(result.account?.homeAccountId, result.account.environment, result.accessToken, this.clientId, result.tenantId, result.scopes.join(" "), result.expiresOn?.getTime() || 0, result.extExpiresOn?.getTime() || 0, this.cryptoImpl, undefined, // refreshOn
+            result.tokenType, undefined, // userAssertionHash
+            request.sshKid, request.claims, claimsHash);
+            const cacheRecord = new CacheRecord(undefined, idTokenEntity, accessTokenEntity);
+            return this.saveCacheRecord(cacheRecord);
+        }
     }
     const DEFAULT_BROWSER_CACHE_MANAGER = (clientId, logger) => {
         const cacheOptions = {
@@ -11185,13 +11347,14 @@
             storeAuthStateInCookie: false,
             secureCookies: false,
             cacheMigrationEnabled: false,
+            claimsBasedCachingEnabled: false,
         };
         return new BrowserCacheManager(clientId, cacheOptions, DEFAULT_CRYPTO_IMPLEMENTATION, logger);
     };
 
     /* eslint-disable header/header */
     const name = "@azure/msal-browser";
-    const version = "3.0.0-beta.0";
+    const version = "3.0.0";
 
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -11527,13 +11690,12 @@
             }
         }
         /**
-         * Throws error if native brokering is enabled but initialize hasn't been called
-         * @param allowNativeBroker
+         * Throws error if initialize hasn't been called
          * @param initialized
          */
-        static blockNativeBrokerCalledBeforeInitialized(allowNativeBroker, initialized) {
-            if (allowNativeBroker && !initialized) {
-                throw BrowserAuthError.createNativeBrokerCalledBeforeInitialize();
+        static blockAPICallsBeforeInitialize(initialized) {
+            if (!initialized) {
+                throw BrowserAuthError.createUninitializedPublicClientApplication();
             }
         }
         /**
@@ -11631,8 +11793,11 @@
                 }
                 this.logger.verbose(`Authentication Scheme set to "${validatedRequest.authenticationScheme}" as configured in Auth request`);
             }
-            // Set requested claims hash if claims were requested
-            if (request.claims && !StringUtils.isEmpty(request.claims)) {
+            // Set requested claims hash if claims-based caching is enabled and claims were requested
+            if (this.config.cache.claimsBasedCachingEnabled &&
+                request.claims &&
+                // Checks for empty stringified object "{}" which doesn't qualify as requested claims
+                !StringUtils.isEmptyObj(request.claims)) {
                 validatedRequest.requestedClaimsHash =
                     await this.browserCrypto.hashString(request.claims);
             }
@@ -11689,6 +11854,7 @@
             this.logger.verbose("getDiscoveredAuthority called");
             const authorityOptions = {
                 protocolMode: this.config.auth.protocolMode,
+                OIDCOptions: this.config.auth.OIDCOptions,
                 knownAuthorities: this.config.auth.knownAuthorities,
                 cloudDiscoveryMetadata: this.config.auth.cloudDiscoveryMetadata,
                 authorityMetadata: this.config.auth.authorityMetadata,
@@ -11852,6 +12018,9 @@
                     logLevel: logger.logLevel,
                     correlationId: this.correlationId,
                 },
+                cacheOptions: {
+                    claimsBasedCachingEnabled: this.config.cache.claimsBasedCachingEnabled,
+                },
                 cryptoInterface: this.browserCrypto,
                 networkInterface: this.networkClient,
                 storageInterface: this.browserStorage,
@@ -11895,6 +12064,7 @@
             const getAuthorityMeasurement = this.performanceClient?.startMeasurement(PerformanceEvents.StandardInteractionClientGetDiscoveredAuthority, this.correlationId);
             const authorityOptions = {
                 protocolMode: this.config.auth.protocolMode,
+                OIDCOptions: this.config.auth.OIDCOptions,
                 knownAuthorities: this.config.auth.knownAuthorities,
                 cloudDiscoveryMetadata: this.config.auth.cloudDiscoveryMetadata,
                 authorityMetadata: this.config.auth.authorityMetadata,
@@ -11910,13 +12080,13 @@
             this.performanceClient.setPreQueueTime(PerformanceEvents.AuthorityFactoryCreateDiscoveredInstance, this.correlationId);
             return await AuthorityFactory.createDiscoveredInstance(builtAuthority, this.config.system.networkClient, this.browserStorage, authorityOptions, this.logger, this.performanceClient, this.correlationId)
                 .then((result) => {
-                getAuthorityMeasurement.endMeasurement({
+                getAuthorityMeasurement.end({
                     success: true,
                 });
                 return result;
             })
                 .catch((error) => {
-                getAuthorityMeasurement.endMeasurement({
+                getAuthorityMeasurement.end({
                     errorCode: error.errorCode,
                     subErrorCode: error.subError,
                     success: false,
@@ -11943,7 +12113,8 @@
                 redirectUri: redirectUri,
                 state: state,
                 nonce: request.nonce || this.browserCrypto.createNewGuid(),
-                responseMode: ResponseMode.FRAGMENT,
+                responseMode: this.config.auth.OIDCOptions
+                    .serverResponseType,
             };
             const account = request.account || this.browserStorage.getActiveAccount();
             if (account) {
@@ -12055,7 +12226,7 @@
             }
             // Acquire token with retrieved code.
             this.performanceClient.setPreQueueTime(PerformanceEvents.AuthClientAcquireToken, this.authCodeRequest.correlationId);
-            const tokenResponse = await this.authModule.acquireToken(this.authCodeRequest, authCodeResponse);
+            const tokenResponse = (await this.authModule.acquireToken(this.authCodeRequest, authCodeResponse));
             this.browserStorage.cleanRequestByState(state);
             return tokenResponse;
         }
@@ -12203,7 +12374,7 @@
                 }
             }
             // Acquire token with retrieved code.
-            const tokenResponse = await this.authModule.acquireToken(this.authCodeRequest, authCodeResponse);
+            const tokenResponse = (await this.authModule.acquireToken(this.authCodeRequest, authCodeResponse));
             this.browserStorage.cleanRequestByState(state);
             return tokenResponse;
         }
@@ -12238,7 +12409,7 @@
         LOGOUT_SUCCESS: "msal:logoutSuccess",
         LOGOUT_FAILURE: "msal:logoutFailure",
         LOGOUT_END: "msal:logoutEnd",
-        RESTORE_FROM_BFCACHE: "msal:restoreFromBFCache"
+        RESTORE_FROM_BFCACHE: "msal:restoreFromBFCache",
     };
 
     /*
@@ -12351,8 +12522,8 @@
             const silentAuthClient = await this.createSilentFlowClient(serverTelemetryManager, silentRequest.authority, silentRequest.azureCloudOptions);
             this.logger.verbose("Silent auth client created");
             try {
-                const cachedToken = await silentAuthClient.acquireCachedToken(silentRequest);
-                acquireTokenMeasurement.endMeasurement({
+                const cachedToken = (await silentAuthClient.acquireCachedToken(silentRequest));
+                acquireTokenMeasurement.end({
                     success: true,
                     fromCache: true,
                 });
@@ -12364,7 +12535,7 @@
                         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({
+                acquireTokenMeasurement.end({
                     errorCode: (error instanceof AuthError && error.errorCode) ||
                         undefined,
                     subErrorCode: (error instanceof AuthError && error.subError) || undefined,
@@ -12396,7 +12567,7 @@
             this.performanceClient.setPreQueueTime(PerformanceEvents.InitializeBaseRequest, this.correlationId);
             return {
                 ...request,
-                ...await this.initializeBaseRequest(request, account),
+                ...(await this.initializeBaseRequest(request, account)),
                 account: account,
                 forceRefresh: request.forceRefresh || false,
             };
@@ -12430,7 +12601,7 @@
             // check if the tokens can be retrieved from internal cache
             try {
                 const result = await this.acquireTokensFromCache(this.accountId, nativeRequest);
-                nativeATMeasurement.endMeasurement({
+                nativeATMeasurement.end({
                     success: true,
                     isNativeBroker: false,
                     fromCache: true,
@@ -12450,7 +12621,7 @@
             const validatedResponse = this.validateNativeResponse(response);
             return this.handleNativeResponse(validatedResponse, nativeRequest, reqTimestamp)
                 .then((result) => {
-                nativeATMeasurement.endMeasurement({
+                nativeATMeasurement.end({
                     success: true,
                     isNativeBroker: true,
                     requestId: result.requestId,
@@ -12458,7 +12629,7 @@
                 return result;
             })
                 .catch((error) => {
-                nativeATMeasurement.endMeasurement({
+                nativeATMeasurement.end({
                     success: false,
                     errorCode: error.errorCode,
                     subErrorCode: error.subError,
@@ -12504,7 +12675,10 @@
             try {
                 const silentRequest = this.createSilentCacheRequest(request, account);
                 const result = await this.silentCacheClient.acquireToken(silentRequest);
-                return result;
+                return {
+                    ...result,
+                    account,
+                };
             }
             catch (e) {
                 throw e;
@@ -12602,16 +12776,20 @@
             }
             // Get the preferred_cache domain for the given authority
             const authority = await this.getDiscoveredAuthority(request.authority);
-            const authorityPreferredCache = authority.getPreferredCache();
             // generate identifiers
             const idTokenObj = this.createIdTokenObj(response);
             const homeAccountIdentifier = this.createHomeAccountIdentifier(response, idTokenObj);
-            const accountEntity = this.createAccountEntity(response, homeAccountIdentifier, idTokenObj, authorityPreferredCache);
+            const accountEntity = AccountEntity.createAccount({
+                homeAccountId: homeAccountIdentifier,
+                idTokenClaims: idTokenObj.claims,
+                clientInfo: response.client_info,
+                nativeAccountId: response.account.id,
+            }, authority);
             // generate authenticationResult
             const result = await this.generateAuthenticationResult(response, request, idTokenObj, accountEntity, authority.canonicalAuthority, reqTimestamp);
             // cache accounts and tokens in the appropriate storage
             this.cacheAccount(accountEntity);
-            this.cacheNativeTokens(response, request, homeAccountIdentifier, accountEntity, idTokenObj, result.accessToken, result.tenantId, reqTimestamp);
+            this.cacheNativeTokens(response, request, homeAccountIdentifier, idTokenObj, result.accessToken, result.tenantId, reqTimestamp);
             return result;
         }
         /**
@@ -12630,20 +12808,9 @@
          */
         createHomeAccountIdentifier(response, idTokenObj) {
             // Save account in browser storage
-            const homeAccountIdentifier = AccountEntity.generateHomeAccountId(response.client_info || Constants.EMPTY_STRING, AuthorityType.Default, this.logger, this.browserCrypto, idTokenObj);
+            const homeAccountIdentifier = AccountEntity.generateHomeAccountId(response.client_info || Constants.EMPTY_STRING, AuthorityType.Default, this.logger, this.browserCrypto, idTokenObj.claims);
             return homeAccountIdentifier;
         }
-        /**
-         * Creates account entity
-         * @param response
-         * @param homeAccountIdentifier
-         * @param idTokenObj
-         * @param authority
-         * @returns
-         */
-        createAccountEntity(response, homeAccountIdentifier, idTokenObj, authority) {
-            return AccountEntity.createAccount(response.client_info, homeAccountIdentifier, idTokenObj, undefined, undefined, undefined, authority, response.account.id);
-        }
         /**
          * Helper to generate scopes
          * @param response
@@ -12762,7 +12929,7 @@
          * @param tenantId
          * @param reqTimestamp
          */
-        cacheNativeTokens(response, request, homeAccountIdentifier, accountEntity, idTokenObj, responseAccessToken, tenantId, reqTimestamp) {
+        cacheNativeTokens(response, request, homeAccountIdentifier, idTokenObj, responseAccessToken, tenantId, reqTimestamp) {
             const cachedIdToken = IdTokenEntity.createIdTokenEntity(homeAccountIdentifier, request.authority, response.id_token || Constants.EMPTY_STRING, request.clientId, idTokenObj.claims.tid || Constants.EMPTY_STRING);
             // cache accessToken in inmemory storage
             const expiresIn = request.tokenType === AuthenticationScheme.POP
@@ -12775,15 +12942,15 @@
             const cachedAccessToken = AccessTokenEntity.createAccessTokenEntity(homeAccountIdentifier, request.authority, responseAccessToken, request.clientId, idTokenObj
                 ? idTokenObj.claims.tid || Constants.EMPTY_STRING
                 : tenantId, responseScopes.printScopes(), tokenExpirationSeconds, 0, this.browserCrypto);
-            const nativeCacheRecord = new CacheRecord(accountEntity, cachedIdToken, cachedAccessToken);
-            this.nativeStorageManager.saveCacheRecord(nativeCacheRecord);
+            const nativeCacheRecord = new CacheRecord(undefined, cachedIdToken, cachedAccessToken);
+            this.nativeStorageManager.saveCacheRecord(nativeCacheRecord, request.storeInCache);
         }
         addTelemetryFromNativeResponse(response) {
             const mats = this.getMATSFromResponse(response);
             if (!mats) {
                 return null;
             }
-            this.performanceClient.addStaticFields({
+            this.performanceClient.addFields({
                 extensionId: this.nativeMessageHandler.getExtensionId(),
                 extensionVersion: this.nativeMessageHandler.getExtensionVersion(),
                 matsBrokerVersion: mats.broker_version,
@@ -12996,7 +13163,7 @@
                     method: NativeExtensionMethod.HandshakeRequest,
                 },
             };
-            this.handshakeEvent.addStaticFields({
+            this.handshakeEvent.add({
                 extensionId: this.extensionId,
                 extensionHandshakeTimeoutMs: this.handshakeTimeoutMs,
             });
@@ -13014,7 +13181,7 @@
                     window.removeEventListener("message", this.windowListener, false);
                     this.messageChannel.port1.close();
                     this.messageChannel.port2.close();
-                    this.handshakeEvent.endMeasurement({
+                    this.handshakeEvent.end({
                         extensionHandshakeTimedOut: true,
                         success: false,
                     });
@@ -13059,7 +13226,7 @@
                 this.messageChannel.port1.close();
                 this.messageChannel.port2.close();
                 window.removeEventListener("message", this.windowListener, false);
-                this.handshakeEvent.endMeasurement({
+                this.handshakeEvent.end({
                     success: false,
                     extensionInstalled: false,
                 });
@@ -13111,7 +13278,7 @@
                     this.extensionId = request.extensionId;
                     this.extensionVersion = request.body.version;
                     this.logger.verbose(`NativeMessageHandler - Received HandshakeResponse from extension: ${this.extensionId}`);
-                    this.handshakeEvent.endMeasurement({
+                    this.handshakeEvent.end({
                         extensionInstalled: true,
                         success: true,
                     });
@@ -13420,6 +13587,18 @@
                 this.performanceClient.setPreQueueTime(PerformanceEvents.StandardInteractionClientCreateAuthCodeClient, validLogoutRequest.correlationId);
                 const authClient = await this.createAuthCodeClient(serverTelemetryManager, logoutRequest && logoutRequest.authority);
                 this.logger.verbose("Auth code client created");
+                if (authClient.authority.protocolMode === ProtocolMode.OIDC) {
+                    try {
+                        authClient.authority.endSessionEndpoint;
+                    }
+                    catch {
+                        if (validLogoutRequest.account?.homeAccountId) {
+                            this.browserStorage.removeAccount(validLogoutRequest.account?.homeAccountId);
+                            this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, exports.InteractionType.Redirect, validLogoutRequest);
+                            return;
+                        }
+                    }
+                }
                 // Create logout string and navigate user window to logout.
                 const logoutUri = authClient.getLogoutUri(validLogoutRequest);
                 this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, exports.InteractionType.Redirect, validLogoutRequest);
@@ -13594,7 +13773,7 @@
                     this.logger.verbose("Account id found in hash, calling WAM for token");
                     // end measurement for server call with native brokering enabled
                     if (fetchNativeAccountIdMeasurement) {
-                        fetchNativeAccountIdMeasurement.endMeasurement({
+                        fetchNativeAccountIdMeasurement.end({
                             success: true,
                             isNativeBroker: true,
                         });
@@ -13651,6 +13830,30 @@
                 this.performanceClient.setPreQueueTime(PerformanceEvents.StandardInteractionClientCreateAuthCodeClient, validRequest.correlationId);
                 const authClient = await this.createAuthCodeClient(serverTelemetryManager, requestAuthority);
                 this.logger.verbose("Auth code client created");
+                try {
+                    authClient.authority.endSessionEndpoint;
+                }
+                catch {
+                    if (validRequest.account?.homeAccountId &&
+                        validRequest.postLogoutRedirectUri &&
+                        authClient.authority.protocolMode === ProtocolMode.OIDC) {
+                        this.browserStorage.removeAccount(validRequest.account?.homeAccountId);
+                        this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, exports.InteractionType.Popup, validRequest);
+                        if (mainWindowRedirectUri) {
+                            const navigationOptions = {
+                                apiId: ApiId.logoutPopup,
+                                timeout: this.config.system.redirectNavigationTimeout,
+                                noHistory: false,
+                            };
+                            const absoluteUrl = UrlString.getAbsoluteUrl(mainWindowRedirectUri, BrowserUtils.getCurrentUri());
+                            await this.navigationClient.navigateInternal(absoluteUrl, navigationOptions);
+                        }
+                        if (popup) {
+                            popup.close();
+                        }
+                        return;
+                    }
+                }
                 // Create logout string and navigate user window to logout.
                 const logoutUri = authClient.getLogoutUri(validRequest);
                 this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, exports.InteractionType.Popup, validRequest);
@@ -13735,7 +13938,7 @@
                         return;
                     }
                     let href = Constants.EMPTY_STRING;
-                    let hash = Constants.EMPTY_STRING;
+                    let serverResponseString = Constants.EMPTY_STRING;
                     try {
                         /*
                          * Will throw if cross origin,
@@ -13743,7 +13946,8 @@
                          * since we need the interval to keep running while on STS UI.
                          */
                         href = popupWindow.location.href;
-                        hash = popupWindow.location.hash;
+                        serverResponseString =
+                            this.extractServerResponseStringFromPopup(popupWindow, href);
                     }
                     catch (e) { }
                     // Don't process blank pages or cross domain
@@ -13756,17 +13960,17 @@
                      * as popup operations can take a long time.
                      */
                     ticks++;
-                    if (hash) {
+                    if (serverResponseString) {
                         this.logger.verbose("PopupHandler.monitorPopupForHash - found hash in url");
                         clearInterval(intervalId);
                         this.cleanPopup(popupWindow);
-                        if (UrlString.hashContainsKnownProperties(hash)) {
+                        if (UrlString.hashContainsKnownProperties(serverResponseString)) {
                             this.logger.verbose("PopupHandler.monitorPopupForHash - hash contains known properties, returning.");
-                            resolve(hash);
+                            resolve(serverResponseString);
                         }
                         else {
                             this.logger.error("PopupHandler.monitorPopupForHash - found hash in url but it does not contain known properties. Check that your router is not changing the hash prematurely.");
-                            this.logger.errorPii(`PopupHandler.monitorPopupForHash - hash found: ${hash}`);
+                            this.logger.errorPii(`PopupHandler.monitorPopupForHash - hash found: ${serverResponseString}`);
                             reject(BrowserAuthError.createHashDoesNotContainKnownPropertiesError());
                         }
                     }
@@ -13947,6 +14151,20 @@
             const homeAccountId = request.account && request.account.homeAccountId;
             return `${BrowserConstants.POPUP_NAME_PREFIX}.${this.config.auth.clientId}.${homeAccountId}.${this.correlationId}`;
         }
+        /**
+         * Extracts the server response from the popup window
+         */
+        extractServerResponseStringFromPopup(popupWindow, href) {
+            let serverResponseString;
+            if (this.config.auth.OIDCOptions?.serverResponseType ===
+                ServerResponseType.QUERY) {
+                serverResponseString = UrlString.parseQueryServerResponse(href);
+            }
+            else {
+                serverResponseString = popupWindow.location.hash;
+            }
+            return serverResponseString;
+        }
     }
 
     /*
@@ -14021,6 +14239,14 @@
             navigateToLoginRequestUrl: true,
             clientCapabilities: [],
             protocolMode: ProtocolMode.AAD,
+            OIDCOptions: {
+                serverResponseType: ServerResponseType.FRAGMENT,
+                defaultScopes: [
+                    Constants.OPENID_SCOPE,
+                    Constants.PROFILE_SCOPE,
+                    Constants.OFFLINE_ACCESS_SCOPE,
+                ],
+            },
             azureCloudOptions: {
                 azureCloudInstance: AzureCloudInstance.None,
                 tenant: Constants.EMPTY_STRING,
@@ -14038,6 +14264,7 @@
                 userInputCache.cacheLocation === BrowserCacheLocation.LocalStorage
                 ? true
                 : false,
+            claimsBasedCachingEnabled: false,
         };
         // Default logger options for browser
         const DEFAULT_LOGGER_OPTIONS = {
@@ -14064,10 +14291,10 @@
             redirectNavigationTimeout: DEFAULT_REDIRECT_TIMEOUT_MS,
             asyncPopups: false,
             allowRedirectInIframe: false,
-            allowNativeBroker: true,
+            allowNativeBroker: false,
             nativeBrokerHandshakeTimeout: userInputSystem?.nativeBrokerHandshakeTimeout ||
                 DEFAULT_NATIVE_BROKER_HANDSHAKE_TIMEOUT_MS,
-            pollIntervalMilliseconds: BrowserConstants.DEFAULT_POLL_INTERVAL_MS
+            pollIntervalMilliseconds: BrowserConstants.DEFAULT_POLL_INTERVAL_MS,
         };
         const providedSystemOptions = {
             ...userInputSystem,
@@ -14078,9 +14305,33 @@
                 appName: Constants.EMPTY_STRING,
                 appVersion: Constants.EMPTY_STRING,
             },
+            client: new StubPerformanceClient(DEFAULT_AUTH_OPTIONS.clientId, DEFAULT_AUTH_OPTIONS.authority, new Logger(DEFAULT_LOGGER_OPTIONS, name, version), name, version, {
+                appName: Constants.EMPTY_STRING,
+                appVersion: Constants.EMPTY_STRING,
+            }),
         };
+        // Throw an error if user has set OIDCOptions without being in OIDC protocol mode
+        if (userInputAuth?.protocolMode !== ProtocolMode.OIDC &&
+            userInputAuth?.OIDCOptions) {
+            // Logger has not been created yet
+            // eslint-disable-next-line no-console
+            console.warn(ClientConfigurationError.createCannotSetOIDCOptionsError());
+        }
+        // Throw an error if user has set allowNativeBroker to true without being in AAD protocol mode
+        if (userInputAuth?.protocolMode &&
+            userInputAuth.protocolMode !== ProtocolMode.AAD &&
+            providedSystemOptions?.allowNativeBroker) {
+            throw ClientConfigurationError.createCannotAllowNativeBrokerError();
+        }
         const overlayedConfig = {
-            auth: { ...DEFAULT_AUTH_OPTIONS, ...userInputAuth },
+            auth: {
+                ...DEFAULT_AUTH_OPTIONS,
+                ...userInputAuth,
+                OIDCOptions: {
+                    ...DEFAULT_AUTH_OPTIONS.OIDCOptions,
+                    ...userInputAuth?.OIDCOptions,
+                },
+            },
             cache: { ...DEFAULT_CACHE_OPTIONS, ...userInputCache },
             system: { ...DEFAULT_BROWSER_SYSTEM_OPTIONS, ...providedSystemOptions },
             telemetry: { ...DEFAULT_TELEMETRY_OPTIONS, ...userInputTelemetry },
@@ -14279,7 +14530,7 @@
             if (request.prompt &&
                 request.prompt !== PromptValue.NONE &&
                 request.prompt !== PromptValue.NO_SESSION) {
-                acquireTokenMeasurement.endMeasurement({
+                acquireTokenMeasurement.end({
                     success: false,
                 });
                 throw BrowserAuthError.createSilentPromptValueError(request.prompt);
@@ -14299,7 +14550,7 @@
                 this.logger.verbose("Auth code client created");
                 this.performanceClient.setPreQueueTime(PerformanceEvents.SilentIframeClientTokenHelper, request.correlationId);
                 return await this.silentTokenHelper(authClient, silentRequest).then((result) => {
-                    acquireTokenMeasurement.endMeasurement({
+                    acquireTokenMeasurement.end({
                         success: true,
                         fromCache: false,
                         requestId: result.requestId,
@@ -14313,7 +14564,7 @@
                     serverTelemetryManager.cacheFailedRequest(e);
                 }
                 this.browserStorage.cleanRequestByState(silentRequest.state);
-                acquireTokenMeasurement.endMeasurement({
+                acquireTokenMeasurement.end({
                     errorCode: (e instanceof AuthError && e.errorCode) || undefined,
                     subErrorCode: (e instanceof AuthError && e.subError) || undefined,
                     success: false,
@@ -14393,7 +14644,7 @@
             this.performanceClient.setPreQueueTime(PerformanceEvents.InitializeBaseRequest, request.correlationId);
             const silentRequest = {
                 ...request,
-                ...await this.initializeBaseRequest(request, request.account)
+                ...(await this.initializeBaseRequest(request, request.account)),
             };
             const acquireTokenMeasurement = this.performanceClient.startMeasurement(PerformanceEvents.SilentRefreshClientAcquireToken, silentRequest.correlationId);
             const serverTelemetryManager = this.initializeServerTelemetryManager(ApiId.acquireTokenSilent_silentFlow);
@@ -14403,8 +14654,9 @@
             this.performanceClient.setPreQueueTime(PerformanceEvents.RefreshTokenClientAcquireTokenByRefreshToken, request.correlationId);
             return refreshTokenClient
                 .acquireTokenByRefreshToken(silentRequest)
+                .then((result) => result)
                 .then((result) => {
-                acquireTokenMeasurement.endMeasurement({
+                acquireTokenMeasurement.end({
                     success: true,
                     fromCache: result.fromCache,
                     requestId: result.requestId,
@@ -14414,7 +14666,7 @@
                 .catch((e) => {
                 e.setCorrelationId(this.correlationId);
                 serverTelemetryManager.cacheFailedRequest(e);
-                acquireTokenMeasurement.endMeasurement({
+                acquireTokenMeasurement.end({
                     errorCode: e.errorCode,
                     subErrorCode: e.subError,
                     success: false,
@@ -14760,18 +15012,6 @@
             }
             return aBytes;
         }
-        /**
-         * Converst string to ArrayBuffer
-         * @param dataString
-         */
-        static stringToArrayBuffer(dataString) {
-            const data = new ArrayBuffer(dataString.length);
-            const dataView = new Uint8Array(data);
-            for (let i = 0; i < dataString.length; i++) {
-                dataView[i] = dataString.charCodeAt(i);
-            }
-            return data;
-        }
         /**
          * Converts Uint8Array to a string
          * @param aBytes
@@ -15604,7 +15844,7 @@
                 requestUri: request.resourceRequestUri,
             });
             if (publicKeyThumbMeasurement) {
-                publicKeyThumbMeasurement.endMeasurement({
+                publicKeyThumbMeasurement.end({
                     success: true,
                 });
             }
@@ -15655,12 +15895,12 @@
             // Form token string
             const tokenString = `${encodedShrHeader}.${encodedPayload}`;
             // Sign token
-            const tokenBuffer = BrowserStringUtils.stringToArrayBuffer(tokenString);
+            const tokenBuffer = BrowserStringUtils.stringToUtf8Arr(tokenString);
             const signatureBuffer = await this.browserCrypto.sign(cachedKeyPair.privateKey, tokenBuffer);
             const encodedSignature = this.b64Encode.urlEncodeArr(new Uint8Array(signatureBuffer));
             const signedJwt = `${tokenString}.${encodedSignature}`;
             if (signJwtMeasurement) {
-                signJwtMeasurement.endMeasurement({
+                signJwtMeasurement.end({
                     success: true,
                 });
             }
@@ -15683,231 +15923,17 @@
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
      */
-    class BrowserPerformanceMeasurement {
-        constructor(name, correlationId) {
-            this.correlationId = correlationId;
-            this.measureName = BrowserPerformanceMeasurement.makeMeasureName(name, correlationId);
-            this.startMark = BrowserPerformanceMeasurement.makeStartMark(name, correlationId);
-            this.endMark = BrowserPerformanceMeasurement.makeEndMark(name, correlationId);
-        }
-        static makeMeasureName(name, correlationId) {
-            return `msal.measure.${name}.${correlationId}`;
-        }
-        static makeStartMark(name, correlationId) {
-            return `msal.start.${name}.${correlationId}`;
-        }
-        static makeEndMark(name, correlationId) {
-            return `msal.end.${name}.${correlationId}`;
-        }
-        static supportsBrowserPerformance() {
-            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");
-        }
-        /**
-         * Flush browser marks and measurements.
-         * @param {string} correlationId
-         * @param {SubMeasurement} measurements
-         */
-        static flushMeasurements(correlationId, measurements) {
-            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
-                try {
-                    measurements.forEach((measurement) => {
-                        const measureName = BrowserPerformanceMeasurement.makeMeasureName(measurement.name, correlationId);
-                        const entriesForMeasurement = window.performance.getEntriesByName(measureName, "measure");
-                        if (entriesForMeasurement.length > 0) {
-                            window.performance.clearMeasures(measureName);
-                            window.performance.clearMarks(BrowserPerformanceMeasurement.makeStartMark(measureName, correlationId));
-                            window.performance.clearMarks(BrowserPerformanceMeasurement.makeEndMark(measureName, correlationId));
-                        }
-                    });
-                }
-                catch (e) {
-                    // Silently catch and return null
-                }
-            }
-        }
-        startMeasurement() {
-            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
-                try {
-                    window.performance.mark(this.startMark);
-                }
-                catch (e) {
-                    // Silently catch
-                }
-            }
-        }
-        endMeasurement() {
-            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
-                try {
-                    window.performance.mark(this.endMark);
-                    window.performance.measure(this.measureName, this.startMark, this.endMark);
-                }
-                catch (e) {
-                    // Silently catch
-                }
-            }
-        }
-        flushMeasurement() {
-            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
-                try {
-                    const entriesForMeasurement = window.performance.getEntriesByName(this.measureName, "measure");
-                    if (entriesForMeasurement.length > 0) {
-                        const 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;
-        }
-    }
-
-    /*
-     * Copyright (c) Microsoft Corporation. All rights reserved.
-     * Licensed under the MIT License.
-     */
-    class BrowserPerformanceClient extends PerformanceClient {
-        constructor(clientId, authority, logger, libraryName, libraryVersion, applicationTelemetry) {
-            super(clientId, authority, logger, libraryName, libraryVersion, applicationTelemetry);
-            this.browserCrypto = new BrowserCrypto(this.logger);
-            this.guidGenerator = new GuidGenerator(this.browserCrypto);
-        }
-        startPerformanceMeasurement(measureName, correlationId) {
-            return new BrowserPerformanceMeasurement(measureName, correlationId);
-        }
-        generateId() {
-            return this.guidGenerator.generateGuid();
-        }
-        getPageVisibility() {
-            return document.visibilityState?.toString() || null;
-        }
-        deleteIncompleteSubMeasurements(inProgressEvent) {
-            const rootEvent = this.eventsByCorrelationId.get(inProgressEvent.event.correlationId);
-            const isRootEvent = rootEvent && rootEvent.eventId === inProgressEvent.event.eventId;
-            const incompleteMeasurements = [];
-            if (isRootEvent && rootEvent?.incompleteSubMeasurements) {
-                rootEvent.incompleteSubMeasurements.forEach((subMeasurement) => {
-                    incompleteMeasurements.push({ ...subMeasurement });
-                });
-            }
-            // Clean up remaining marks for incomplete sub-measurements
-            if (incompleteMeasurements.length > 0) {
-                BrowserPerformanceMeasurement.flushMeasurements(inProgressEvent.event.correlationId, incompleteMeasurements);
-            }
-        }
-        supportsBrowserPerformanceNow() {
-            return (typeof window !== "undefined" &&
-                typeof window.performance !== "undefined" &&
-                typeof window.performance.now === "function");
-        }
-        /**
-         * 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)}
-         */
-        startMeasurement(measureName, correlationId) {
-            // Capture page visibilityState and then invoke start/end measurement
-            const startPageVisibility = this.getPageVisibility();
-            const inProgressEvent = super.startMeasurement(measureName, correlationId);
-            return {
-                ...inProgressEvent,
-                endMeasurement: (event) => {
-                    const res = inProgressEvent.endMeasurement({
-                        startPageVisibility,
-                        endPageVisibility: this.getPageVisibility(),
-                        ...event,
-                    });
-                    this.deleteIncompleteSubMeasurements(inProgressEvent);
-                    return res;
-                },
-                discardMeasurement: () => {
-                    inProgressEvent.discardMeasurement();
-                    this.deleteIncompleteSubMeasurements(inProgressEvent);
-                    inProgressEvent.measurement.flushMeasurement();
-                },
-            };
-        }
-        /**
-         * Adds pre-queue time to preQueueTimeByCorrelationId map.
-         * @param {PerformanceEvents} eventName
-         * @param {?string} correlationId
-         * @returns
-         */
-        setPreQueueTime(eventName, correlationId) {
-            if (!this.supportsBrowserPerformanceNow()) {
-                this.logger.trace(`BrowserPerformanceClient: window performance API not available, unable to set telemetry queue time for ${eventName}`);
-                return;
-            }
-            if (!correlationId) {
-                this.logger.trace(`BrowserPerformanceClient: correlationId for ${eventName} not provided, unable to set telemetry queue time`);
-                return;
-            }
-            const preQueueEvent = this.preQueueTimeByCorrelationId.get(correlationId);
-            /**
-             * Manually complete queue measurement if there is an incomplete pre-queue event.
-             * Incomplete pre-queue events are instrumentation bugs that should be fixed.
-             */
-            if (preQueueEvent) {
-                this.logger.trace(`BrowserPerformanceClient: Incomplete pre-queue ${preQueueEvent.name} found`, correlationId);
-                this.addQueueMeasurement(preQueueEvent.name, correlationId, undefined, true);
-            }
-            this.preQueueTimeByCorrelationId.set(correlationId, {
-                name: eventName,
-                time: window.performance.now(),
-            });
-        }
-        /**
-         * Calculates and adds queue time measurement for given performance event.
-         *
-         * @param {PerformanceEvents} eventName
-         * @param {?string} correlationId
-         * @param {?number} queueTime
-         * @param {?boolean} manuallyCompleted - indicator for manually completed queue measurements
-         * @returns
-         */
-        addQueueMeasurement(eventName, correlationId, queueTime, manuallyCompleted) {
-            if (!this.supportsBrowserPerformanceNow()) {
-                this.logger.trace(`BrowserPerformanceClient: window performance API not available, unable to add queue measurement for ${eventName}`);
-                return;
-            }
-            if (!correlationId) {
-                this.logger.trace(`BrowserPerformanceClient: correlationId for ${eventName} not provided, unable to add queue measurement`);
-                return;
-            }
-            const preQueueTime = super.getPreQueueTime(eventName, correlationId);
-            if (!preQueueTime) {
-                return;
-            }
-            const currentTime = window.performance.now();
-            const resQueueTime = queueTime || super.calculateQueuedTime(preQueueTime, currentTime);
-            return super.addQueueMeasurement(eventName, correlationId, resQueueTime, manuallyCompleted);
-        }
-    }
-
-    /*
-     * Copyright (c) Microsoft Corporation. All rights reserved.
-     * Licensed under the MIT License.
+    /**
+     * Warning: This set of exports is purely intended to be used by other MSAL libraries, and should be considered potentially unstable. We strongly discourage using them directly, you do so at your own risk.
+     * Breaking changes to these APIs will be shipped under a minor version, instead of a major version.
      */
+    // Cache Manager
 
     var internals = /*#__PURE__*/Object.freeze({
         __proto__: null,
         BrowserCacheManager: BrowserCacheManager,
         BrowserConstants: BrowserConstants,
-        BrowserPerformanceClient: BrowserPerformanceClient,
-        BrowserPerformanceMeasurement: BrowserPerformanceMeasurement,
+        CacheRecord: CacheRecord,
         CryptoOps: CryptoOps,
         EventHandler: EventHandler,
         NativeAuthError: NativeAuthError,
@@ -16124,8 +16150,9 @@
             const idToken = new AuthToken(response.id_token, this.cryptoObj);
             let cacheRecord;
             let authority;
+            let cacheRecordAccount;
             if (request.account) {
-                const cacheRecordAccount = this.loadAccount(idToken, request.account.environment, undefined, undefined, request.account.homeAccountId);
+                cacheRecordAccount = AccountEntity.createFromAccountInfo(request.account);
                 cacheRecord = new CacheRecord(cacheRecordAccount, this.loadIdToken(idToken, cacheRecordAccount.homeAccountId, request.account.environment, request.account.tenantId), this.loadAccessToken(request, response, cacheRecordAccount.homeAccountId, request.account.environment, request.account.tenantId, options), this.loadRefreshToken(request, response, cacheRecordAccount.homeAccountId, request.account.environment));
             }
             else if (request.authority) {
@@ -16141,12 +16168,12 @@
                 // "clientInfo" from options takes precedence over "clientInfo" in response
                 if (options.clientInfo) {
                     this.logger.trace("TokenCache - homeAccountId from options");
-                    const cacheRecordAccount = this.loadAccount(idToken, authority.hostnameAndPort, options.clientInfo, authority.authorityType);
+                    cacheRecordAccount = this.loadAccount(idToken, authority, options.clientInfo);
                     cacheRecord = new CacheRecord(cacheRecordAccount, this.loadIdToken(idToken, cacheRecordAccount.homeAccountId, authority.hostnameAndPort, authority.tenant), this.loadAccessToken(request, response, cacheRecordAccount.homeAccountId, authority.hostnameAndPort, authority.tenant, options), this.loadRefreshToken(request, response, cacheRecordAccount.homeAccountId, authority.hostnameAndPort));
                 }
                 else if (response.client_info) {
                     this.logger.trace("TokenCache - homeAccountId from response");
-                    const cacheRecordAccount = this.loadAccount(idToken, authority.hostnameAndPort, response.client_info, authority.authorityType);
+                    cacheRecordAccount = this.loadAccount(idToken, authority, response.client_info);
                     cacheRecord = new CacheRecord(cacheRecordAccount, this.loadIdToken(idToken, cacheRecordAccount.homeAccountId, authority.hostnameAndPort, authority.tenant), this.loadAccessToken(request, response, cacheRecordAccount.homeAccountId, authority.hostnameAndPort, authority.tenant, options), this.loadRefreshToken(request, response, cacheRecordAccount.homeAccountId, authority.hostnameAndPort));
                 }
                 else {
@@ -16156,7 +16183,7 @@
             else {
                 throw BrowserAuthError.createUnableToLoadTokenError("Please provide a request with an account or a request with authority.");
             }
-            return this.generateAuthenticationResult(request, idToken, cacheRecord, authority);
+            return this.generateAuthenticationResult(request, idToken, cacheRecord, cacheRecordAccount, authority);
         }
         /**
          * Helper function to load account to msal-browser cache
@@ -16167,20 +16194,23 @@
          * @param requestHomeAccountId
          * @returns `AccountEntity`
          */
-        loadAccount(idToken, environment, clientInfo, authorityType, requestHomeAccountId) {
+        loadAccount(idToken, authority, clientInfo, requestHomeAccountId) {
             let homeAccountId;
             if (requestHomeAccountId) {
                 homeAccountId = requestHomeAccountId;
             }
-            else if (authorityType !== undefined && clientInfo) {
-                homeAccountId = AccountEntity.generateHomeAccountId(clientInfo, authorityType, this.logger, this.cryptoObj, idToken);
+            else if (authority.authorityType !== undefined && clientInfo) {
+                homeAccountId = AccountEntity.generateHomeAccountId(clientInfo, authority.authorityType, this.logger, this.cryptoObj, idToken.claims);
             }
             if (!homeAccountId) {
                 throw BrowserAuthError.createUnableToLoadTokenError("Unexpected missing homeAccountId");
             }
-            const accountEntity = clientInfo
-                ? AccountEntity.createAccount(clientInfo, homeAccountId, idToken, undefined, undefined, undefined, environment)
-                : AccountEntity.createGenericAccount(homeAccountId, idToken, undefined, undefined, undefined, environment);
+            const accountEntity = AccountEntity.createAccount({
+                homeAccountId,
+                idTokenClaims: idToken.claims,
+                clientInfo,
+                environment: authority.hostnameAndPort,
+            }, authority);
             if (this.isBrowserEnvironment) {
                 this.logger.verbose("TokenCache - loading account");
                 this.storage.setAccount(accountEntity);
@@ -16274,7 +16304,7 @@
          * @param authority
          * @returns `AuthenticationResult`
          */
-        generateAuthenticationResult(request, idTokenObj, cacheRecord, authority) {
+        generateAuthenticationResult(request, idTokenObj, cacheRecord, accountEntity, authority) {
             let accessToken = Constants.EMPTY_STRING;
             let responseScopes = [];
             let expiresOn = null;
@@ -16296,9 +16326,7 @@
                 uniqueId: uid,
                 tenantId: tid,
                 scopes: responseScopes,
-                account: cacheRecord?.account
-                    ? cacheRecord.account.getAccountInfo()
-                    : null,
+                account: accountEntity.getAccountInfo(),
                 idToken: idTokenObj ? idTokenObj.rawToken : Constants.EMPTY_STRING,
                 idTokenClaims: idTokenObj ? idTokenObj.claims : {},
                 accessToken: accessToken,
@@ -16310,9 +16338,8 @@
                 familyId: Constants.EMPTY_STRING,
                 tokenType: cacheRecord?.accessToken?.tokenType || Constants.EMPTY_STRING,
                 state: Constants.EMPTY_STRING,
-                cloudGraphHostName: cacheRecord?.account?.cloudGraphHostName ||
-                    Constants.EMPTY_STRING,
-                msGraphHost: cacheRecord?.account?.msGraphHost || Constants.EMPTY_STRING,
+                cloudGraphHostName: accountEntity.cloudGraphHostName || Constants.EMPTY_STRING,
+                msGraphHost: accountEntity.msGraphHost || Constants.EMPTY_STRING,
                 code: undefined,
                 fromNativeBroker: false,
             };
@@ -16438,9 +16465,7 @@
             // 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);
+            this.performanceClient = this.config.telemetry.client;
             // Initialize the crypto class.
             this.browserCrypto = this.isBrowserEnvironment
                 ? new CryptoOps(this.logger, this.performanceClient)
@@ -16457,6 +16482,7 @@
                 storeAuthStateInCookie: false,
                 secureCookies: false,
                 cacheMigrationEnabled: false,
+                claimsBasedCachingEnabled: false,
             };
             this.nativeInternalStorage = new BrowserCacheManager(this.config.auth.clientId, nativeCacheOptions, this.browserCrypto, this.logger);
             // Initialize the token cache
@@ -16505,7 +16531,7 @@
             }
             this.initialized = true;
             this.eventHandler.emitEvent(EventType.INITIALIZE_END);
-            initMeasurement.endMeasurement({ allowNativeBroker, success: true });
+            initMeasurement.end({ allowNativeBroker, success: true });
         }
         // #region Redirect Flow
         /**
@@ -16517,8 +16543,14 @@
          */
         async handleRedirectPromise(hash) {
             this.logger.verbose("handleRedirectPromise called");
-            // Block token acquisition before initialize has been called if native brokering is enabled
-            BrowserUtils.blockNativeBrokerCalledBeforeInitialized(this.config.system.allowNativeBroker, this.initialized);
+            // Block token acquisition before initialize has been called
+            BrowserUtils.blockAPICallsBeforeInitialize(this.initialized);
+            let foundServerResponse = hash;
+            if (this.config.auth.OIDCOptions?.serverResponseType ===
+                ServerResponseType.QUERY) {
+                const url = window.location.href;
+                foundServerResponse = UrlString.parseQueryServerResponse(url);
+            }
             const loggedInAccounts = this.getAllAccounts();
             if (this.isBrowserEnvironment) {
                 /**
@@ -16526,7 +16558,7 @@
                  * otherwise return the promise from the first invocation. Prevents race conditions when handleRedirectPromise is called
                  * several times concurrently.
                  */
-                const redirectResponseKey = hash || Constants.EMPTY_STRING;
+                const redirectResponseKey = foundServerResponse || Constants.EMPTY_STRING;
                 let response = this.redirectResponse.get(redirectResponseKey);
                 if (typeof response === "undefined") {
                     this.eventHandler.emitEvent(EventType.HANDLE_REDIRECT_START, exports.InteractionType.Redirect);
@@ -16536,7 +16568,7 @@
                     if (request &&
                         NativeMessageHandler.isNativeAvailable(this.config, this.logger, this.nativeExtensionProvider) &&
                         this.nativeExtensionProvider &&
-                        !hash) {
+                        !foundServerResponse) {
                         this.logger.trace("handleRedirectPromise - acquiring token from native platform");
                         const nativeClient = new NativeInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, ApiId.handleRedirectPromise, this.performanceClient, this.nativeExtensionProvider, request.accountId, this.nativeInternalStorage, request.correlationId);
                         redirectResponse = nativeClient.handleRedirectPromise();
@@ -16546,7 +16578,7 @@
                         const correlationId = this.browserStorage.getTemporaryCache(TemporaryCacheKeys.CORRELATION_ID, true) || Constants.EMPTY_STRING;
                         const redirectClient = this.createRedirectClient(correlationId);
                         redirectResponse =
-                            redirectClient.handleRedirectPromise(hash);
+                            redirectClient.handleRedirectPromise(foundServerResponse);
                     }
                     response = redirectResponse
                         .then((result) => {
@@ -16677,7 +16709,7 @@
                 result = this.acquireTokenNative(request, ApiId.acquireTokenPopup)
                     .then((response) => {
                     this.browserStorage.setInteractionInProgress(false);
-                    atPopupMeasurement.endMeasurement({
+                    atPopupMeasurement.end({
                         success: true,
                         isNativeBroker: true,
                         requestId: response.requestId,
@@ -16715,11 +16747,11 @@
                 else {
                     this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Popup, result);
                 }
-                atPopupMeasurement.addStaticFields({
+                atPopupMeasurement.add({
                     accessTokenSize: result.accessToken.length,
                     idTokenSize: result.idToken.length,
                 });
-                atPopupMeasurement.endMeasurement({
+                atPopupMeasurement.end({
                     success: true,
                     requestId: result.requestId,
                 });
@@ -16732,7 +16764,7 @@
                 else {
                     this.eventHandler.emitEvent(EventType.LOGIN_FAILURE, exports.InteractionType.Popup, null, e);
                 }
-                atPopupMeasurement.endMeasurement({
+                atPopupMeasurement.end({
                     errorCode: e.errorCode,
                     subErrorCode: e.subError,
                     success: false,
@@ -16804,11 +16836,11 @@
             return result
                 .then((response) => {
                 this.eventHandler.emitEvent(EventType.SSO_SILENT_SUCCESS, exports.InteractionType.Silent, response);
-                this.ssoSilentMeasurement?.addStaticFields({
+                this.ssoSilentMeasurement?.add({
                     accessTokenSize: response.accessToken.length,
                     idTokenSize: response.idToken.length,
                 });
-                this.ssoSilentMeasurement?.endMeasurement({
+                this.ssoSilentMeasurement?.end({
                     success: true,
                     isNativeBroker: response.fromNativeBroker,
                     requestId: response.requestId,
@@ -16817,7 +16849,7 @@
             })
                 .catch((e) => {
                 this.eventHandler.emitEvent(EventType.SSO_SILENT_FAILURE, exports.InteractionType.Silent, null, e);
-                this.ssoSilentMeasurement?.endMeasurement({
+                this.ssoSilentMeasurement?.end({
                     errorCode: e.errorCode,
                     subErrorCode: e.subError,
                     success: false,
@@ -16861,11 +16893,11 @@
                             .then((result) => {
                             this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_BY_CODE_SUCCESS, exports.InteractionType.Silent, result);
                             this.hybridAuthCodeResponses.delete(hybridAuthCode);
-                            atbcMeasurement.addStaticFields({
+                            atbcMeasurement.add({
                                 accessTokenSize: result.accessToken.length,
                                 idTokenSize: result.idToken.length,
                             });
-                            atbcMeasurement.endMeasurement({
+                            atbcMeasurement.end({
                                 success: true,
                                 isNativeBroker: result.fromNativeBroker,
                                 requestId: result.requestId,
@@ -16875,7 +16907,7 @@
                             .catch((error) => {
                             this.hybridAuthCodeResponses.delete(hybridAuthCode);
                             this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_BY_CODE_FAILURE, exports.InteractionType.Silent, null, error);
-                            atbcMeasurement.endMeasurement({
+                            atbcMeasurement.end({
                                 errorCode: error.errorCode,
                                 subErrorCode: error.subError,
                                 success: false,
@@ -16886,7 +16918,7 @@
                     }
                     else {
                         this.logger.verbose("Existing acquireTokenByCode request found", request.correlationId);
-                        atbcMeasurement.discardMeasurement();
+                        atbcMeasurement.discard();
                     }
                     return response;
                 }
@@ -16910,7 +16942,7 @@
             }
             catch (e) {
                 this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_BY_CODE_FAILURE, exports.InteractionType.Silent, null, e);
-                atbcMeasurement.endMeasurement({
+                atbcMeasurement.end({
                     errorCode: (e instanceof AuthError && e.errorCode) || undefined,
                     subErrorCode: (e instanceof AuthError && e.subError) || undefined,
                     success: false,
@@ -16935,7 +16967,7 @@
             const silentTokenResult = await silentAuthCodeClient
                 .acquireToken(request)
                 .then((response) => {
-                this.acquireTokenByCodeAsyncMeasurement?.endMeasurement({
+                this.acquireTokenByCodeAsyncMeasurement?.end({
                     success: true,
                     fromCache: response.fromCache,
                     isNativeBroker: response.fromNativeBroker,
@@ -16944,7 +16976,7 @@
                 return response;
             })
                 .catch((tokenRenewalError) => {
-                this.acquireTokenByCodeAsyncMeasurement?.endMeasurement({
+                this.acquireTokenByCodeAsyncMeasurement?.end({
                     errorCode: tokenRenewalError.errorCode,
                     subErrorCode: tokenRenewalError.subError,
                     success: false,
@@ -17154,6 +17186,26 @@
             return this.browserStorage.getActiveAccount();
         }
         // #endregion
+        /**
+         * Hydrates the cache with the tokens from an AuthenticationResult
+         * @param result
+         * @param request
+         * @returns
+         */
+        async hydrateCache(result, request) {
+            this.logger.verbose("hydrateCache called");
+            // Account gets saved to browser storage regardless of native or not
+            const accountEntity = AccountEntity.createFromAccountInfo(result.account, result.cloudGraphHostName, result.msGraphHost);
+            this.browserStorage.setAccount(accountEntity);
+            if (result.fromNativeBroker) {
+                this.logger.verbose("Response was from native broker, storing in-memory");
+                // Tokens from native broker are stored in-memory
+                return this.nativeInternalStorage.hydrateCache(result, request);
+            }
+            else {
+                return this.browserStorage.hydrateCache(result, request);
+            }
+        }
         // #region Helpers
         /**
          * Helper to validate app environment before making an auth request
@@ -17172,13 +17224,8 @@
             BrowserUtils.blockReloadInHiddenIframes();
             // Block redirectUri opened in a popup from calling MSAL APIs
             BrowserUtils.blockAcquireTokenInPopups();
-            /*
-             * Block token acquisition before initialize has been called if native brokering is enabled in top-frame.
-             * Skip check if application is embedded.
-             */
-            if (!isAppEmbedded) {
-                BrowserUtils.blockNativeBrokerCalledBeforeInitialized(this.config.system.allowNativeBroker, this.initialized);
-            }
+            // Block token acquisition before initialize has been called
+            BrowserUtils.blockAPICallsBeforeInitialize(this.initialized);
             // Block redirects if memory storage is enabled but storeAuthStateInCookie is not
             if (interactionType === exports.InteractionType.Redirect &&
                 this.config.cache.cacheLocation ===
@@ -17504,7 +17551,7 @@
         async acquireTokenSilent(request) {
             const correlationId = this.getRequestCorrelationId(request);
             const atsMeasurement = this.performanceClient.startMeasurement(PerformanceEvents.AcquireTokenSilent, correlationId);
-            atsMeasurement.addStaticFields({
+            atsMeasurement.add({
                 cacheLookupPolicy: request.cacheLookupPolicy,
             });
             this.preflightBrowserEnvironmentCheck(exports.InteractionType.Silent);
@@ -17536,11 +17583,11 @@
                 }, account)
                     .then((result) => {
                     this.activeSilentTokenRequests.delete(silentRequestKey);
-                    atsMeasurement.addStaticFields({
+                    atsMeasurement.add({
                         accessTokenSize: result.accessToken.length,
                         idTokenSize: result.idToken.length,
                     });
-                    atsMeasurement.endMeasurement({
+                    atsMeasurement.end({
                         success: true,
                         fromCache: result.fromCache,
                         isNativeBroker: result.fromNativeBroker,
@@ -17551,7 +17598,7 @@
                 })
                     .catch((error) => {
                     this.activeSilentTokenRequests.delete(silentRequestKey);
-                    atsMeasurement.endMeasurement({
+                    atsMeasurement.end({
                         errorCode: error.errorCode,
                         subErrorCode: error.subError,
                         success: false,
@@ -17564,7 +17611,7 @@
             else {
                 this.logger.verbose("acquireTokenSilent has been called previously, returning the result from the first call", correlationId);
                 // Discard measurements for memoized calls, as they are usually only a couple of ms and will artificially deflate metrics
-                atsMeasurement.discardMeasurement();
+                atsMeasurement.discard();
                 return cachedResponse;
             }
         }
@@ -17648,7 +17695,7 @@
             return result
                 .then((response) => {
                 this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Silent, response);
-                this.atsAsyncMeasurement?.endMeasurement({
+                this.atsAsyncMeasurement?.end({
                     success: true,
                     fromCache: response.fromCache,
                     isNativeBroker: response.fromNativeBroker,
@@ -17658,7 +17705,7 @@
             })
                 .catch((tokenRenewalError) => {
                 this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Silent, null, tokenRenewalError);
-                this.atsAsyncMeasurement?.endMeasurement({
+                this.atsAsyncMeasurement?.end({
                     errorCode: tokenRenewalError.errorCode,
                     subErrorCode: tokenRenewalError.subError,
                     success: false,
@@ -17982,6 +18029,15 @@
         getConfiguration() {
             return this.controller.getConfiguration();
         }
+        /**
+         * Hydrates cache with the tokens and account in the AuthenticationResult object
+         * @param result
+         * @param request - The request object that was used to obtain the AuthenticationResult
+         * @returns
+         */
+        async hydrateCache(result, request) {
+            return this.controller.hydrateCache(result, request);
+        }
     }
 
     /*
@@ -18079,6 +18135,9 @@
         getConfiguration: () => {
             throw BrowserConfigurationAuthError.createStubPcaInstanceCalledError();
         },
+        hydrateCache: () => {
+            return Promise.reject(BrowserConfigurationAuthError.createStubPcaInstanceCalledError());
+        },
     };
 
     /*
@@ -18190,6 +18249,227 @@
         }
     }
 
+    /*
+     * Copyright (c) Microsoft Corporation. All rights reserved.
+     * Licensed under the MIT License.
+     */
+    class BrowserPerformanceMeasurement {
+        constructor(name, correlationId) {
+            this.correlationId = correlationId;
+            this.measureName = BrowserPerformanceMeasurement.makeMeasureName(name, correlationId);
+            this.startMark = BrowserPerformanceMeasurement.makeStartMark(name, correlationId);
+            this.endMark = BrowserPerformanceMeasurement.makeEndMark(name, correlationId);
+        }
+        static makeMeasureName(name, correlationId) {
+            return `msal.measure.${name}.${correlationId}`;
+        }
+        static makeStartMark(name, correlationId) {
+            return `msal.start.${name}.${correlationId}`;
+        }
+        static makeEndMark(name, correlationId) {
+            return `msal.end.${name}.${correlationId}`;
+        }
+        static supportsBrowserPerformance() {
+            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");
+        }
+        /**
+         * Flush browser marks and measurements.
+         * @param {string} correlationId
+         * @param {SubMeasurement} measurements
+         */
+        static flushMeasurements(correlationId, measurements) {
+            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
+                try {
+                    measurements.forEach((measurement) => {
+                        const measureName = BrowserPerformanceMeasurement.makeMeasureName(measurement.name, correlationId);
+                        const entriesForMeasurement = window.performance.getEntriesByName(measureName, "measure");
+                        if (entriesForMeasurement.length > 0) {
+                            window.performance.clearMeasures(measureName);
+                            window.performance.clearMarks(BrowserPerformanceMeasurement.makeStartMark(measureName, correlationId));
+                            window.performance.clearMarks(BrowserPerformanceMeasurement.makeEndMark(measureName, correlationId));
+                        }
+                    });
+                }
+                catch (e) {
+                    // Silently catch and return null
+                }
+            }
+        }
+        startMeasurement() {
+            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
+                try {
+                    window.performance.mark(this.startMark);
+                }
+                catch (e) {
+                    // Silently catch
+                }
+            }
+        }
+        endMeasurement() {
+            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
+                try {
+                    window.performance.mark(this.endMark);
+                    window.performance.measure(this.measureName, this.startMark, this.endMark);
+                }
+                catch (e) {
+                    // Silently catch
+                }
+            }
+        }
+        flushMeasurement() {
+            if (BrowserPerformanceMeasurement.supportsBrowserPerformance()) {
+                try {
+                    const entriesForMeasurement = window.performance.getEntriesByName(this.measureName, "measure");
+                    if (entriesForMeasurement.length > 0) {
+                        const 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;
+        }
+    }
+
+    /*
+     * Copyright (c) Microsoft Corporation. All rights reserved.
+     * Licensed under the MIT License.
+     */
+    class BrowserPerformanceClient extends PerformanceClient {
+        constructor(configuration, intFields) {
+            super(configuration.auth.clientId, configuration.auth.authority || `${Constants.DEFAULT_AUTHORITY}`, new Logger(configuration.system?.loggerOptions || {}, name, version), name, version, configuration.telemetry?.application || {
+                appName: "",
+                appVersion: "",
+            }, intFields);
+            this.browserCrypto = new BrowserCrypto(this.logger);
+            this.guidGenerator = new GuidGenerator(this.browserCrypto);
+        }
+        startPerformanceMeasurement(measureName, correlationId) {
+            return new BrowserPerformanceMeasurement(measureName, correlationId);
+        }
+        generateId() {
+            return this.guidGenerator.generateGuid();
+        }
+        getPageVisibility() {
+            return document.visibilityState?.toString() || null;
+        }
+        deleteIncompleteSubMeasurements(inProgressEvent) {
+            const rootEvent = this.eventsByCorrelationId.get(inProgressEvent.event.correlationId);
+            const isRootEvent = rootEvent && rootEvent.eventId === inProgressEvent.event.eventId;
+            const incompleteMeasurements = [];
+            if (isRootEvent && rootEvent?.incompleteSubMeasurements) {
+                rootEvent.incompleteSubMeasurements.forEach((subMeasurement) => {
+                    incompleteMeasurements.push({ ...subMeasurement });
+                });
+            }
+            // Clean up remaining marks for incomplete sub-measurements
+            if (incompleteMeasurements.length > 0) {
+                BrowserPerformanceMeasurement.flushMeasurements(inProgressEvent.event.correlationId, incompleteMeasurements);
+            }
+        }
+        supportsBrowserPerformanceNow() {
+            return (typeof window !== "undefined" &&
+                typeof window.performance !== "undefined" &&
+                typeof window.performance.now === "function");
+        }
+        /**
+         * 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)}
+         */
+        startMeasurement(measureName, correlationId) {
+            // Capture page visibilityState and then invoke start/end measurement
+            const startPageVisibility = this.getPageVisibility();
+            const inProgressEvent = super.startMeasurement(measureName, correlationId);
+            return {
+                ...inProgressEvent,
+                end: (event) => {
+                    const res = inProgressEvent.end({
+                        startPageVisibility,
+                        endPageVisibility: this.getPageVisibility(),
+                        ...event,
+                    });
+                    this.deleteIncompleteSubMeasurements(inProgressEvent);
+                    return res;
+                },
+                discard: () => {
+                    inProgressEvent.discard();
+                    this.deleteIncompleteSubMeasurements(inProgressEvent);
+                    inProgressEvent.measurement.flushMeasurement();
+                },
+            };
+        }
+        /**
+         * Adds pre-queue time to preQueueTimeByCorrelationId map.
+         * @param {PerformanceEvents} eventName
+         * @param {?string} correlationId
+         * @returns
+         */
+        setPreQueueTime(eventName, correlationId) {
+            if (!this.supportsBrowserPerformanceNow()) {
+                this.logger.trace(`BrowserPerformanceClient: window performance API not available, unable to set telemetry queue time for ${eventName}`);
+                return;
+            }
+            if (!correlationId) {
+                this.logger.trace(`BrowserPerformanceClient: correlationId for ${eventName} not provided, unable to set telemetry queue time`);
+                return;
+            }
+            const preQueueEvent = this.preQueueTimeByCorrelationId.get(correlationId);
+            /**
+             * Manually complete queue measurement if there is an incomplete pre-queue event.
+             * Incomplete pre-queue events are instrumentation bugs that should be fixed.
+             */
+            if (preQueueEvent) {
+                this.logger.trace(`BrowserPerformanceClient: Incomplete pre-queue ${preQueueEvent.name} found`, correlationId);
+                this.addQueueMeasurement(preQueueEvent.name, correlationId, undefined, true);
+            }
+            this.preQueueTimeByCorrelationId.set(correlationId, {
+                name: eventName,
+                time: window.performance.now(),
+            });
+        }
+        /**
+         * Calculates and adds queue time measurement for given performance event.
+         *
+         * @param {PerformanceEvents} eventName
+         * @param {?string} correlationId
+         * @param {?number} queueTime
+         * @param {?boolean} manuallyCompleted - indicator for manually completed queue measurements
+         * @returns
+         */
+        addQueueMeasurement(eventName, correlationId, queueTime, manuallyCompleted) {
+            if (!this.supportsBrowserPerformanceNow()) {
+                this.logger.trace(`BrowserPerformanceClient: window performance API not available, unable to add queue measurement for ${eventName}`);
+                return;
+            }
+            if (!correlationId) {
+                this.logger.trace(`BrowserPerformanceClient: correlationId for ${eventName} not provided, unable to add queue measurement`);
+                return;
+            }
+            const preQueueTime = super.getPreQueueTime(eventName, correlationId);
+            if (!preQueueTime) {
+                return;
+            }
+            const currentTime = window.performance.now();
+            const resQueueTime = queueTime || super.calculateQueuedTime(preQueueTime, currentTime);
+            return super.addQueueMeasurement(eventName, correlationId, resQueueTime, manuallyCompleted);
+        }
+    }
+
     exports.AccountEntity = AccountEntity;
     exports.ApiId = ApiId;
     exports.AuthError = AuthError;
@@ -18202,6 +18482,8 @@
     exports.BrowserCacheLocation = BrowserCacheLocation;
     exports.BrowserConfigurationAuthError = BrowserConfigurationAuthError;
     exports.BrowserConfigurationAuthErrorMessage = BrowserConfigurationAuthErrorMessage;
+    exports.BrowserPerformanceClient = BrowserPerformanceClient;
+    exports.BrowserPerformanceMeasurement = BrowserPerformanceMeasurement;
     exports.BrowserUtils = BrowserUtils;
     exports.CacheLookupPolicy = CacheLookupPolicy;
     exports.ClientAuthError = ClientAuthError;
@@ -18218,9 +18500,11 @@
     exports.NavigationClient = NavigationClient;
     exports.OIDC_DEFAULT_SCOPES = OIDC_DEFAULT_SCOPES;
     exports.PerformanceEvents = PerformanceEvents;
+    exports.PromptValue = PromptValue;
     exports.ProtocolMode = ProtocolMode;
     exports.PublicClientApplication = PublicClientApplication;
     exports.ServerError = ServerError;
+    exports.ServerResponseType = ServerResponseType;
     exports.SignedHttpRequest = SignedHttpRequest;
     exports.StringUtils = StringUtils;
     exports.UrlString = UrlString;