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

@azure/msal-browser 5.0.2 → 5.2.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 (453) hide show

package/lib/msal-browser.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/*! @azure/msal-browser v5.0.2 2026-01-17 */
+/*! @azure/msal-browser v5.2.0 2026-02-10 */
 'use strict';
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -6,7 +6,7 @@
     (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.msal = {}));
 })(this, (function (exports) { 'use strict';
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -238,7 +238,7 @@
     // 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.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -288,7 +288,7 @@
     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.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -319,7 +319,7 @@
         return new AuthError(code, additionalMessage || getDefaultErrorMessage$1(code));
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -339,7 +339,7 @@
         return new ClientConfigurationError(errorCode);
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -436,7 +436,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -459,7 +459,7 @@
         return new ClientAuthError(errorCode, additionalMessage);
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -513,7 +513,7 @@
         urlParseError: urlParseError
     });
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -597,7 +597,7 @@
         userCanceled: userCanceled
     });
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -792,7 +792,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1159,7 +1159,7 @@
         parameters.set(EAR_JWE_CRYPTO, jweCryptoB64Encoded);
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1268,7 +1268,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1307,7 +1307,7 @@
         },
     };
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1582,12 +1582,12 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /* eslint-disable header/header */
     const name$1 = "@azure/msal-common";
-    const version$1 = "16.0.2";
+    const version$1 = "16.0.4";
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1607,7 +1607,7 @@
         AzureUsGovernment: "https://login.microsoftonline.us",
     };
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -1689,7 +1689,7 @@
         return updatedAccountInfo;
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1769,7 +1769,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1926,7 +1926,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1997,6 +1997,21 @@
                     preferred_cache: "login-us.microsoftonline.com",
                     aliases: ["login-us.microsoftonline.com"],
                 },
+                {
+                    preferred_network: "login.sovcloud-identity.fr",
+                    preferred_cache: "login.sovcloud-identity.fr",
+                    aliases: ["login.sovcloud-identity.fr"],
+                },
+                {
+                    preferred_network: "login.sovcloud-identity.de",
+                    preferred_cache: "login.sovcloud-identity.de",
+                    aliases: ["login.sovcloud-identity.de"],
+                },
+                {
+                    preferred_network: "login.sovcloud-identity.sg",
+                    preferred_cache: "login.sovcloud-identity.sg",
+                    aliases: ["login.sovcloud-identity.sg"],
+                },
             ],
         },
     };
@@ -2068,7 +2083,7 @@
         return null;
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2076,7 +2091,7 @@
     const cacheQuotaExceeded = "cache_quota_exceeded";
     const cacheErrorUnknown = "cache_error_unknown";
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2114,7 +2129,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2152,7 +2167,7 @@
         };
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2167,7 +2182,7 @@
         Ciam: 3,
     };
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2189,7 +2204,7 @@
         return null;
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -2213,11 +2228,18 @@
         EAR: "EAR",
     };
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /**
      * 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,
@@ -2229,7 +2251,7 @@
             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,
@@ -2318,6 +2340,14 @@
      * @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,
@@ -2330,7 +2360,7 @@
             name: accountInfo.name,
             cloudGraphHostName: cloudGraphHostName,
             msGraphHost: msGraphHost,
-            tenantProfiles: Array.from(accountInfo.tenantProfiles?.values() || []),
+            tenantProfiles: tenantProfiles,
             dataBoundary: accountInfo.dataBoundary,
         };
     }
@@ -2373,7 +2403,7 @@
             entity.hasOwnProperty("authorityType"));
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -2539,13 +2569,13 @@
          * @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);
@@ -3470,7 +3500,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3511,7 +3541,7 @@
         "upgradedCacheCount",
     ]);
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3566,7 +3596,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3660,7 +3690,7 @@
         return (config.authOptions.authority.options.protocolMode === ProtocolMode.OIDC);
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3679,7 +3709,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3707,7 +3737,7 @@
         uxNotAllowed: uxNotAllowed
     });
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3773,7 +3803,7 @@
         return new InteractionRequiredAuthError(errorCode, errorMessage);
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -3841,7 +3871,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3906,7 +3936,7 @@
         return cachedAtSec > nowSeconds();
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -3977,7 +4007,7 @@
     const CacheManagerGetRefreshToken = "cacheManagerGetRefreshToken";
     const SetUserData = "setUserData";
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4072,7 +4102,7 @@
         };
     };
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4152,7 +4182,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4179,7 +4209,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4438,7 +4468,7 @@
         return metadata.expiresAt <= nowSeconds();
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4505,7 +4535,7 @@
          * @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) {
@@ -4552,14 +4582,19 @@
                 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 &&
@@ -4769,7 +4804,7 @@
         return baseAccount;
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4779,7 +4814,7 @@
         UPN: "UPN",
     };
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4797,7 +4832,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -4818,7 +4853,7 @@
         };
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4904,7 +4939,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -4935,7 +4970,7 @@
         return new NetworkError(error, httpStatus, responseHeaders);
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5049,7 +5084,7 @@
         return response;
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5061,7 +5096,7 @@
             response.hasOwnProperty("jwks_uri"));
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5071,7 +5106,7 @@
             response.hasOwnProperty("metadata"));
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -5081,7 +5116,7 @@
             response.hasOwnProperty("error_description"));
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -5186,7 +5221,7 @@
         },
     };
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6006,7 +6041,7 @@
         };
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6040,7 +6075,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6078,7 +6113,7 @@
          * authorization_code_grant
          * @param request
          */
