npm - @azure/msal-browser - Versions diffs - 4.27.0 → 4.28.1 - Mend

@azure/msal-browser 4.27.0 → 4.28.1

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 (376) hide show

package/lib/custom-auth-path/msal-custom-auth.cjs CHANGED Viewed

@@ -1,8 +1,8 @@
-/*! @azure/msal-browser v4.27.0 2025-12-04 */
+/*! @azure/msal-browser v4.28.1 2026-01-17 */
 'use strict';
 'use strict';
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -276,7 +276,7 @@ const JsonWebTokenTypes = {
 // Token renewal offset default in seconds
 const DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -287,7 +287,7 @@ const DEFAULT_TOKEN_RENEWAL_OFFSET_SEC = 300;
 const unexpectedError = "unexpected_error";
 const postRequestFailed$1 = "post_request_failed";
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -322,7 +322,7 @@ function createAuthError(code, additionalMessage) {
         : AuthErrorMessages[code]);
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -373,7 +373,7 @@ const methodNotImplemented = "method_not_implemented";
 const nestedAppAuthBridgeDisabled = "nested_app_auth_bridge_disabled";
 const platformBrokerError = "platform_broker_error";
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -448,7 +448,7 @@ function createClientAuthError(errorCode, additionalMessage) {
     return new ClientAuthError(errorCode, additionalMessage);
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -487,7 +487,7 @@ const DEFAULT_CRYPTO_IMPLEMENTATION = {
     },
 };
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -678,12 +678,12 @@ class Logger {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /* eslint-disable header/header */
 const name$1 = "@azure/msal-common";
-const version$1 = "15.13.3";
+const version$1 = "15.14.1";
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -692,7 +692,7 @@ const AzureCloudInstance = {
     // AzureCloudInstance is not specified.
     None: "none"};
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -722,7 +722,7 @@ const invalidRequestMethodForEAR = "invalid_request_method_for_EAR";
 const invalidAuthorizePostBodyParameters = "invalid_authorize_post_body_parameters";
 const invalidPlatformBrokerConfiguration = "invalid_platform_broker_configuration";
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -768,7 +768,7 @@ function createClientConfigurationError(errorCode) {
     return new ClientConfigurationError(errorCode);
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -865,7 +865,7 @@ class StringUtils {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1060,7 +1060,7 @@ class ScopeSet {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1100,7 +1100,7 @@ function buildClientInfoFromHomeAccountId(homeAccountId) {
     };
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1182,7 +1182,7 @@ function updateAccountTenantProfileData(baseAccountInfo, tenantProfile, idTokenC
     return updatedAccountInfo;
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1197,7 +1197,7 @@ const AuthorityType = {
     Ciam: 3,
 };
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1219,7 +1219,7 @@ function getTenantIdFromIdTokenClaims(idTokenClaims) {
     return null;
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1243,7 +1243,7 @@ const ProtocolMode = {
     EAR: "EAR",
 };
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1277,6 +1277,13 @@ class AccountEntity {
      * Returns the AccountInfo interface for this account.
      */
     static 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,
@@ -1288,7 +1295,7 @@ class 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,
@@ -1389,7 +1396,14 @@ class AccountEntity {
         account.cloudGraphHostName = cloudGraphHostName;
         account.msGraphHost = msGraphHost;
         // Serialize tenant profiles map into an array
-        account.tenantProfiles = Array.from(accountInfo.tenantProfiles?.values() || []);
+        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));
+        }
+        account.tenantProfiles = tenantProfiles;
         account.dataBoundary = accountInfo.dataBoundary;
         return account;
     }
@@ -1464,7 +1478,7 @@ class AccountEntity {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1545,7 +1559,7 @@ function checkMaxAge(authTime, maxAge) {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1661,7 +1675,7 @@ function normalizeUrlForComparison(url) {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1825,7 +1839,7 @@ class UrlString {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1964,7 +1978,7 @@ function getCloudDiscoveryMetadataFromNetworkResponse(response, authorityHost) {
     return null;
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -1972,7 +1986,7 @@ function getCloudDiscoveryMetadataFromNetworkResponse(response, authorityHost) {
 const cacheQuotaExceeded = "cache_quota_exceeded";
 const cacheErrorUnknown = "cache_error_unknown";
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2017,7 +2031,7 @@ function createCacheError(e) {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2187,15 +2201,16 @@ class CacheManager {
      * @param cacheRecord {CacheRecord}
      * @param correlationId {?string} correlation id
      * @param kmsi - Keep Me Signed In
+     * @param apiId - API identifier for telemetry tracking
      * @param storeInCache {?StoreInCache}
      */
-    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);
@@ -3126,7 +3141,7 @@ class DefaultStorageClass extends CacheManager {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3383,6 +3398,11 @@ const PerformanceEvents = {
     Decrypt: "decrypt",
     GenerateEarKey: "generateEarKey",
     DecryptEarResponse: "decryptEarResponse",
+    LoadExternalTokens: "LoadExternalTokens",
+    LoadAccount: "loadAccount",
+    LoadIdToken: "loadIdToken",
+    LoadAccessToken: "loadAccessToken",
+    LoadRefreshToken: "loadRefreshToken",
 };
 /**
  * State of the performance event.
@@ -3393,7 +3413,7 @@ const PerformanceEvents = {
 const PerformanceEventStatus = {
     InProgress: 1};
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3472,7 +3492,7 @@ class StubPerformanceClient {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3572,7 +3592,7 @@ function isOidcProtocolMode(config) {
     return (config.authOptions.authority.options.protocolMode === ProtocolMode.OIDC);
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3582,7 +3602,7 @@ const CcsCredentialType = {
     UPN: "UPN",
 };
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -3632,7 +3652,7 @@ const INSTANCE_AWARE = "instance_aware";
 const EAR_JWK = "ear_jwk";
 const EAR_JWE_CRYPTO = "ear_jwe_crypto";
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4012,7 +4032,7 @@ function addPostBodyParameters(parameters, bodyParameters) {
     });
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4024,7 +4044,7 @@ function isOpenIdConfigResponse(response) {
         response.hasOwnProperty("jwks_uri"));
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4034,7 +4054,7 @@ function isCloudInstanceDiscoveryResponse(response) {
         response.hasOwnProperty("metadata"));
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4044,7 +4064,7 @@ function isCloudInstanceDiscoveryErrorResponse(response) {
         response.hasOwnProperty("error_description"));
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4140,7 +4160,7 @@ const invokeAsync = (callback, eventName, logger, telemetryClient, correlationId
     };
 };
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4246,7 +4266,7 @@ RegionDiscovery.IMDS_OPTIONS = {
     },
 };
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -4311,7 +4331,7 @@ function wasClockTurnedBack(cachedAt) {
     return cachedAtSec > nowSeconds();
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4573,7 +4593,7 @@ function isAuthorityMetadataExpired(metadata) {
     return metadata.expiresAt <= nowSeconds();
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5412,7 +5432,7 @@ function buildStaticAuthorityOptions(authOptions) {
     };
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5443,7 +5463,7 @@ async function createDiscoveredInstance(authorityUri, networkClient, cacheManage
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5462,7 +5482,7 @@ class ServerError extends AuthError {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5483,7 +5503,7 @@ function getRequestThumbprint(clientId, request, homeAccountId) {
     };
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5570,7 +5590,7 @@ class ThrottlingUtils {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5601,7 +5621,7 @@ function createNetworkError(error, httpStatus, responseHeaders, additionalError)
     return new NetworkError(error, httpStatus, responseHeaders);
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5749,7 +5769,7 @@ class BaseClient {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -5765,7 +5785,7 @@ const consentRequired = "consent_required";
 const loginRequired = "login_required";
 const badToken = "bad_token";
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5837,7 +5857,7 @@ function createInteractionRequiredAuthError(errorCode) {
     return new InteractionRequiredAuthError(errorCode, InteractionRequiredAuthErrorMessages[errorCode]);
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5909,7 +5929,7 @@ class ProtocolUtils {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5991,7 +6011,7 @@ class PopTokenGenerator {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6018,7 +6038,7 @@ class PopTokenGenerator {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6082,7 +6102,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) {
         this.performanceClient?.addQueueMeasurement(PerformanceEvents.HandleServerTokenResponse, serverTokenResponse.correlation_id);
         // create an idToken object (not entity)
         let idTokenClaims;
@@ -6130,14 +6150,19 @@ class ResponseHandler {
             if (handlingRefreshTokenResponse &&
                 !forceCacheRefreshTokenResponse &&
                 cacheRecord.account) {
-                const key = this.cacheStorage.generateAccountKey(AccountEntity.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("Account used to refresh tokens not in persistence, refreshed tokens will not be stored in the cache");
+                    this.performanceClient?.addFields({
+                        acntLoggedOut: true,
+                    }, request.correlationId);
                     return await ResponseHandler.generateAuthenticationResult(this.cryptoObj, authority, cacheRecord, false, request, 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 &&
@@ -6207,6 +6232,9 @@ class ResponseHandler {
                     ? parseInt(serverTokenResponse.refresh_token_expires_in, 10)
                     : serverTokenResponse.refresh_token_expires_in;
                 rtExpiresOn = reqTimestamp + rtExpiresIn;
+                this.performanceClient?.addFields({
+                    ntwkRtExpiresOnSeconds: rtExpiresOn,
+                }, request.correlationId);
             }
             cachedRefreshToken = createRefreshTokenEntity(this.homeAccountIdentifier, env, serverTokenResponse.refresh_token, this.clientId, serverTokenResponse.foci, userAssertionHash, rtExpiresOn);
         }
@@ -6349,7 +6377,7 @@ function buildAccountToCache(cacheStorage, authority, homeAccountId, base64Decod
     return baseAccount;
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -6367,7 +6395,7 @@ async function getClientAssertion(clientAssertion, clientId, tokenEndpoint) {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6389,8 +6417,9 @@ class AuthorizationCodeClient extends BaseClient {
      * API to acquire a token in exchange of 'authorization_code` acquired by the user in the first leg of the
      * authorization_code_grant
      * @param request
+     * @param apiId - API identifier for telemetry tracking
      */
-    async acquireToken(request, authCodePayload) {
+    async acquireToken(request, apiId, authCodePayload) {
         this.performanceClient?.addQueueMeasurement(PerformanceEvents.AuthClientAcquireToken, request.correlationId);
         if (!request.code) {
             throw createClientAuthError(requestCannotBeMade);
@@ -6402,7 +6431,7 @@ class AuthorizationCodeClient extends BaseClient {
         const responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin, this.performanceClient);
         // Validate response. This function throws a server error if an error is returned by the server.
         responseHandler.validateTokenResponse(response.body);
-        return invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), PerformanceEvents.HandleServerTokenResponse, this.logger, this.performanceClient, request.correlationId)(response.body, this.authority, reqTimestamp, request, authCodePayload, undefined, undefined, undefined, requestId);
+        return invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), PerformanceEvents.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.
@@ -6602,7 +6631,7 @@ class AuthorizationCodeClient extends BaseClient {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6617,7 +6646,7 @@ class RefreshTokenClient extends BaseClient {
     constructor(configuration, performanceClient) {
         super(configuration, performanceClient);
     }
-    async acquireToken(request) {
+    async acquireToken(request, apiId) {
         this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientAcquireToken, request.correlationId);
         const reqTimestamp = nowSeconds();
         const response = await invokeAsync(this.executeTokenRequest.bind(this), PerformanceEvents.RefreshTokenClientExecuteTokenRequest, this.logger, this.performanceClient, request.correlationId)(request, this.authority);
@@ -6625,13 +6654,13 @@ class RefreshTokenClient extends BaseClient {
         const requestId = response.headers?.[HeaderNames.X_MS_REQUEST_ID];
         const responseHandler = new ResponseHandler(this.config.authOptions.clientId, this.cacheManager, this.cryptoUtils, this.logger, this.config.serializableCache, this.config.persistencePlugin);
         responseHandler.validateTokenResponse(response.body);
-        return invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), PerformanceEvents.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), PerformanceEvents.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);
@@ -6646,7 +6675,7 @@ class RefreshTokenClient extends BaseClient {
         // 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), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, true);
+                return await invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, true, apiId);
             }
             catch (e) {
                 const noFamilyRTInCache = e instanceof InteractionRequiredAuthError &&
@@ -6657,7 +6686,7 @@ class RefreshTokenClient extends BaseClient {
                     e.subError === Errors.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), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false);
+                    return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false, apiId);
                     // throw in all other cases
                 }
                 else {
@@ -6666,26 +6695,30 @@ class RefreshTokenClient extends BaseClient {
             }
         }
         // fall back to application refresh token acquisition
-        return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, this.logger, this.performanceClient, request.correlationId)(request, false);
+        return invokeAsync(this.acquireTokenWithCachedRefreshToken.bind(this), PerformanceEvents.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) {
         this.performanceClient?.addQueueMeasurement(PerformanceEvents.RefreshTokenClientAcquireTokenWithCachedRefreshToken, request.correlationId);
         // fetches family RT or application RT based on FOCI value
         const refreshToken = invoke(this.cacheManager.getRefreshToken.bind(this.cacheManager), PerformanceEvents.CacheManagerGetRefreshToken, this.logger, this.performanceClient, request.correlationId)(request.account, foci, request.correlationId, undefined, this.performanceClient);
         if (!refreshToken) {
             throw createInteractionRequiredAuthError(noTokensFound);
         }
-        if (refreshToken.expiresOn &&
-            isTokenExpired(refreshToken.expiresOn, request.refreshTokenExpirationOffsetSeconds ||
-                DEFAULT_REFRESH_TOKEN_EXPIRATION_OFFSET_SECONDS)) {
-            this.performanceClient?.addFields({ rtExpiresOnMs: Number(refreshToken.expiresOn) }, request.correlationId);
-            throw createInteractionRequiredAuthError(refreshTokenExpired);
+        if (refreshToken.expiresOn) {
+            const offset = request.refreshTokenExpirationOffsetSeconds ||
+                DEFAULT_REFRESH_TOKEN_EXPIRATION_OFFSET_SECONDS;
+            this.performanceClient?.addFields({
+                cacheRtExpiresOnSeconds: Number(refreshToken.expiresOn),
+                rtOffsetSeconds: offset,
+            }, request.correlationId);
+            if (isTokenExpired(refreshToken.expiresOn, offset)) {
+                throw createInteractionRequiredAuthError(refreshTokenExpired);
+            }
         }
-        // attach cached RT size to the current measurement
         const refreshTokenRequest = {
             ...request,
             refreshToken: refreshToken.secret,
@@ -6696,11 +6729,10 @@ class RefreshTokenClient extends BaseClient {
             },
         };
         try {
-            return await invokeAsync(this.acquireToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(refreshTokenRequest);
+            return await invokeAsync(this.acquireToken.bind(this), PerformanceEvents.RefreshTokenClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(refreshTokenRequest, apiId);
         }
         catch (e) {
             if (e instanceof InteractionRequiredAuthError) {
-                this.performanceClient?.addFields({ rtExpiresOnMs: Number(refreshToken.expiresOn) }, request.correlationId);
                 if (e.subError === badToken) {
                     // Remove bad refresh token from cache
                     this.logger.verbose("acquireTokenWithRefreshToken: bad refresh token, removing from cache");
@@ -6811,7 +6843,7 @@ class RefreshTokenClient extends BaseClient {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6909,7 +6941,7 @@ class SilentFlowClient extends BaseClient {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6924,7 +6956,7 @@ const StubbedNetworkModule = {
     },
 };
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7148,7 +7180,7 @@ function extractLoginHint(account) {
     return account.loginHint || account.idTokenClaims?.login_hint || null;
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7411,7 +7443,7 @@ class ServerTelemetryManager {
     }
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
@@ -7419,7 +7451,7 @@ class ServerTelemetryManager {
 const missingKidError = "missing_kid_error";
 const missingAlgError = "missing_alg_error";
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7444,7 +7476,7 @@ function createJoseHeaderError(code) {
     return new JoseHeaderError(code, JoseHeaderErrorMessages[code]);
 }
-/*! @azure/msal-common v15.13.3 2025-12-04 */
+/*! @azure/msal-common v15.14.1 2026-01-17 */
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7879,7 +7911,7 @@ function ensureArgumentIsJSONString(argName, argValue, correlationId) {
 /* eslint-disable header/header */
 const name = "@azure/msal-browser";
-const version = "4.27.0";
+const version = "4.28.1";
 /*
  * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -8463,9 +8495,9 @@ const InMemoryCacheKeys = {
 };
 /**
  * API Codes for Telemetry purposes.
- * 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 Miscellaneous
  */
 const ApiId = {
     acquireTokenRedirect: 861,
@@ -8477,6 +8509,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
@@ -9690,7 +9746,7 @@ class CustomAuthInteractionClientBase extends StandardInteractionClient {
      * @param correlationId Correlation ID for logging
      * @returns Authentication result from the token response
      */
-    async handleTokenResponse(tokenResponse, requestScopes, correlationId) {
+    async handleTokenResponse(tokenResponse, requestScopes, correlationId, apiId) {
         this.logger.verbose("Processing token response.", correlationId);
         const requestTimestamp = Math.round(new Date().getTime() / 1000.0);
         // Save tokens and create authentication result
@@ -9698,7 +9754,7 @@ class CustomAuthInteractionClientBase extends StandardInteractionClient {
             authority: this.customAuthAuthority.canonicalAuthority,
             correlationId: tokenResponse.correlation_id ?? correlationId,
             scopes: requestScopes,
-        });
+        }, apiId);
         return result;
     }
     // It is not necessary to implement this method from base class.
@@ -9874,7 +9930,7 @@ class SignInClient extends CustomAuthInteractionClientBase {
                 claims: parameters.claims,
             }),
         };
-        return this.performTokenRequest(() => this.customAuthApiClient.signInApi.requestTokensWithOob(request), scopes, parameters.correlationId, telemetryManager);
+        return this.performTokenRequest(() => this.customAuthApiClient.signInApi.requestTokensWithOob(request), scopes, parameters.correlationId, telemetryManager, apiId);
     }
     /**
      * Submits the password for sign-in flow.
@@ -9896,7 +9952,7 @@ class SignInClient extends CustomAuthInteractionClientBase {
                 claims: parameters.claims,
             }),
         };
-        return this.performTokenRequest(() => this.customAuthApiClient.signInApi.requestTokensWithPassword(request), scopes, parameters.correlationId, telemetryManager);
+        return this.performTokenRequest(() => this.customAuthApiClient.signInApi.requestTokensWithPassword(request), scopes, parameters.correlationId, telemetryManager, apiId);
     }
     /**
      * Signs in with continuation token.
@@ -9919,7 +9975,7 @@ class SignInClient extends CustomAuthInteractionClientBase {
             }),
         };
         // Call token endpoint.
-        return this.performTokenRequest(() => this.customAuthApiClient.signInApi.requestTokenWithContinuationToken(request), scopes, parameters.correlationId, telemetryManager);
+        return this.performTokenRequest(() => this.customAuthApiClient.signInApi.requestTokenWithContinuationToken(request), scopes, parameters.correlationId, telemetryManager, apiId);
     }
     /**
      * Common method to handle token endpoint calls and create sign-in results.
@@ -9929,12 +9985,12 @@ class SignInClient extends CustomAuthInteractionClientBase {
      * @param telemetryManager Telemetry manager for telemetry logging
      * @returns SignInCompletedResult | SignInJitRequiredResult | SignInMfaRequiredResult with authentication result
      */
-    async performTokenRequest(tokenEndpointCaller, scopes, correlationId, telemetryManager) {
+    async performTokenRequest(tokenEndpointCaller, scopes, correlationId, telemetryManager, apiId) {
         this.logger.verbose("Calling token endpoint for sign in.", correlationId);
         try {
             const tokenResponse = await tokenEndpointCaller();
             this.logger.verbose("Token endpoint response received for sign in.", correlationId);
-            const authResult = await this.handleTokenResponse(tokenResponse, scopes, correlationId);
+            const authResult = await this.handleTokenResponse(tokenResponse, scopes, correlationId, apiId);
             return createSignInCompleteResult({
                 correlationId: tokenResponse.correlation_id ?? correlationId,
                 authenticationResult: authResult,
@@ -11555,7 +11611,7 @@ class JitClient extends CustomAuthInteractionClientBase {
             }),
         };
         const tokenResponse = await this.customAuthApiClient.signInApi.requestTokenWithContinuationToken(tokenRequest);
-        const authResult = await this.handleTokenResponse(tokenResponse, scopes, tokenResponse.correlation_id || continueResponse.correlation_id);
+        const authResult = await this.handleTokenResponse(tokenResponse, scopes, tokenResponse.correlation_id || continueResponse.correlation_id, apiId);
         return createJitCompletedResult({
             correlationId: continueResponse.correlation_id,
             authenticationResult: authResult,
@@ -11648,7 +11704,7 @@ class MfaClient extends CustomAuthInteractionClientBase {
         this.logger.verbose("Calling token endpoint for MFA challenge submission.", parameters.correlationId);
         const tokenResponse = await this.customAuthApiClient.signInApi.requestTokensWithOob(request);
         // Save tokens and create authentication result
-        const result = await this.handleTokenResponse(tokenResponse, scopes, tokenResponse.correlation_id ?? parameters.correlationId);
+        const result = await this.handleTokenResponse(tokenResponse, scopes, tokenResponse.correlation_id ?? parameters.correlationId, apiId);
         return createMfaCompletedResult({
             correlationId: parameters.correlationId,
             authenticationResult: result,
@@ -11699,7 +11755,7 @@ class CustomAuthSilentCacheClient extends CustomAuthInteractionClientBase {
                 this.logger.verbose("Token refresh is required to acquire token silently", correlationId);
                 const refreshTokenClient = new RefreshTokenClient(clientConfig, this.performanceClient);
                 this.logger.verbose("Starting refresh flow to refresh token", correlationId);
-                const refreshTokenResult = await refreshTokenClient.acquireTokenByRefreshToken(silentRequest);
+                const refreshTokenResult = await refreshTokenClient.acquireTokenByRefreshToken(silentRequest, ACCOUNT_GET_ACCESS_TOKEN);
                 this.logger.verbose("Refresh flow to refresh token is completed", correlationId);
                 return refreshTokenResult;
             }
@@ -15226,17 +15282,21 @@ class BrowserCacheManager extends CacheManager {
         if (!parsedAccount || !AccountEntity.isAccountEntity(parsedAccount)) {
             return null;
         }
+        this.performanceClient.addFields({
+            accountCachedBy: apiIdToName(parsedAccount.cachedByApiId),
+        }, correlationId);
         return CacheManager.toObject(new AccountEntity(), parsedAccount);
     }
     /**
      * set account entity in the platform cache
      * @param account
      */
-    async setAccount(account, correlationId, kmsi) {
+    async setAccount(account, correlationId, kmsi, apiId) {
         this.logger.trace("BrowserCacheManager.setAccount called");
         const key = this.generateAccountKey(AccountEntity.getAccountInfo(account));
         const timestamp = Date.now().toString();
         account.lastUpdatedAt = timestamp;
+        account.cachedByApiId = apiId;
         await this.setUserData(key, JSON.stringify(account), correlationId, timestamp, kmsi);
         const wasAdded = this.addAccountKeyToMap(key, correlationId);
         this.performanceClient.addFields({ kmsi: kmsi }, correlationId);
@@ -15991,7 +16051,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);
         let claimsHash;
         if (request.claims) {
             claimsHash = await this.cryptoImpl.hashString(request.claims);
@@ -16003,7 +16063,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)
@@ -16016,7 +16076,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
@@ -16024,9 +16084,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 &&
@@ -16386,7 +16446,7 @@ class InteractionHandler {
      * Function to handle response parameters from hash.
      * @param locationHash
      */
-    async handleCodeResponse(response, request) {
+    async handleCodeResponse(response, request, apiId) {
         this.performanceClient.addQueueMeasurement(PerformanceEvents.HandleCodeResponse, request.correlationId);
         let authCodeResponse;
         try {
@@ -16402,7 +16462,7 @@ class InteractionHandler {
                 throw e;
             }
         }
-        return invokeAsync(this.handleCodeResponseFromServer.bind(this), PerformanceEvents.HandleCodeResponseFromServer, this.logger, this.performanceClient, request.correlationId)(authCodeResponse, request);
+        return invokeAsync(this.handleCodeResponseFromServer.bind(this), PerformanceEvents.HandleCodeResponseFromServer, this.logger, this.performanceClient, request.correlationId)(authCodeResponse, request, apiId);
     }
     /**
      * Process auth code response from AAD
@@ -16412,7 +16472,7 @@ class InteractionHandler {
      * @param networkModule
      * @returns
      */
-    async handleCodeResponseFromServer(authCodeResponse, request, validateNonce = true) {
+    async handleCodeResponseFromServer(authCodeResponse, request, apiId, validateNonce = true) {
         this.performanceClient.addQueueMeasurement(PerformanceEvents.HandleCodeResponseFromServer, request.correlationId);
         this.logger.trace("InteractionHandler.handleCodeResponseFromServer called");
         // Assign code to request
@@ -16438,7 +16498,7 @@ class InteractionHandler {
             }
         }
         // Acquire token with retrieved code.
-        const tokenResponse = (await invokeAsync(this.authModule.acquireToken.bind(this.authModule), PerformanceEvents.AuthClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(this.authCodeRequest, authCodeResponse));
+        const tokenResponse = (await invokeAsync(this.authModule.acquireToken.bind(this.authModule), PerformanceEvents.AuthClientAcquireToken, this.logger, this.performanceClient, request.correlationId)(this.authCodeRequest, apiId, authCodeResponse));
         return tokenResponse;
     }
     /**
@@ -16986,7 +17046,7 @@ class PlatformAuthInteractionClient extends BaseInteractionClient {
      */
     async cacheAccount(accountEntity, correlationId, 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(AccountEntity.getAccountInfo(accountEntity), correlationId);
     }
@@ -17015,7 +17075,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.POP
@@ -17390,7 +17450,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), PerformanceEvents.HandleCodeResponse, logger, performanceClient, request.correlationId)(response, request);
+    const result = await invokeAsync(interactionHandler.handleCodeResponse.bind(interactionHandler), PerformanceEvents.HandleCodeResponse, logger, performanceClient, request.correlationId)(response, request, apiId);
     return result;
 }
 /**
@@ -17437,7 +17497,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), PerformanceEvents.HandleServerTokenResponse, logger, performanceClient, request.correlationId)(decryptedData, authority, nowSeconds(), request, additionalData, undefined, undefined, undefined, undefined));
+    return (await invokeAsync(responseHandler.handleServerTokenResponse.bind(responseHandler), PerformanceEvents.HandleServerTokenResponse, logger, performanceClient, request.correlationId)(decryptedData, authority, nowSeconds(), request, apiId, additionalData, undefined, undefined, undefined, undefined));
 }
 /*
@@ -19528,7 +19588,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), PerformanceEvents.RefreshTokenClientAcquireTokenByRefreshToken, this.logger, this.performanceClient, request.correlationId)(silentRequest).catch((e) => {
+        return invokeAsync(refreshTokenClient.acquireTokenByRefreshToken.bind(refreshTokenClient), PerformanceEvents.RefreshTokenClientAcquireTokenByRefreshToken, this.logger, this.performanceClient, request.correlationId)(silentRequest, ApiId.acquireTokenSilent_silentFlow).catch((e) => {
             e.setCorrelationId(this.correlationId);
             serverTelemetryManager.cacheFailedRequest(e);
             throw e;
@@ -19572,12 +19632,13 @@ class SilentRefreshClient extends StandardInteractionClient {
  * Token cache manager
  */
 class TokenCache {
-    constructor(configuration, storage, logger, cryptoObj) {
+    constructor(configuration, storage, logger, cryptoObj, performanceClient) {
         this.isBrowserEnvironment = typeof window !== "undefined";
         this.config = configuration;
         this.storage = storage;
         this.logger = logger;
         this.cryptoObj = cryptoObj;
+        this.performanceClient = performanceClient;
     }
     // Move getAllAccounts here and cache utility APIs
     /**
@@ -19592,30 +19653,37 @@ class TokenCache {
             throw createBrowserAuthError(nonBrowserEnvironment);
         }
         const correlationId = request.correlationId || createNewGuid();
-        const idTokenClaims = response.id_token
-            ? extractTokenClaims(response.id_token, base64Decode)
-            : undefined;
-        const kmsi = isKmsi(idTokenClaims || {});
-        const authorityOptions = {
-            protocolMode: this.config.auth.protocolMode,
-            knownAuthorities: this.config.auth.knownAuthorities,
-            cloudDiscoveryMetadata: this.config.auth.cloudDiscoveryMetadata,
-            authorityMetadata: this.config.auth.authorityMetadata,
-            skipAuthorityMetadataCache: this.config.auth.skipAuthorityMetadataCache,
-        };
-        const authority = request.authority
-            ? new Authority(Authority.generateAuthority(request.authority, request.azureCloudOptions), this.config.system.networkClient, this.storage, authorityOptions, this.logger, request.correlationId || createNewGuid())
-            : undefined;
-        const cacheRecordAccount = await this.loadAccount(request, options.clientInfo || response.client_info || "", correlationId, idTokenClaims, authority);
-        const idToken = await this.loadIdToken(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, cacheRecordAccount.realm, correlationId, kmsi);
-        const accessToken = await this.loadAccessToken(request, response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, cacheRecordAccount.realm, options, correlationId, kmsi);
-        const refreshToken = await this.loadRefreshToken(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, correlationId, kmsi);
-        return this.generateAuthenticationResult(request, {
-            account: cacheRecordAccount,
-            idToken,
-            accessToken,
-            refreshToken,
-        }, idTokenClaims, authority);
+        const rootMeasurement = this.performanceClient.startMeasurement(PerformanceEvents.LoadExternalTokens, correlationId);
+        try {
+            const idTokenClaims = response.id_token
+                ? extractTokenClaims(response.id_token, base64Decode)
+                : undefined;
+            const kmsi = isKmsi(idTokenClaims || {});
+            const authorityOptions = {
+                protocolMode: this.config.auth.protocolMode,
+                knownAuthorities: this.config.auth.knownAuthorities,
+                cloudDiscoveryMetadata: this.config.auth.cloudDiscoveryMetadata,
+                authorityMetadata: this.config.auth.authorityMetadata,
+                skipAuthorityMetadataCache: this.config.auth.skipAuthorityMetadataCache,
+            };
+            const authorityString = request.authority || this.config.auth.authority;
+            const authority = await createDiscoveredInstance(Authority.generateAuthority(authorityString, request.azureCloudOptions), this.config.system.networkClient, this.storage, authorityOptions, this.logger, correlationId, this.performanceClient);
+            const cacheRecordAccount = await invokeAsync(this.loadAccount.bind(this), PerformanceEvents.LoadAccount, this.logger, this.performanceClient, correlationId)(request, options.clientInfo || response.client_info || "", correlationId, authority, idTokenClaims);
+            const idToken = await invokeAsync(this.loadIdToken.bind(this), PerformanceEvents.LoadIdToken, this.logger, this.performanceClient, correlationId)(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, cacheRecordAccount.realm, correlationId, kmsi);
+            const accessToken = await invokeAsync(this.loadAccessToken.bind(this), PerformanceEvents.LoadAccessToken, this.logger, this.performanceClient, correlationId)(request, response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, cacheRecordAccount.realm, options, correlationId, kmsi);
+            const refreshToken = await invokeAsync(this.loadRefreshToken.bind(this), PerformanceEvents.LoadRefreshToken, this.logger, this.performanceClient, correlationId)(response, cacheRecordAccount.homeAccountId, cacheRecordAccount.environment, correlationId, kmsi);
+            rootMeasurement.end({ success: true }, undefined, AccountEntity.getAccountInfo(cacheRecordAccount));
+            return this.generateAuthenticationResult(request, {
+                account: cacheRecordAccount,
+                idToken,
+                accessToken,
+                refreshToken,
+            }, authority, idTokenClaims);
+        }
+        catch (error) {
+            rootMeasurement.end({ success: false }, error);
+            throw error;
+        }
     }
     /**
      * Helper function to load account to msal-browser cache
@@ -19626,23 +19694,23 @@ class TokenCache {
      * @param requestHomeAccountId
      * @returns `AccountEntity`
      */
-    async loadAccount(request, clientInfo, correlationId, idTokenClaims, authority) {
+    async loadAccount(request, clientInfo, correlationId, authority, idTokenClaims) {
         this.logger.verbose("TokenCache - loading account");
         if (request.account) {
             const accountEntity = AccountEntity.createFromAccountInfo(request.account);
-            await this.storage.setAccount(accountEntity, correlationId, isKmsi(idTokenClaims || {}));
+            await this.storage.setAccount(accountEntity, correlationId, isKmsi(idTokenClaims || {}), ApiId.loadExternalTokens);
             return accountEntity;
         }
-        else if (!authority || (!clientInfo && !idTokenClaims)) {
-            this.logger.error("TokenCache - if an account is not provided on the request, authority and either clientInfo or idToken must be provided instead.");
+        else if (!clientInfo && !idTokenClaims) {
+            this.logger.error("TokenCache - if an account is not provided on the request, clientInfo or idToken must be provided instead.");
             throw createBrowserAuthError(unableToLoadToken);
         }
         const homeAccountId = AccountEntity.generateHomeAccountId(clientInfo, authority.authorityType, this.logger, this.cryptoObj, idTokenClaims);
         const claimsTenantId = idTokenClaims?.tid;
-        const cachedAccount = buildAccountToCache(this.storage, authority, homeAccountId, base64Decode, correlationId, idTokenClaims, clientInfo, authority.hostnameAndPort, claimsTenantId, undefined, // authCodePayload
+        const cachedAccount = buildAccountToCache(this.storage, authority, homeAccountId, base64Decode, correlationId, idTokenClaims, clientInfo, authority.getPreferredCache(), claimsTenantId, undefined, // authCodePayload
         undefined, // nativeAccountId
         this.logger);
-        await this.storage.setAccount(cachedAccount, correlationId, isKmsi(idTokenClaims || {}));
+        await this.storage.setAccount(cachedAccount, correlationId, isKmsi(idTokenClaims || {}), ApiId.loadExternalTokens);
         return cachedAccount;
     }
     /**
@@ -19711,9 +19779,15 @@ class TokenCache {
             this.logger.verbose("TokenCache - no refresh token found in response");
             return null;
         }
+        const expiresOn = response.refresh_token_expires_in
+            ? response.refresh_token_expires_in + nowSeconds()
+            : undefined;
+        this.performanceClient.addFields({
+            extRtExpiresOnSeconds: expiresOn,
+        }, correlationId);
         this.logger.verbose("TokenCache - loading refresh token");
         const refreshTokenEntity = createRefreshTokenEntity(homeAccountId, environment, response.refresh_token, this.config.auth.clientId, response.foci, undefined, // userAssertionHash
-        response.refresh_token_expires_in);
+        expiresOn);
         await this.storage.setRefreshTokenCredential(refreshTokenEntity, correlationId, kmsi);
         return refreshTokenEntity;
     }
@@ -19725,7 +19799,7 @@ class TokenCache {
      * @param authority
      * @returns `AuthenticationResult`
      */
-    generateAuthenticationResult(request, cacheRecord, idTokenClaims, authority) {
+    generateAuthenticationResult(request, cacheRecord, authority, idTokenClaims) {
         let accessToken = "";
         let responseScopes = [];
         let expiresOn = null;
@@ -19818,7 +19892,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) {
@@ -19931,7 +20005,7 @@ class StandardController {
         };
         this.nativeInternalStorage = new BrowserCacheManager(this.config.auth.clientId, nativeCacheOptions, this.browserCrypto, this.logger, this.performanceClient, this.eventHandler);
         // Initialize the token cache
-        this.tokenCache = new TokenCache(this.config, this.browserStorage, this.logger, this.browserCrypto);
+        this.tokenCache = new TokenCache(this.config, this.browserStorage, this.logger, this.browserCrypto, this.performanceClient);
         this.activeSilentTokenRequests = new Map();
         // Register listener functions
         this.trackPageVisibility = this.trackPageVisibility.bind(this);
@@ -20761,7 +20835,7 @@ class StandardController {
         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);
-        await this.browserStorage.setAccount(accountEntity, result.correlationId, isKmsi(result.idTokenClaims));
+        await this.browserStorage.setAccount(accountEntity, result.correlationId, isKmsi(result.idTokenClaims), ApiId.hydrateCache);
         if (result.fromNativeBroker) {
             this.logger.verbose("Response was from native broker, storing in-memory");
             // Tokens from native broker are stored in-memory