npm - @azure/msal-browser - Versions diffs - 5.0.2 → 5.1.0 - Mend

@azure/msal-browser 5.0.2 → 5.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (405) hide show

package/lib/msal-browser.cjs CHANGED Viewed

@@ -1,8 +1,8 @@
-/*! @azure/msal-browser v5.0.2 2026-01-17 */
+/*! @azure/msal-browser v5.1.0 2026-01-28 */
 'use strict';
 'use strict';
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -234,7 +234,7 @@ const JsonWebTokenTypes$1 = {
 // Token renewal offset default in seconds
 const DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -284,7 +284,7 @@ const INSTANCE_AWARE = "instance_aware";
 const EAR_JWK = "ear_jwk";
 const EAR_JWE_CRYPTO = "ear_jwe_crypto";
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -315,7 +315,7 @@ function createAuthError(code, additionalMessage) {
     return new AuthError(code, additionalMessage || getDefaultErrorMessage$1(code));
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -335,7 +335,7 @@ function createClientConfigurationError(errorCode) {
     return new ClientConfigurationError(errorCode);
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -432,7 +432,7 @@ class StringUtils {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -455,7 +455,7 @@ function createClientAuthError(errorCode, additionalMessage) {
     return new ClientAuthError(errorCode, additionalMessage);
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -509,7 +509,7 @@ var ClientConfigurationErrorCodes = /*#__PURE__*/Object.freeze({
     urlParseError: urlParseError
 });
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -593,7 +593,7 @@ var ClientAuthErrorCodes = /*#__PURE__*/Object.freeze({
     userCanceled: userCanceled
 });
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -788,7 +788,7 @@ class ScopeSet {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1155,7 +1155,7 @@ function addEARParameters(parameters, jwk) {
     parameters.set(EAR_JWE_CRYPTO, jweCryptoB64Encoded);
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1264,7 +1264,7 @@ function normalizeUrlForComparison(url) {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1303,7 +1303,7 @@ const DEFAULT_CRYPTO_IMPLEMENTATION = {
     },
 };
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1578,12 +1578,12 @@ class Logger {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /* eslint-disable header/header */
 const name$1 = "@azure/msal-common";
-const version$1 = "16.0.2";
+const version$1 = "16.0.3";
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1603,7 +1603,7 @@ const AzureCloudInstance = {
     AzureUsGovernment: "https://login.microsoftonline.us",
 };
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1685,7 +1685,7 @@ function updateAccountTenantProfileData(baseAccountInfo, tenantProfile, idTokenC
     return updatedAccountInfo;
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1765,7 +1765,7 @@ function checkMaxAge(authTime, maxAge) {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1922,7 +1922,7 @@ class UrlString {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2064,7 +2064,7 @@ function getCloudDiscoveryMetadataFromNetworkResponse(response, authorityHost) {
     return null;
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -2072,7 +2072,7 @@ function getCloudDiscoveryMetadataFromNetworkResponse(response, authorityHost) {
 const cacheQuotaExceeded = "cache_quota_exceeded";
 const cacheErrorUnknown = "cache_error_unknown";
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2110,7 +2110,7 @@ function createCacheError(e) {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2148,7 +2148,7 @@ function buildClientInfoFromHomeAccountId(homeAccountId) {
     };
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -2163,7 +2163,7 @@ const AuthorityType = {
     Ciam: 3,
 };
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -2185,7 +2185,7 @@ function getTenantIdFromIdTokenClaims(idTokenClaims) {
     return null;
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -2209,11 +2209,18 @@ const ProtocolMode = {
     EAR: "EAR",
 };
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /**
  * Returns the AccountInfo interface for this account.
  */
 function getAccountInfo(accountEntity) {
+    const tenantProfiles = accountEntity.tenantProfiles || [];
+    // Ensure at least the home tenant profile exists
+    if (tenantProfiles.length === 0 &&
+        accountEntity.realm &&
+        accountEntity.localAccountId) {
+        tenantProfiles.push(buildTenantProfile(accountEntity.homeAccountId, accountEntity.localAccountId, accountEntity.realm));
+    }
     return {
         homeAccountId: accountEntity.homeAccountId,
         environment: accountEntity.environment,
@@ -2225,7 +2232,7 @@ function getAccountInfo(accountEntity) {
         nativeAccountId: accountEntity.nativeAccountId,
         authorityType: accountEntity.authorityType,
         // Deserialize tenant profiles array into a Map
-        tenantProfiles: new Map((accountEntity.tenantProfiles || []).map((tenantProfile) => {
+        tenantProfiles: new Map(tenantProfiles.map((tenantProfile) => {
             return [tenantProfile.tenantId, tenantProfile];
         })),
         dataBoundary: accountEntity.dataBoundary,
@@ -2314,6 +2321,14 @@ function createAccountEntity(accountDetails, authority, base64Decode) {
  * @returns
  */
 function createAccountEntityFromAccountInfo(accountInfo, cloudGraphHostName, msGraphHost) {
+    // Serialize tenant profiles map into an array
+    const tenantProfiles = Array.from(accountInfo.tenantProfiles?.values() || []);
+    // Ensure at least the home tenant profile exists
+    if (tenantProfiles.length === 0 &&
+        accountInfo.tenantId &&
+        accountInfo.localAccountId) {
+        tenantProfiles.push(buildTenantProfile(accountInfo.homeAccountId, accountInfo.localAccountId, accountInfo.tenantId, accountInfo.idTokenClaims));
+    }
     return {
         authorityType: accountInfo.authorityType || CACHE_ACCOUNT_TYPE_GENERIC,
         homeAccountId: accountInfo.homeAccountId,
@@ -2326,7 +2341,7 @@ function createAccountEntityFromAccountInfo(accountInfo, cloudGraphHostName, msG
         name: accountInfo.name,
         cloudGraphHostName: cloudGraphHostName,
         msGraphHost: msGraphHost,
-        tenantProfiles: Array.from(accountInfo.tenantProfiles?.values() || []),
+        tenantProfiles: tenantProfiles,
         dataBoundary: accountInfo.dataBoundary,
     };
 }
@@ -2369,7 +2384,7 @@ function isAccountEntity(entity) {
         entity.hasOwnProperty("authorityType"));
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2535,13 +2550,13 @@ class CacheManager {
      * @param storeInCache {?StoreInCache}
      * @param correlationId {?string} correlation id
      */
-    async saveCacheRecord(cacheRecord, correlationId, kmsi, storeInCache) {
+    async saveCacheRecord(cacheRecord, correlationId, kmsi, apiId, storeInCache) {
         if (!cacheRecord) {
             throw createClientAuthError(invalidCacheRecord);
         }
         try {
             if (!!cacheRecord.account) {
-                await this.setAccount(cacheRecord.account, correlationId, kmsi);
+                await this.setAccount(cacheRecord.account, correlationId, kmsi, apiId);
             }
             if (!!cacheRecord.idToken && storeInCache?.idToken !== false) {
                 await this.setIdTokenCredential(cacheRecord.idToken, correlationId, kmsi);
@@ -3466,7 +3481,7 @@ class DefaultStorageClass extends CacheManager {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3507,7 +3522,7 @@ const IntFields = new Set([
     "upgradedCacheCount",
 ]);
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3562,7 +3577,7 @@ class StubPerformanceClient {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3656,7 +3671,7 @@ function isOidcProtocolMode(config) {
     return (config.authOptions.authority.options.protocolMode === ProtocolMode.OIDC);
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3675,7 +3690,7 @@ class ServerError extends AuthError {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3703,7 +3718,7 @@ var InteractionRequiredAuthErrorCodes = /*#__PURE__*/Object.freeze({
     uxNotAllowed: uxNotAllowed
 });
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3769,7 +3784,7 @@ function createInteractionRequiredAuthError(errorCode, errorMessage) {
     return new InteractionRequiredAuthError(errorCode, errorMessage);
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3837,7 +3852,7 @@ function parseRequestState(base64Decode, state) {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3902,7 +3917,7 @@ function wasClockTurnedBack(cachedAt) {
     return cachedAtSec > nowSeconds();
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3973,7 +3988,7 @@ const RegionDiscoveryGetCurrentVersion = "regionDiscoveryGetCurrentVersion";
 const CacheManagerGetRefreshToken = "cacheManagerGetRefreshToken";
 const SetUserData = "setUserData";
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4068,7 +4083,7 @@ const invokeAsync = (callback, eventName, logger, telemetryClient, correlationId
     };
 };
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4148,7 +4163,7 @@ class PopTokenGenerator {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4175,7 +4190,7 @@ class PopTokenGenerator {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4434,7 +4449,7 @@ function isAuthorityMetadataExpired(metadata) {
     return metadata.expiresAt <= nowSeconds();
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4501,7 +4516,7 @@ class ResponseHandler {
      * @param serverTokenResponse
      * @param authority
      */
-    async handleServerTokenResponse(serverTokenResponse, authority, reqTimestamp, request, authCodePayload, userAssertionHash, handlingRefreshTokenResponse, forceCacheRefreshTokenResponse, serverRequestId) {
+    async handleServerTokenResponse(serverTokenResponse, authority, reqTimestamp, request, apiId, authCodePayload, userAssertionHash, handlingRefreshTokenResponse, forceCacheRefreshTokenResponse, serverRequestId) {
         // create an idToken object (not entity)
         let idTokenClaims;
         if (serverTokenResponse.id_token) {
@@ -4548,14 +4563,19 @@ class ResponseHandler {
             if (handlingRefreshTokenResponse &&
                 !forceCacheRefreshTokenResponse &&
                 cacheRecord.account) {
-                const key = this.cacheStorage.generateAccountKey(getAccountInfo(cacheRecord.account));
-                const account = this.cacheStorage.getAccount(key, request.correlationId);
-                if (!account) {
+                const cachedAccounts = this.cacheStorage.getAllAccounts({
+                    homeAccountId: cacheRecord.account.homeAccountId,
+                    environment: cacheRecord.account.environment,
+                }, request.correlationId);
+                if (cachedAccounts.length < 1) {
                     this.logger.warning("1gmt66", request.correlationId);
+                    this.performanceClient?.addFields({
+                        acntLoggedOut: true,
+                    }, request.correlationId);
                     return await ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, this.performanceClient, idTokenClaims, requestStateObj, undefined, serverRequestId);
                 }
             }
-            await this.cacheStorage.saveCacheRecord(cacheRecord, request.correlationId, isKmsi(idTokenClaims || {}), request.storeInCache);
+            await this.cacheStorage.saveCacheRecord(cacheRecord, request.correlationId, isKmsi(idTokenClaims || {}), apiId, request.storeInCache);
         }
         finally {
             if (this.persistencePlugin &&
@@ -4765,7 +4785,7 @@ function buildAccountToCache(cacheStorage, authority, homeAccountId, base64Decod
     return baseAccount;
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4775,7 +4795,7 @@ const CcsCredentialType = {
     UPN: "UPN",
 };
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4793,7 +4813,7 @@ async function getClientAssertion(clientAssertion, clientId, tokenEndpoint) {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4814,7 +4834,7 @@ function getRequestThumbprint(clientId, request, homeAccountId) {
     };
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4900,7 +4920,7 @@ class ThrottlingUtils {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4931,7 +4951,7 @@ function createNetworkError(error, httpStatus, responseHeaders, additionalError)
     return new NetworkError(error, httpStatus, responseHeaders);
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5045,7 +5065,7 @@ async function sendPostRequest(thumbprint, tokenEndpoint, options, correlationId
     return response;
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5057,7 +5077,7 @@ function isOpenIdConfigResponse(response) {
         response.hasOwnProperty("jwks_uri"));
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5067,7 +5087,7 @@ function isCloudInstanceDiscoveryResponse(response) {
         response.hasOwnProperty("metadata"));
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5077,7 +5097,7 @@ function isCloudInstanceDiscoveryErrorResponse(response) {
         response.hasOwnProperty("error_description"));
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5182,7 +5202,7 @@ RegionDiscovery.IMDS_OPTIONS = {
     },
 };
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6002,7 +6022,7 @@ function buildStaticAuthorityOptions(authOptions) {
     };
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6036,7 +6056,7 @@ async function createDiscoveredInstance(authorityUri, networkClient, cacheManage
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6074,7 +6094,7 @@ class AuthorizationCodeClient {
      * authorization_code_grant
      * @param request
      */
-    async acquireToken(request, authCodePayload) {
+    async acquireToken(request, apiId, authCodePayload) {
         if (!request.code) {
             throw createClientAuthError(requestCannotBeMade);
         }
@@ -6089,7 +6109,7 @@ class AuthorizationCodeClient {
         const responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.performanceClient, this.config.serializableCache, this.config.persistencePlugin);
         // Validate response. This function throws a server error if an error is returned by the server.
         responseHandler.validateTokenResponse(response.body, request.correlationId);
-        return invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), HandleServerTokenResponse, this.logger, this.performanceClient, request.correlationId)(response.body, this.authority, reqTimestamp, request, authCodePayload, undefined, undefined, undefined, requestId);
+        return invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), HandleServerTokenResponse, this.logger, this.performanceClient, request.correlationId)(response.body, this.authority, reqTimestamp, request, apiId, authCodePayload, undefined, undefined, undefined, requestId);
     }
     /**
      * Used to log out the current user, and redirect the user to the postLogoutRedirectUri.
@@ -6296,7 +6316,7 @@ class AuthorizationCodeClient {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6326,20 +6346,20 @@ class RefreshTokenClient {
         // set performance telemetry client
         this.performanceClient = performanceClient;
     }
-    async acquireToken(request) {
+    async acquireToken(request, apiId) {
         const reqTimestamp = nowSeconds();
         const response = await invokeAsync(this.executeTokenRequest.bind(this), RefreshTokenClientExecuteTokenRequest, this.logger, this.performanceClient, request.correlationId)(request, this.authority);
         // Retrieve requestId from response headers
         const requestId = response.headers?.[HeaderNames.X_MS_REQUEST_ID];
         const responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.performanceClient, this.config.serializableCache, this.config.persistencePlugin);
         responseHandler.validateTokenResponse(response.body, request.correlationId);
-        return invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), HandleServerTokenResponse, this.logger, this.performanceClient, request.correlationId)(response.body, this.authority, reqTimestamp, request, undefined, undefined, true, request.forceCache, requestId);
+        return invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), HandleServerTokenResponse, this.logger, this.performanceClient, request.correlationId)(response.body, this.authority, reqTimestamp, request, apiId, undefined, undefined, true, request.forceCache, requestId);
     }
     /**
      * Gets cached refresh token and attaches to request, then calls acquireToken API
      * @param request
      */
-    async acquireTokenByRefreshToken(request) {
+    async acquireTokenByRefreshToken(request, apiId) {
         // Cannot renew token if no request object is given.
         if (!request) {
             throw createClientConfigurationError(tokenRequestEmpty);
@@ -6353,7 +6373,7 @@ class RefreshTokenClient {
         // if the app is part of the family, retrive a Family refresh token if present and make a refreshTokenRequest
         if (isFOCI) {
             try {
-                return await invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, true);
+                return await invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, true, apiId);
             }
             catch (e) {
                 const noFamilyRTInCache = e instanceof InteractionRequiredAuthError &&
@@ -6364,7 +6384,7 @@ class RefreshTokenClient {
                     e.subError === CLIENT_MISMATCH_ERROR;
                 // if family Refresh Token (FRT) cache acquisition fails or if client_mismatch error is seen with FRT, reattempt with application Refresh Token (ART)
                 if (noFamilyRTInCache || clientMismatchErrorWithFamilyRT) {
-                    return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false);
+                    return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false, apiId);
                     // throw in all other cases
                 }
                 else {
@@ -6373,13 +6393,13 @@ class RefreshTokenClient {
             }
         }
         // fall back to application refresh token acquisition
-        return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false);
+        return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false, apiId);
     }
     /**
      * makes a network call to acquire tokens by exchanging RefreshToken available in userCache; throws if refresh token is not cached
      * @param request
      */
-    async acquireTokenWithCachedRefreshToken(request, foci) {
+    async acquireTokenWithCachedRefreshToken(request, foci, apiId) {
         // fetches family RT or application RT based on FOCI value
         const refreshToken = invoke(this.cacheManager.getRefreshToken.bind(this.cacheManager), CacheManagerGetRefreshToken, this.logger, this.performanceClient, request.correlationId)(request.account, foci, request.correlationId, undefined);
         if (!refreshToken) {
@@ -6408,7 +6428,7 @@ class RefreshTokenClient {
             },
         };
         try {
-            return await invokeAsync(this.acquireToken.bind(this), RefreshTokenClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(refreshTokenRequest);
+            return await invokeAsync(this.acquireToken.bind(this), RefreshTokenClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(refreshTokenRequest, apiId);
         }
         catch (e) {
             if (e instanceof InteractionRequiredAuthError) {
@@ -6521,7 +6541,7 @@ class RefreshTokenClient {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6630,7 +6650,7 @@ class SilentFlowClient {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6645,7 +6665,7 @@ const StubbedNetworkModule = {
     },
 };
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6869,7 +6889,7 @@ function extractLoginHint(account) {
     return account.loginHint || account.idTokenClaims?.login_hint || null;
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6927,7 +6947,7 @@ class AuthenticationHeaderParser {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6944,7 +6964,7 @@ var AuthErrorCodes = /*#__PURE__*/Object.freeze({
     unexpectedError: unexpectedError
 });
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7205,7 +7225,7 @@ class ServerTelemetryManager {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7226,7 +7246,7 @@ function createJoseHeaderError(code) {
     return new JoseHeaderError(code);
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -7234,7 +7254,7 @@ function createJoseHeaderError(code) {
 const missingKidError = "missing_kid_error";
 const missingAlgError = "missing_alg_error";
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7274,7 +7294,7 @@ class JoseHeader {
     }
 }
-/*! @azure/msal-common v16.0.2 2026-01-17 */
+/*! @azure/msal-common v16.0.3 2026-01-28 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7973,6 +7993,7 @@ const InMemoryCacheKeys = {
  * Before adding a new code you must claim it in the MSAL Telemetry tracker as these number spaces are shared across all MSALs
  * 0-99 Silent Flow
  * 800-899 Auth Code Flow
+ * 900-999 Misc
  */
 const ApiId = {
     acquireTokenRedirect: 861,
@@ -7984,6 +8005,30 @@ const ApiId = {
     acquireTokenSilent_silentFlow: 61,
     logout: 961,
     logoutPopup: 962,
+    hydrateCache: 963,
+    loadExternalTokens: 964,
+};
+/**
+ * API Names for Telemetry purposes.
+ */
+const ApiName = {
+    861: "acquireTokenRedirect",
+    862: "acquireTokenPopup",
+    863: "ssoSilent",
+    864: "acquireTokenSilent_authCode",
+    865: "handleRedirectPromise",
+    866: "acquireTokenByCode",
+    61: "acquireTokenSilent_silentFlow",
+    961: "logout",
+    962: "logoutPopup",
+    963: "hydrateCache",
+    964: "loadExternalTokens",
+};
+const apiIdToName = (id) => {
+    if (typeof id === "number" && id in ApiName) {
+        return ApiName[id];
+    }
+    return "unknown";
 };
 /*
  * Interaction type of the API - used for state and telemetry
@@ -10075,7 +10120,7 @@ const EventType = {
 /* eslint-disable header/header */
 const name = "@azure/msal-browser";
-const version = "5.0.2";
+const version = "5.1.0";
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -10647,17 +10692,22 @@ class BrowserCacheManager extends CacheManager {
             !isAccountEntity(parsedAccount)) {
             return null;
         }
-        return CacheManager.toObject({}, parsedAccount);
+        const account = CacheManager.toObject({}, parsedAccount);
+        this.performanceClient.addFields({
+            accountCachedBy: apiIdToName(account.cachedByApiId),
+        }, correlationId);
+        return account;
     }
     /**
      * set account entity in the platform cache
      * @param account
      */
-    async setAccount(account, correlationId, kmsi) {
+    async setAccount(account, correlationId, kmsi, apiId) {
         this.logger.trace("1bz3wr", correlationId);
         const key = this.generateAccountKey(getAccountInfo(account));
         const timestamp = Date.now().toString();
         account.lastUpdatedAt = timestamp;
+        account.cachedByApiId = apiId;
         await this.setUserData(key, JSON.stringify(account), correlationId, timestamp, kmsi);
         this.addAccountKeyToMap(key, correlationId);
         this.performanceClient.addFields({ kmsi: kmsi }, correlationId);
@@ -11368,7 +11418,7 @@ class BrowserCacheManager extends CacheManager {
      * @param request
      */
     async hydrateCache(result, request) {
-        const idTokenEntity = createIdTokenEntity(result.account?.homeAccountId, result.account?.environment, result.idToken, this.clientId, result.tenantId);
+        const idTokenEntity = createIdTokenEntity(result.account.homeAccountId, result.account.environment, result.idToken, this.clientId, result.tenantId);
         /**
          * meta data for cache stores time in seconds from epoch
          * AuthenticationResult returns expiresOn and extExpiresOn in milliseconds (as a Date object which is in ms)
@@ -11376,7 +11426,7 @@ class BrowserCacheManager extends CacheManager {
          *
          * The next MSAL VFuture should map these both to same value if possible
          */
-        const accessTokenEntity = createAccessTokenEntity(result.account?.homeAccountId, result.account.environment, result.accessToken, this.clientId, result.tenantId, result.scopes.join(" "),
+        const accessTokenEntity = createAccessTokenEntity(result.account.homeAccountId, result.account.environment, result.accessToken, this.clientId, result.tenantId, result.scopes.join(" "),
         // Access token expiresOn stored in seconds, converting from AuthenticationResult expiresOn stored as Date
         result.expiresOn
             ? toSecondsFromDate(result.expiresOn)
@@ -11389,7 +11439,7 @@ class BrowserCacheManager extends CacheManager {
             idToken: idTokenEntity,
             accessToken: accessTokenEntity,
         };
-        return this.saveCacheRecord(cacheRecord, result.correlationId, isKmsi(extractTokenClaims(result.idToken, base64Decode)));
+        return this.saveCacheRecord(cacheRecord, result.correlationId, isKmsi(extractTokenClaims(result.idToken, base64Decode)), ApiId.hydrateCache);
     }
     /**
      * saves a cache record
@@ -11397,9 +11447,9 @@ class BrowserCacheManager extends CacheManager {
      * @param storeInCache {?StoreInCache}
      * @param correlationId {?string} correlation id
      */
-    async saveCacheRecord(cacheRecord, correlationId, kmsi, storeInCache) {
+    async saveCacheRecord(cacheRecord, correlationId, kmsi, apiId, storeInCache) {
         try {
-            await super.saveCacheRecord(cacheRecord, correlationId, kmsi, storeInCache);
+            await super.saveCacheRecord(cacheRecord, correlationId, kmsi, apiId, storeInCache);
         }
         catch (e) {
             if (e instanceof CacheError &&
@@ -12083,7 +12133,7 @@ class InteractionHandler {
      * Function to handle response parameters from hash.
      * @param locationHash
      */
-    async handleCodeResponse(response, request) {
+    async handleCodeResponse(response, request, apiId) {
         let authCodeResponse;
         try {
             authCodeResponse = getAuthorizationCodePayload(response, request.state);
@@ -12098,7 +12148,7 @@ class InteractionHandler {
                 throw e;
             }
         }
-        return invokeAsync(this.handleCodeResponseFromServer.bind(this), HandleCodeResponseFromServer, this.logger, this.performanceClient, request.correlationId)(authCodeResponse, request);
+        return invokeAsync(this.handleCodeResponseFromServer.bind(this), HandleCodeResponseFromServer, this.logger, this.performanceClient, request.correlationId)(authCodeResponse, request, apiId);
     }
     /**
      * Process auth code response from AAD
@@ -12107,7 +12157,7 @@ class InteractionHandler {
      * @param validateNonce
      * @returns
      */
-    async handleCodeResponseFromServer(authCodeResponse, request, validateNonce = true) {
+    async handleCodeResponseFromServer(authCodeResponse, request, apiId, validateNonce = true) {
         this.logger.trace("0mf2hb", request.correlationId);
         // Assign code to request
         this.authCodeRequest.code = authCodeResponse.code;
@@ -12128,7 +12178,7 @@ class InteractionHandler {
             }
         }
         // Acquire token with retrieved code.
-        const tokenResponse = (await invokeAsync(this.authModule.acquireToken.bind(this.authModule), AuthClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(this.authCodeRequest, authCodeResponse));
+        const tokenResponse = (await invokeAsync(this.authModule.acquireToken.bind(this.authModule), AuthClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(this.authCodeRequest, apiId, authCodeResponse));
         return tokenResponse;
     }
     /**
@@ -12662,7 +12712,7 @@ class PlatformAuthInteractionClient extends BaseInteractionClient {
      */
     async cacheAccount(accountEntity, kmsi) {
         // Store the account info and hence `nativeAccountId` in browser cache
-        await this.browserStorage.setAccount(accountEntity, this.correlationId, kmsi);
+        await this.browserStorage.setAccount(accountEntity, this.correlationId, kmsi, this.apiId);
         // Remove any existing cached tokens for this account in browser storage
         this.browserStorage.removeAccountContext(getAccountInfo(accountEntity), this.correlationId);
     }
@@ -12691,7 +12741,7 @@ class PlatformAuthInteractionClient extends BaseInteractionClient {
             idToken: cachedIdToken,
             accessToken: cachedAccessToken,
         };
-        return this.nativeStorageManager.saveCacheRecord(nativeCacheRecord, this.correlationId, isKmsi(idTokenClaims), request.storeInCache);
+        return this.nativeStorageManager.saveCacheRecord(nativeCacheRecord, this.correlationId, isKmsi(idTokenClaims), this.apiId, request.storeInCache);
     }
     getExpiresInValue(tokenType, expiresIn) {
         return tokenType === AuthenticationScheme$1.POP
@@ -13070,7 +13120,7 @@ async function handleResponseCode(request, response, codeVerifier, apiId, config
     // Create popup interaction handler.
     const interactionHandler = new InteractionHandler(authClient, browserStorage, authCodeRequest, logger, performanceClient);
     // Handle response from hash string.
-    const result = await invokeAsync(interactionHandler.handleCodeResponse.bind(interactionHandler), HandleCodeResponse, logger, performanceClient, request.correlationId)(response, request);
+    const result = await invokeAsync(interactionHandler.handleCodeResponse.bind(interactionHandler), HandleCodeResponse, logger, performanceClient, request.correlationId)(response, request, apiId);
     return result;
 }
 /**
@@ -13117,7 +13167,7 @@ async function handleResponseEAR(request, response, apiId, config, authority, br
         cloud_instance_name: decryptedData.cloud_instance_name,
         msgraph_host: decryptedData.msgraph_host,
     };
-    return (await invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), HandleServerTokenResponse, logger, performanceClient, request.correlationId)(decryptedData, authority, nowSeconds(), request, additionalData, undefined, undefined, undefined, undefined));
+    return (await invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), HandleServerTokenResponse, logger, performanceClient, request.correlationId)(decryptedData, authority, nowSeconds(), request, apiId, additionalData, undefined, undefined, undefined, undefined));
 }
 /*
@@ -15025,7 +15075,7 @@ class SilentRefreshClient extends StandardInteractionClient {
             account: silentRequest.account,
         });
         // Send request to renew token. Auth module will throw errors if token cannot be renewed.
-        return invokeAsync(refreshTokenClient.acquireTokenByRefreshToken.bind(refreshTokenClient), RefreshTokenClientAcquireTokenByRefreshToken, this.logger, this.performanceClient, request.correlationId)(silentRequest).catch((e) => {
+        return invokeAsync(refreshTokenClient.acquireTokenByRefreshToken.bind(refreshTokenClient), RefreshTokenClientAcquireTokenByRefreshToken, this.logger, this.performanceClient, request.correlationId)(silentRequest, ApiId.acquireTokenSilent_silentFlow).catch((e) => {
             e.setCorrelationId(this.correlationId);
             serverTelemetryManager.cacheFailedRequest(e);
             throw e;
@@ -15122,7 +15172,7 @@ class SilentAuthCodeClient extends StandardInteractionClient {
                 msgraph_host: request.msGraphHost,
                 cloud_graph_host_name: request.cloudGraphHostName,
                 cloud_instance_host_name: request.cloudInstanceHostName,
-            }, silentRequest, false);
+            }, silentRequest, this.apiId, false);
         }
         catch (e) {
             if (e instanceof AuthError) {
@@ -15935,7 +15985,7 @@ class StandardController {
         this.logger.verbose("16jycr", result.correlationId);
         // Account gets saved to browser storage regardless of native or not
         const accountEntity = createAccountEntityFromAccountInfo(result.account, result.cloudGraphHostName, result.msGraphHost);
-        await this.browserStorage.setAccount(accountEntity, result.correlationId, isKmsi(result.idTokenClaims));
+        await this.browserStorage.setAccount(accountEntity, result.correlationId, isKmsi(result.idTokenClaims), ApiId.hydrateCache);
         if (result.fromPlatformBroker) {
             this.logger.verbose("1fxyu8", result.correlationId);
             // Tokens from native broker are stored in-memory
@@ -17266,7 +17316,7 @@ class NestedAppAuthController {
     async hydrateCache(result, request) {
         this.logger.verbose("16jycr", result.correlationId);
         const accountEntity = createAccountEntityFromAccountInfo(result.account, result.cloudGraphHostName, result.msGraphHost);
-        await this.browserStorage.setAccount(accountEntity, result.correlationId, isKmsi(result.idTokenClaims));
+        await this.browserStorage.setAccount(accountEntity, result.correlationId, isKmsi(result.idTokenClaims), ApiId.hydrateCache);
         return this.browserStorage.hydrateCache(result, request);
     }
 }
@@ -17913,20 +17963,19 @@ async function loadExternalTokens(config, request, response, options, performanc
         const logger = new Logger(browserConfig.system.loggerOptions || {});
         const cryptoOps = new CryptoOps(logger, browserConfig.telemetry.client);
         const storage = new BrowserCacheManager(browserConfig.auth.clientId, browserConfig.cache, cryptoOps, logger, browserConfig.telemetry.client, new EventHandler(logger), buildStaticAuthorityOptions(browserConfig.auth));
-        const authority = request.authority
-            ? new Authority(Authority.generateAuthority(request.authority, request.azureCloudOptions), browserConfig.system.networkClient, storage, authorityOptions, logger, request.correlationId || createNewGuid(), browserConfig.telemetry.client)
-            : undefined;
-        const cacheRecordAccount = await invokeAsync(loadAccount, LoadAccount, logger, performanceClient, correlationId)(request, options.clientInfo || response.client_info || "", correlationId, storage, logger, cryptoOps, idTokenClaims, authority);
+        const authorityString = request.authority || browserConfig.auth.authority;
+        const authority = await createDiscoveredInstance(Authority.generateAuthority(authorityString, request.azureCloudOptions), browserConfig.system.networkClient, storage, authorityOptions, logger, correlationId, performanceClient);
+        const cacheRecordAccount = await invokeAsync(loadAccount, LoadAccount, logger, performanceClient, correlationId)(request, options.clientInfo || response.client_info || "", correlationId, storage, logger, cryptoOps, authority, idTokenClaims);
         const idToken = await invokeAsync(loadIdToken, LoadIdToken, logger, performanceClient, correlationId)(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, cacheRecordAccount.realm, kmsi, correlationId, storage, logger, config.auth.clientId);
         const accessToken = await invokeAsync(loadAccessToken, LoadAccessToken, logger, performanceClient, correlationId)(request, response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, cacheRecordAccount.realm, kmsi, options, correlationId, storage, logger, config.auth.clientId);
-        const refreshToken = await invokeAsync(loadRefreshToken, LoadRefreshToken, logger, performanceClient, correlationId)(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, kmsi, correlationId, storage, logger, config.auth.clientId);
+        const refreshToken = await invokeAsync(loadRefreshToken, LoadRefreshToken, logger, performanceClient, correlationId)(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, kmsi, correlationId, storage, logger, config.auth.clientId, performanceClient);
         rootMeasurement.end({ success: true }, undefined, getAccountInfo(cacheRecordAccount));
         return generateAuthenticationResult(request, {
             account: cacheRecordAccount,
             idToken,
             accessToken,
             refreshToken,
-        }, idTokenClaims, authority);
+        }, authority, idTokenClaims);
     }
     catch (error) {
         rootMeasurement.end({ success: false }, error);
@@ -17942,23 +17991,23 @@ async function loadExternalTokens(config, request, response, options, performanc
  * @param requestHomeAccountId
  * @returns `AccountEntity`
  */
-async function loadAccount(request, clientInfo, correlationId, storage, logger, cryptoObj, idTokenClaims, authority) {
+async function loadAccount(request, clientInfo, correlationId, storage, logger, cryptoObj, authority, idTokenClaims) {
     logger.verbose("0ke46k", correlationId);
     if (request.account) {
         const accountEntity = createAccountEntityFromAccountInfo(request.account);
-        await storage.setAccount(accountEntity, correlationId, isKmsi(idTokenClaims || {}));
+        await storage.setAccount(accountEntity, correlationId, isKmsi(idTokenClaims || {}), ApiId.loadExternalTokens);
         return accountEntity;
     }
-    else if (!authority || (!clientInfo && !idTokenClaims)) {
-        logger.error("1ychpz", correlationId);
+    else if (!clientInfo && !idTokenClaims) {
+        logger.error("0hzcn4", correlationId);
         throw createBrowserAuthError(unableToLoadToken);
     }
     const homeAccountId = generateHomeAccountId(clientInfo, authority.authorityType, logger, cryptoObj, correlationId, idTokenClaims);
     const claimsTenantId = idTokenClaims?.tid;
-    const cachedAccount = buildAccountToCache(storage, authority, homeAccountId, base64Decode, correlationId, idTokenClaims, clientInfo, authority.hostnameAndPort, claimsTenantId, undefined, // authCodePayload
+    const cachedAccount = buildAccountToCache(storage, authority, homeAccountId, base64Decode, correlationId, idTokenClaims, clientInfo, authority.getPreferredCache(), claimsTenantId, undefined, // authCodePayload
     undefined, // nativeAccountId
     logger);
-    await storage.setAccount(cachedAccount, correlationId, isKmsi(idTokenClaims || {}));
+    await storage.setAccount(cachedAccount, correlationId, isKmsi(idTokenClaims || {}), ApiId.loadExternalTokens);
     return cachedAccount;
 }
 /**
@@ -18021,14 +18070,20 @@ async function loadAccessToken(request, response, homeAccountId, environment, te
  * @param environment
  * @returns `RefreshTokenEntity`
  */
-async function loadRefreshToken(response, homeAccountId, environment, kmsi, correlationId, storage, logger, clientId) {
+async function loadRefreshToken(response, homeAccountId, environment, kmsi, correlationId, storage, logger, clientId, performanceClient) {
     if (!response.refresh_token) {
         logger.verbose("1l7um5", correlationId);
         return null;
     }
+    const expiresOn = response.refresh_token_expires_in
+        ? response.refresh_token_expires_in + nowSeconds()
+        : undefined;
+    performanceClient.addFields({
+        extRtExpiresOnSeconds: expiresOn,
+    }, correlationId);
     logger.verbose("0qy8ev", correlationId);
     const refreshTokenEntity = createRefreshTokenEntity(homeAccountId, environment, response.refresh_token, clientId, response.foci, undefined, // userAssertionHash
-    response.refresh_token_expires_in);
+    expiresOn);
     await storage.setRefreshTokenCredential(refreshTokenEntity, correlationId, kmsi);
     return refreshTokenEntity;
 }
@@ -18040,7 +18095,7 @@ async function loadRefreshToken(response, homeAccountId, environment, kmsi, corr
  * @param authority
  * @returns `AuthenticationResult`
  */
-function generateAuthenticationResult(request, cacheRecord, idTokenClaims, authority) {
+function generateAuthenticationResult(request, cacheRecord, authority, idTokenClaims) {
     let accessToken = "";
     let responseScopes = [];
     let expiresOn = null;
@@ -18054,7 +18109,7 @@ function generateAuthenticationResult(request, cacheRecord, idTokenClaims, autho
     }
     const accountEntity = cacheRecord.account;
     return {
-        authority: authority ? authority.canonicalAuthority : "",
+        authority: authority.canonicalAuthority,
         uniqueId: cacheRecord.account.localAccountId,
         tenantId: cacheRecord.account.realm,
         scopes: responseScopes,