-        async acquireToken(request, authCodePayload) {
+        async acquireToken(request, apiId, authCodePayload) {
             if (!request.code) {
                 throw createClientAuthError(requestCannotBeMade);
             }
@@ -6093,7 +6128,7 @@
             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.
@@ -6300,7 +6335,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6330,20 +6365,20 @@
             // 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);
@@ -6357,7 +6392,7 @@
             // 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 &&
@@ -6368,7 +6403,7 @@
                         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 {
@@ -6377,13 +6412,13 @@
                 }
             }
             // 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) {
@@ -6412,7 +6447,7 @@
                 },
             };
             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) {
@@ -6525,7 +6560,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6634,7 +6669,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6649,7 +6684,7 @@
         },
     };
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6873,7 +6908,7 @@
         return account.loginHint || account.idTokenClaims?.login_hint || null;
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -6931,7 +6966,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -6948,7 +6983,7 @@
         unexpectedError: unexpectedError
     });
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7209,7 +7244,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7230,7 +7265,7 @@
         return new JoseHeaderError(code);
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
      * Licensed under the MIT License.
@@ -7238,7 +7273,7 @@
     const missingKidError = "missing_kid_error";
     const missingAlgError = "missing_alg_error";
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7278,7 +7313,7 @@
         }
     }
-    /*! @azure/msal-common v16.0.2 2026-01-17 */
+    /*! @azure/msal-common v16.0.4 2026-02-10 */
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -7977,6 +8012,7 @@
      * 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,
@@ -7988,6 +8024,30 @@
         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
@@ -10079,7 +10139,7 @@
     /* eslint-disable header/header */
     const name = "@azure/msal-browser";
-    const version = "5.0.2";
+    const version = "5.2.0";
     /*
      * Copyright (c) Microsoft Corporation. All rights reserved.
@@ -10651,17 +10711,22 @@
                 !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);
@@ -11087,7 +11152,7 @@
                 this.logger.verbose("1bp5z5", correlationId);
                 this.browserStorage.removeItem(activeAccountKey);
             }
-            this.eventHandler.emitEvent(EventType.ACTIVE_ACCOUNT_CHANGED);
+            this.eventHandler.emitEvent(EventType.ACTIVE_ACCOUNT_CHANGED, correlationId);
         }
         /**
          * fetch throttling entity from the platform cache
@@ -11372,7 +11437,7 @@
          * @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)
@@ -11380,7 +11445,7 @@
              *
              * 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)
@@ -11393,7 +11458,7 @@
                 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
@@ -11401,9 +11466,9 @@
          * @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 &&
@@ -11550,12 +11615,13 @@
          * @param payload
          * @param error
          */
-        emitEvent(eventType, interactionType, payload, error) {
+        emitEvent(eventType, correlationId, interactionType, payload, error) {
             const message = {
                 eventType: eventType,
                 interactionType: interactionType || null,
                 payload: payload || null,
                 error: error || null,
+                correlationId: correlationId,
                 timestamp: Date.now(),
             };
             switch (eventType) {
@@ -12087,7 +12153,7 @@
          * 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);
@@ -12102,7 +12168,7 @@
                     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
@@ -12111,7 +12177,7 @@
          * @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;
@@ -12132,7 +12198,7 @@
                 }
             }
             // 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;
         }
         /**
@@ -12666,7 +12732,7 @@
          */
         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);
         }
@@ -12695,7 +12761,7 @@
                 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
@@ -12980,6 +13046,8 @@
         });
         const queryParams = new Map();
         addExtraParameters(queryParams, request.extraQueryParameters || {});
+        // Add correlationId to query params so gateway can propagate it to IDPs
+        addCorrelationId(queryParams, request.correlationId);
         const url = getAuthorizeUrl(authority, queryParams);
         return createForm(frame, url, parameters);
     }
@@ -12997,6 +13065,8 @@
         // Add extraQueryParameters to be appended to request URL
         const queryParams = new Map();
         addExtraParameters(queryParams, request.extraQueryParameters || {});
+        // Add correlationId to query params so gateway can propagate it to IDPs
+        addCorrelationId(queryParams, request.correlationId);
         const url = getAuthorizeUrl(authority, queryParams);
         return createForm(frame, url, parameters);
     }
@@ -13074,7 +13144,7 @@
         // 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;
     }
     /**
@@ -13121,7 +13191,7 @@
             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));
     }
     /*
@@ -14084,7 +14154,7 @@
                     const navigateUrl = await invokeAsync(getAuthCodeRequestUrl, GetAuthCodeUrl, this.logger, this.performanceClient, correlationId)(this.config, authClient.authority, popupRequest, this.logger, this.performanceClient);
                     // Show the UI once the url has been created. Get the window handle for the popup.
                     const popupWindow = this.initiateAuthRequest(navigateUrl, popupParams);
-                    this.eventHandler.emitEvent(EventType.POPUP_OPENED, exports.InteractionType.Popup, { popupWindow }, null);
+                    this.eventHandler.emitEvent(EventType.POPUP_OPENED, correlationId, exports.InteractionType.Popup, { popupWindow }, null);
                     // Wait for the redirect bridge response
                     const responseString = await waitForBridgeResponse(this.config.system.popupBridgeTimeout, this.logger, this.browserCrypto, request);
                     const serverParams = invoke(deserializeResponse, DeserializeResponse, this.logger, this.performanceClient, this.correlationId)(responseString, this.config.auth.OIDCOptions.responseMode, this.logger, this.correlationId);
@@ -14161,7 +14231,7 @@
          */
         async logoutPopupAsync(validRequest, popupParams, requestAuthority, mainWindowRedirectUri) {
             this.logger.verbose("0b7yrk", this.correlationId);
-            this.eventHandler.emitEvent(EventType.LOGOUT_START, exports.InteractionType.Popup, validRequest);
+            this.eventHandler.emitEvent(EventType.LOGOUT_START, this.correlationId, exports.InteractionType.Popup, validRequest);
             const serverTelemetryManager = initializeServerTelemetryManager(ApiId.logoutPopup, this.config.auth.clientId, this.correlationId, this.browserStorage, this.logger);
             try {
                 // Clear cache on logout
@@ -14179,7 +14249,7 @@
                     if (validRequest.account?.homeAccountId &&
                         validRequest.postLogoutRedirectUri &&
                         authClient.authority.protocolMode === ProtocolMode.OIDC) {
-                        this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, exports.InteractionType.Popup, validRequest);
+                        this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, validRequest.correlationId, exports.InteractionType.Popup, validRequest);
                         if (mainWindowRedirectUri) {
                             const navigationOptions = {
                                 apiId: ApiId.logoutPopup,
@@ -14195,10 +14265,10 @@
                 }
                 // Create logout string and navigate user window to logout.
                 const logoutUri = authClient.getLogoutUri(validRequest);
-                this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, exports.InteractionType.Popup, validRequest);
+                this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, validRequest.correlationId, exports.InteractionType.Popup, validRequest);
                 // Open the popup window to requestUrl.
                 const popupWindow = this.openPopup(logoutUri, popupParams);
-                this.eventHandler.emitEvent(EventType.POPUP_OPENED, exports.InteractionType.Popup, { popupWindow }, null);
+                this.eventHandler.emitEvent(EventType.POPUP_OPENED, validRequest.correlationId, exports.InteractionType.Popup, { popupWindow }, null);
                 await waitForBridgeResponse(this.config.system.popupBridgeTimeout, this.logger, this.browserCrypto, validRequest).catch(() => {
                     // Swallow any errors related to monitoring the window. Server logout is best effort
                 });
@@ -14224,11 +14294,11 @@
                     e.setCorrelationId(this.correlationId);
                     serverTelemetryManager.cacheFailedRequest(e);
                 }
-                this.eventHandler.emitEvent(EventType.LOGOUT_FAILURE, exports.InteractionType.Popup, null, e);
-                this.eventHandler.emitEvent(EventType.LOGOUT_END, exports.InteractionType.Popup);
+                this.eventHandler.emitEvent(EventType.LOGOUT_FAILURE, this.correlationId, exports.InteractionType.Popup, null, e);
+                this.eventHandler.emitEvent(EventType.LOGOUT_END, this.correlationId, exports.InteractionType.Popup);
                 throw e;
             }
-            this.eventHandler.emitEvent(EventType.LOGOUT_END, exports.InteractionType.Popup);
+            this.eventHandler.emitEvent(EventType.LOGOUT_END, this.correlationId, exports.InteractionType.Popup);
         }
         /**
          * Opens a popup window with given request Url.
@@ -14391,7 +14461,7 @@
                 if (event.persisted) {
                     this.logger.verbose("0udvtt", this.correlationId);
                     this.browserStorage.resetRequestCache(this.correlationId);
-                    this.eventHandler.emitEvent(EventType.RESTORE_FROM_BFCACHE, exports.InteractionType.Redirect);
+                    this.eventHandler.emitEvent(EventType.RESTORE_FROM_BFCACHE, this.correlationId, exports.InteractionType.Redirect);
                 }
             };
             const redirectStartPage = this.getRedirectStartPage(request.redirectStartPage);
@@ -14708,7 +14778,7 @@
             const validLogoutRequest = this.initializeLogoutRequest(logoutRequest);
             const serverTelemetryManager = initializeServerTelemetryManager(ApiId.logout, this.config.auth.clientId, this.correlationId, this.browserStorage, this.logger);
             try {
-                this.eventHandler.emitEvent(EventType.LOGOUT_START, exports.InteractionType.Redirect, logoutRequest);
+                this.eventHandler.emitEvent(EventType.LOGOUT_START, this.correlationId, exports.InteractionType.Redirect, logoutRequest);
                 // Clear cache on logout
                 await clearCacheOnLogout(this.browserStorage, this.browserCrypto, this.logger, this.correlationId, validLogoutRequest.account);
                 const navigationOptions = {
@@ -14728,7 +14798,7 @@
                     }
                     catch {
                         if (validLogoutRequest.account?.homeAccountId) {
-                            this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, exports.InteractionType.Redirect, validLogoutRequest);
+                            this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, this.correlationId, exports.InteractionType.Redirect, validLogoutRequest);
                             return;
                         }
                     }
@@ -14736,7 +14806,7 @@
                 // Create logout string and navigate user window to logout.
                 const logoutUri = authClient.getLogoutUri(validLogoutRequest);
                 if (validLogoutRequest.account?.homeAccountId) {
-                    this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, exports.InteractionType.Redirect, validLogoutRequest);
+                    this.eventHandler.emitEvent(EventType.LOGOUT_SUCCESS, this.correlationId, exports.InteractionType.Redirect, validLogoutRequest);
                 }
                 // Check if onRedirectNavigate is implemented, and invoke it if so
                 const onRedirectNavigate = this.config.auth.onRedirectNavigate;
@@ -14771,11 +14841,11 @@
                     e.setCorrelationId(this.correlationId);
                     serverTelemetryManager.cacheFailedRequest(e);
                 }
-                this.eventHandler.emitEvent(EventType.LOGOUT_FAILURE, exports.InteractionType.Redirect, null, e);
-                this.eventHandler.emitEvent(EventType.LOGOUT_END, exports.InteractionType.Redirect);
+                this.eventHandler.emitEvent(EventType.LOGOUT_FAILURE, this.correlationId, exports.InteractionType.Redirect, null, e);
+                this.eventHandler.emitEvent(EventType.LOGOUT_END, this.correlationId, exports.InteractionType.Redirect);
                 throw e;
             }
-            this.eventHandler.emitEvent(EventType.LOGOUT_END, exports.InteractionType.Redirect);
+            this.eventHandler.emitEvent(EventType.LOGOUT_END, this.correlationId, exports.InteractionType.Redirect);
         }
         /**
          * Use to get the redirectStartPage either from request or use current window
@@ -15029,7 +15099,7 @@
                 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;
@@ -15126,7 +15196,7 @@
                     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) {
@@ -15266,23 +15336,22 @@
             if (!this.isBrowserEnvironment) {
                 this.logger.info("19fvpi", correlationId);
                 this.initialized = true;
-                this.eventHandler.emitEvent(EventType.INITIALIZE_END);
+                this.eventHandler.emitEvent(EventType.INITIALIZE_END, correlationId);
                 return;
             }
-            const initCorrelationId = request?.correlationId || this.getRequestCorrelationId();
             const allowPlatformBroker = this.config.system.allowPlatformBroker;
-            const initMeasurement = this.performanceClient.startMeasurement(InitializeClientApplication, initCorrelationId);
-            this.eventHandler.emitEvent(EventType.INITIALIZE_START);
+            const initMeasurement = this.performanceClient.startMeasurement(InitializeClientApplication, correlationId);
+            this.eventHandler.emitEvent(EventType.INITIALIZE_START, correlationId);
             // Broker applications are initialized twice, so we avoid double-counting it
-            this.logMultipleInstances(initMeasurement, initCorrelationId);
-            await invokeAsync(this.browserStorage.initialize.bind(this.browserStorage), InitializeCache, this.logger, this.performanceClient, initCorrelationId)(initCorrelationId);
+            this.logMultipleInstances(initMeasurement, correlationId);
+            await invokeAsync(this.browserStorage.initialize.bind(this.browserStorage), InitializeCache, this.logger, this.performanceClient, correlationId)(correlationId);
             if (allowPlatformBroker) {
                 try {
                     // check if platform authentication is available via DOM or browser extension and create relevant handlers
-                    this.platformAuthProvider = await getPlatformAuthProvider(this.logger, this.performanceClient, initCorrelationId, this.config.system.nativeBrokerHandshakeTimeout);
+                    this.platformAuthProvider = await getPlatformAuthProvider(this.logger, this.performanceClient, correlationId, this.config.system.nativeBrokerHandshakeTimeout);
                 }
                 catch (e) {
-                    this.logger.verbose(e, initCorrelationId);
+                    this.logger.verbose(e, correlationId);
                 }
             }
             if (this.config.cache.cacheLocation ===
@@ -15290,9 +15359,9 @@
                 this.eventHandler.subscribeCrossTab();
             }
             !this.config.system.navigatePopups &&
-                (await this.preGeneratePkceCodes(initCorrelationId));
+                (await this.preGeneratePkceCodes(correlationId));
             this.initialized = true;
-            this.eventHandler.emitEvent(EventType.INITIALIZE_END);
+            this.eventHandler.emitEvent(EventType.INITIALIZE_END, correlationId);
             initMeasurement.end({
                 allowPlatformBroker: allowPlatformBroker,
                 success: true,
@@ -15354,11 +15423,11 @@
                 this.platformAuthProvider &&
                 !options?.hash;
             let rootMeasurement;
-            this.eventHandler.emitEvent(EventType.HANDLE_REDIRECT_START, exports.InteractionType.Redirect);
             let redirectResponse;
             try {
                 if (useNative && this.platformAuthProvider) {
                     const correlationId = platformBrokerRequest?.correlationId || "";
+                    this.eventHandler.emitEvent(EventType.HANDLE_REDIRECT_START, correlationId, exports.InteractionType.Redirect);
                     rootMeasurement = this.performanceClient.startMeasurement(AcquireTokenRedirect, correlationId);
                     this.logger.trace("12v7is", correlationId);
                     const nativeClient = new PlatformAuthInteractionClient(this.config, this.browserStorage, this.browserCrypto, this.logger, this.eventHandler, this.navigationClient, ApiId.handleRedirectPromise, this.performanceClient, this.platformAuthProvider, platformBrokerRequest.accountId, this.nativeInternalStorage, platformBrokerRequest.correlationId);
@@ -15367,6 +15436,7 @@
                 else {
                     const [standardRequest, codeVerifier] = this.browserStorage.getCachedRequest("");
                     const correlationId = standardRequest.correlationId;
+                    this.eventHandler.emitEvent(EventType.HANDLE_REDIRECT_START, correlationId, exports.InteractionType.Redirect);
                     // Reset rootMeasurement now that we have correlationId
                     rootMeasurement = this.performanceClient.startMeasurement(AcquireTokenRedirect, correlationId);
                     this.logger.trace("0znzs5", correlationId);
@@ -15382,12 +15452,12 @@
                 .then((result) => {
                 if (result) {
                     this.browserStorage.resetRequestCache(result.correlationId);
-                    this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Redirect, result);
+                    this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, result.correlationId, exports.InteractionType.Redirect, result);
                     this.logger.verbose("0ui8f5", result.correlationId);
                     // Emit login event if number of accounts change
                     const isLoggingIn = loggedInAccounts.length < this.getAllAccounts().length;
                     if (isLoggingIn) {
-                        this.eventHandler.emitEvent(EventType.LOGIN_SUCCESS, exports.InteractionType.Redirect, result.account);
+                        this.eventHandler.emitEvent(EventType.LOGIN_SUCCESS, result.correlationId, exports.InteractionType.Redirect, result.account);
                         this.logger.verbose("16im3l", result.correlationId);
                     }
                     rootMeasurement.end({
@@ -15406,14 +15476,14 @@
                         rootMeasurement.discard();
                     }
                 }
-                this.eventHandler.emitEvent(EventType.HANDLE_REDIRECT_END, exports.InteractionType.Redirect);
+                this.eventHandler.emitEvent(EventType.HANDLE_REDIRECT_END, rootMeasurement.event.correlationId, exports.InteractionType.Redirect);
                 return result;
             })
                 .catch((e) => {
                 this.browserStorage.resetRequestCache(rootMeasurement.event.correlationId);
                 const eventError = e;
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Redirect, null, eventError);
-                this.eventHandler.emitEvent(EventType.HANDLE_REDIRECT_END, exports.InteractionType.Redirect);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, rootMeasurement.event.correlationId, exports.InteractionType.Redirect, null, eventError);
+                this.eventHandler.emitEvent(EventType.HANDLE_REDIRECT_END, rootMeasurement.event.correlationId, exports.InteractionType.Redirect);
                 rootMeasurement.end({
                     success: false,
                 }, eventError);
@@ -15452,7 +15522,7 @@
             try {
                 redirectPreflightCheck(this.initialized, this.config);
                 this.browserStorage.setInteractionInProgress(true, INTERACTION_TYPE.SIGNIN);
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, exports.InteractionType.Redirect, request);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, correlationId, exports.InteractionType.Redirect, request);
                 let result;
                 if (this.platformAuthProvider &&
                     this.canUsePlatformBroker(request)) {
@@ -15494,7 +15564,7 @@
                 else {
                     atrMeasurement.end({ success: false }, e, request.account);
                 }
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Redirect, null, e);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, correlationId, exports.InteractionType.Redirect, null, e);
                 throw e;
             }
         }
@@ -15524,7 +15594,7 @@
             }
             // If logged in, emit acquire token events
             const loggedInAccounts = this.getAllAccounts();
-            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, exports.InteractionType.Popup, request);
+            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, correlationId, exports.InteractionType.Popup, request);
             let result;
             const pkce = this.getPreGeneratedPkceCodes(correlationId);
             if (this.canUsePlatformBroker(request)) {
@@ -15564,9 +15634,9 @@
                  *  If logged in, emit acquire token events
                  */
                 const isLoggingIn = loggedInAccounts.length < this.getAllAccounts().length;
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Popup, result);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, correlationId, exports.InteractionType.Popup, result);
                 if (isLoggingIn) {
-                    this.eventHandler.emitEvent(EventType.LOGIN_SUCCESS, exports.InteractionType.Popup, result.account);
+                    this.eventHandler.emitEvent(EventType.LOGIN_SUCCESS, correlationId, exports.InteractionType.Popup, result.account);
                 }
                 atPopupMeasurement.end({
                     success: true,
@@ -15576,7 +15646,7 @@
                 return result;
             })
                 .catch((e) => {
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Popup, null, e);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, correlationId, exports.InteractionType.Popup, null, e);
                 atPopupMeasurement.end({
                     success: false,
                 }, e, request.account);
@@ -15636,7 +15706,7 @@
             document.addEventListener("visibilitychange", this.trackPageVisibilityWithMeasurement);
             const loggedInAccounts = this.getAllAccounts();
             this.logger.verbose("0w1b45", correlationId);
-            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, exports.InteractionType.Silent, validRequest);
+            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, correlationId, exports.InteractionType.Silent, validRequest);
             let result;
             if (this.canUsePlatformBroker(validRequest)) {
                 result = this.acquireTokenNative(validRequest, ApiId.ssoSilent).catch((e) => {
@@ -15656,9 +15726,9 @@
             return result
                 .then((response) => {
                 const isLoggingIn = loggedInAccounts.length < this.getAllAccounts().length;
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Silent, response);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, correlationId, exports.InteractionType.Silent, response);
                 if (isLoggingIn) {
-                    this.eventHandler.emitEvent(EventType.LOGIN_SUCCESS, exports.InteractionType.Silent, response.account);
+                    this.eventHandler.emitEvent(EventType.LOGIN_SUCCESS, correlationId, exports.InteractionType.Silent, response.account);
                 }
                 this.ssoSilentMeasurement?.end({
                     success: true,
@@ -15669,7 +15739,7 @@
                 return response;
             })
                 .catch((e) => {
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Silent, null, e);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, correlationId, exports.InteractionType.Silent, null, e);
                 this.ssoSilentMeasurement?.end({
                     success: false,
                 }, e, request.account);
@@ -15694,7 +15764,7 @@
             this.logger.trace("0ch6ga", correlationId);
             const atbcMeasurement = this.performanceClient.startMeasurement(AcquireTokenByCode, correlationId);
             preflightCheck(this.initialized, atbcMeasurement);
-            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, exports.InteractionType.Silent, request);
+            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, correlationId, exports.InteractionType.Silent, request);
             atbcMeasurement.add({ scenarioId: request.scenarioId });
             try {
                 if (request.code && request.nativeAccountId) {
@@ -15711,7 +15781,7 @@
                             correlationId,
                         })
                             .then((result) => {
-                            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Silent, result);
+                            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, correlationId, exports.InteractionType.Silent, result);
                             this.hybridAuthCodeResponses.delete(hybridAuthCode);
                             atbcMeasurement.end({
                                 success: true,
@@ -15723,7 +15793,7 @@
                         })
                             .catch((error) => {
                             this.hybridAuthCodeResponses.delete(hybridAuthCode);
-                            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Silent, null, error);
+                            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, correlationId, exports.InteractionType.Silent, null, error);
                             atbcMeasurement.end({
                                 success: false,
                             }, error);
@@ -15764,7 +15834,7 @@
                 }
             }
             catch (e) {
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Silent, null, e);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, correlationId, exports.InteractionType.Silent, null, e);
                 atbcMeasurement.end({
                     success: false,
                 }, e);
@@ -15939,7 +16009,7 @@
             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
@@ -16266,7 +16336,7 @@
          */
         async acquireTokenSilentAsync(request, account) {
             const trackPageVisibility = () => this.trackPageVisibility(request.correlationId);
-            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, exports.InteractionType.Silent, request);
+            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, request.correlationId, exports.InteractionType.Silent, request);
             if (request.correlationId) {
                 this.performanceClient.incrementFields({ visibilityChangeCount: 0 }, request.correlationId);
             }
@@ -16334,7 +16404,7 @@
             });
             return result
                 .then((response) => {
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Silent, response);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, request.correlationId, exports.InteractionType.Silent, response);
                 if (request.correlationId) {
                     this.performanceClient.addFields({
                         fromCache: response.fromCache,
@@ -16344,7 +16414,7 @@
                 return response;
             })
                 .catch((tokenRenewalError) => {
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Silent, null, tokenRenewalError);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, request.correlationId, exports.InteractionType.Silent, null, tokenRenewalError);
                 throw tokenRenewalError;
             })
                 .finally(() => {
@@ -16383,7 +16453,7 @@
                     if (cacheLookupPolicy === CacheLookupPolicy.AccessToken) {
                         throw cacheError;
                     }
-                    this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_NETWORK_START, exports.InteractionType.Silent, silentRequest);
+                    this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_NETWORK_START, silentRequest.correlationId, exports.InteractionType.Silent, silentRequest);
                     return invokeAsync(this.acquireTokenByRefreshToken.bind(this), AcquireTokenByRefreshToken, this.logger, this.performanceClient, silentRequest.correlationId)(silentRequest, cacheLookupPolicy);
                 });
             }
@@ -16713,19 +16783,36 @@
                 effectiveIdTokenClaims?.oid ||
                 effectiveIdTokenClaims?.sub ||
                 "";
-            const tenantId = fromAccount.tenantId || effectiveIdTokenClaims?.tid || "";
-            const homeAccountId = fromAccount.homeAccountId || `${localAccountId}.${tenantId}`;
-            const username = fromAccount.username ||
-                effectiveIdTokenClaims?.preferred_username ||
+            /*
+             * In B2C scenarios tid may not be present, use getTenantIdFromIdTokenClaims
+             * which handles tid, tfp (modern B2C), and acr (legacy B2C) claims
+             */
+            const tenantId = fromAccount.tenantId ||
+                getTenantIdFromIdTokenClaims(effectiveIdTokenClaims) ||
                 "";
-            const name = fromAccount.name || effectiveIdTokenClaims?.name;
+            const homeAccountId = fromAccount.homeAccountId || `${localAccountId}.${tenantId}`;
+            // Validate environment - required field
+            const environment = fromAccount.environment;
+            if (!environment) {
+                throw createClientAuthError(invalidCacheEnvironment);
+            }
+            /*
+             * In B2C scenarios the emails claim is used instead of preferred_username and it is an array.
+             * In most cases it will contain a single email. This field should not be relied upon if a custom
+             * policy is configured to return more than 1 email.
+             */
+            const preferredUsername = effectiveIdTokenClaims?.preferred_username ||
+                effectiveIdTokenClaims?.upn;
+            const email = effectiveIdTokenClaims?.emails?.[0] || null;
+            const username = fromAccount.username || preferredUsername || email || "";
+            const name = fromAccount.name || effectiveIdTokenClaims?.name || "";
             const loginHint = fromAccount.loginHint || effectiveIdTokenClaims?.login_hint;
             const tenantProfiles = new Map();
             const tenantProfile = buildTenantProfile(homeAccountId, localAccountId, tenantId, effectiveIdTokenClaims);
             tenantProfiles.set(tenantId, tenantProfile);
             const account = {
                 homeAccountId,
-                environment: fromAccount.environment,
+                environment,
                 tenantId,
                 username,
                 localAccountId,
@@ -16896,7 +16983,7 @@
         async acquireTokenInteractive(request) {
             const validRequest = this.ensureValidRequest(request);
             const correlationId = validRequest.correlationId || createNewGuid();
-            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, exports.InteractionType.Popup, validRequest);
+            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, correlationId, exports.InteractionType.Popup, validRequest);
             const atPopupMeasurement = this.performanceClient.startMeasurement(AcquireTokenPopup, correlationId);
             atPopupMeasurement.add({ nestedAppAuthRequest: true });
             try {
@@ -16920,7 +17007,7 @@
                     environment: result.account.environment,
                     tenantId: result.account.tenantId,
                 };
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Popup, result);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, correlationId, exports.InteractionType.Popup, result);
                 atPopupMeasurement.add({
                     accessTokenSize: result.accessToken.length,
                     idTokenSize: result.idToken.length,
@@ -16935,7 +17022,7 @@
                 const error = e instanceof AuthError
                     ? e
                     : this.nestedAppAuthAdapter.fromBridgeError(e);
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Popup, null, e);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, correlationId, exports.InteractionType.Popup, null, e);
                 atPopupMeasurement.end({
                     success: false,
                 }, e, request.account);
@@ -16950,11 +17037,11 @@
         async acquireTokenSilentInternal(request) {
             const validRequest = this.ensureValidRequest(request);
             const correlationId = validRequest.correlationId || createNewGuid();
-            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, exports.InteractionType.Silent, validRequest);
+            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_START, correlationId, exports.InteractionType.Silent, validRequest);
             // Look for tokens in the cache first
             const result = await this.acquireTokenFromCache(validRequest);
             if (result) {
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Silent, result);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, correlationId, exports.InteractionType.Silent, result);
                 return result;
             }
             // proceed with acquiring tokens via the host
@@ -16985,7 +17072,7 @@
                     environment: result.account.environment,
                     tenantId: result.account.tenantId,
                 };
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Silent, result);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, correlationId, exports.InteractionType.Silent, result);
                 ssoSilentMeasurement?.add({
                     accessTokenSize: result.accessToken.length,
                     idTokenSize: result.idToken.length,
@@ -17000,7 +17087,7 @@
                 const error = e instanceof AuthError
                     ? e
                     : this.nestedAppAuthAdapter.fromBridgeError(e);
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Silent, null, e);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, correlationId, exports.InteractionType.Silent, null, e);
                 ssoSilentMeasurement?.end({
                     success: false,
                 }, e, request.account);
@@ -17043,7 +17130,7 @@
                     return null;
             }
             if (result) {
-                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, exports.InteractionType.Silent, result);
+                this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_SUCCESS, correlationId, exports.InteractionType.Silent, result);
                 atsMeasurement.add({
                     accessTokenSize: result.accessToken.length,
                     idTokenSize: result.idToken.length,
@@ -17054,7 +17141,7 @@
                 return result;
             }
             this.logger.warning("1yb4fi", correlationId);
-            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, exports.InteractionType.Silent, null);
+            this.eventHandler.emitEvent(EventType.ACQUIRE_TOKEN_FAILURE, correlationId, exports.InteractionType.Silent, null);
             atsMeasurement.end({
                 success: false,
             }, undefined, request.account);
@@ -17270,7 +17357,7 @@
         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);
         }
     }
@@ -17917,20 +18004,19 @@
             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);
@@ -17946,23 +18032,23 @@
      * @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;
     }
     /**
@@ -18025,14 +18111,20 @@
      * @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;
     }
@@ -18044,7 +18136,7 @@
      * @param authority
      * @returns `AuthenticationResult`
      */
-    function generateAuthenticationResult(request, cacheRecord, idTokenClaims, authority) {
+    function generateAuthenticationResult(request, cacheRecord, authority, idTokenClaims) {
         let accessToken = "";
         let responseScopes = [];
         let expiresOn = null;
@@ -18058,7 +18150,7 @@
         }
         const accountEntity = cacheRecord.account;
         return {
-            authority: authority ? authority.canonicalAuthority : "",
+            authority: authority.canonicalAuthority,
             uniqueId: cacheRecord.account.localAccountId,
             tenantId: cacheRecord.account.realm,
             scopes: responseScopes,