@azure/msal-common 15.12.0 → 15.13.1

package/src/cache/entities/AccountEntity.ts

@@ -11,6 +11,7 @@ import {
     AccountInfo,
     TenantProfile,
     buildTenantProfile,
+    DataBoundary,
 } from "../../account/AccountInfo.js";
 import {
     createClientAuthError,
@@ -64,27 +65,29 @@ export class AccountEntity {
     nativeAccountId?: string;
     tenantProfiles?: Array<TenantProfile>;
     lastUpdatedAt: string;
+    dataBoundary?: DataBoundary;
 
     /**
      * Returns the AccountInfo interface for this account.
      */
-    getAccountInfo(): AccountInfo {
+    static getAccountInfo(accountEntity: AccountEntity): AccountInfo {
         return {
-            homeAccountId: this.homeAccountId,
-            environment: this.environment,
-            tenantId: this.realm,
-            username: this.username,
-            localAccountId: this.localAccountId,
-            loginHint: this.loginHint,
-            name: this.name,
-            nativeAccountId: this.nativeAccountId,
-            authorityType: this.authorityType,
+            homeAccountId: accountEntity.homeAccountId,
+            environment: accountEntity.environment,
+            tenantId: accountEntity.realm,
+            username: accountEntity.username,
+            localAccountId: accountEntity.localAccountId,
+            loginHint: accountEntity.loginHint,
+            name: accountEntity.name,
+            nativeAccountId: accountEntity.nativeAccountId,
+            authorityType: accountEntity.authorityType,
             // Deserialize tenant profiles array into a Map
             tenantProfiles: new Map(
-                (this.tenantProfiles || []).map((tenantProfile) => {
+                (accountEntity.tenantProfiles || []).map((tenantProfile) => {
                     return [tenantProfile.tenantId, tenantProfile];
                 })
             ),
+            dataBoundary: accountEntity.dataBoundary,
         };
     }
 
@@ -130,6 +133,10 @@ export class AccountEntity {
                 accountDetails.clientInfo,
                 base64Decode
             );
+            if (clientInfo.xms_tdbr) {
+                account.dataBoundary =
+                    clientInfo.xms_tdbr === "EU" ? "EU" : "None";
+            }
         }
 
         account.clientInfo = accountDetails.clientInfo;
@@ -227,6 +234,7 @@ export class AccountEntity {
         account.tenantProfiles = Array.from(
             accountInfo.tenantProfiles?.values() || []
         );
+        account.dataBoundary = accountInfo.dataBoundary;
 
         return account;
     }
@@ -273,7 +281,7 @@ export class AccountEntity {
      * Validates an entity: checks for all expected params
      * @param entity
      */
-    static isAccountEntity(entity: object): boolean {
+    static isAccountEntity(entity: object): entity is AccountEntity {
         if (!entity) {
             return false;
         }

package/src/cache/interface/ICacheManager.ts

@@ -26,8 +26,14 @@ export interface ICacheManager {
     /**
      * set account entity in the platform cache
      * @param account
+     * @param correlationId
+     * @param kmsi
      */
-    setAccount(account: AccountEntity, correlationId: string): Promise<void>;
+    setAccount(
+        account: AccountEntity,
+        correlationId: string,
+        kmsi: boolean
+    ): Promise<void>;
 
     /**
      * fetch the idToken entity from the platform cache
@@ -41,10 +47,13 @@ export interface ICacheManager {
     /**
      * set idToken entity to the platform cache
      * @param idToken
+     * @param correlationId
+     * @param kmsi
      */
     setIdTokenCredential(
         idToken: IdTokenEntity,
-        correlationId: string
+        correlationId: string,
+        kmsi: boolean
     ): Promise<void>;
 
     /**
@@ -59,10 +68,13 @@ export interface ICacheManager {
     /**
      * set idToken entity to the platform cache
      * @param accessToken
+     * @param correlationId
+     * @param kmsi
      */
     setAccessTokenCredential(
         accessToken: AccessTokenEntity,
-        correlationId: string
+        correlationId: string,
+        kmsi: boolean
     ): Promise<void>;
 
     /**
@@ -77,10 +89,13 @@ export interface ICacheManager {
     /**
      * set idToken entity to the platform cache
      * @param refreshToken
+     * @param correlationId
+     * @param kmsi
      */
     setRefreshTokenCredential(
         refreshToken: RefreshTokenEntity,
-        correlationId: string
+        correlationId: string,
+        kmsi: boolean
     ): Promise<void>;
 
     /**
@@ -172,10 +187,14 @@ export interface ICacheManager {
     /**
      * saves a cache record
      * @param cacheRecord
+     * @param correlationId
+     * @param kmsi
+     * @param storeInCache
      */
     saveCacheRecord(
         cacheRecord: CacheRecord,
         correlationId: string,
+        kmsi: boolean,
         storeInCache?: StoreInCache
     ): Promise<void>;
 

package/src/packageMetadata.ts

@@ -1,3 +1,3 @@
 /* eslint-disable header/header */
 export const name = "@azure/msal-common";
-export const version = "15.12.0";
+export const version = "15.13.1";

package/src/response/ResponseHandler.ts

@@ -40,7 +40,11 @@ import { AuthorizationCodePayload } from "./AuthorizationCodePayload.js";
 import { BaseAuthRequest } from "../request/BaseAuthRequest.js";
 import { IPerformanceClient } from "../telemetry/performance/IPerformanceClient.js";
 import { PerformanceEvents } from "../telemetry/performance/PerformanceEvent.js";
-import { checkMaxAge, extractTokenClaims } from "../account/AuthToken.js";
+import {
+    checkMaxAge,
+    extractTokenClaims,
+    isKmsi,
+} from "../account/AuthToken.js";
 import {
     TokenClaims,
     getTenantIdFromIdTokenClaims,
@@ -279,7 +283,7 @@ export class ResponseHandler {
                 cacheRecord.account
             ) {
                 const key = this.cacheStorage.generateAccountKey(
-                    cacheRecord.account.getAccountInfo()
+                    AccountEntity.getAccountInfo(cacheRecord.account)
                 );
                 const account = this.cacheStorage.getAccount(
                     key,
@@ -305,6 +309,7 @@ export class ResponseHandler {
             await this.cacheStorage.saveCacheRecord(
                 cacheRecord,
                 request.correlationId,
+                isKmsi(idTokenClaims || {}),
                 request.storeInCache
             );
         } finally {
@@ -572,7 +577,7 @@ export class ResponseHandler {
 
         const accountInfo: AccountInfo | null = cacheRecord.account
             ? updateAccountTenantProfileData(
-                  cacheRecord.account.getAccountInfo(),
+                  AccountEntity.getAccountInfo(cacheRecord.account),
                   undefined, // tenantProfile optional
                   idTokenClaims,
                   cacheRecord.idToken?.secret

package/src/telemetry/performance/IPerformanceClient.ts

@@ -5,13 +5,15 @@
 
 import { PerformanceEvent } from "./PerformanceEvent.js";
 import { IPerformanceMeasurement } from "./IPerformanceMeasurement.js";
+import { AccountInfo } from "../../account/AccountInfo.js";
 
 export type PerformanceCallbackFunction = (events: PerformanceEvent[]) => void;
 
 export type InProgressPerformanceEvent = {
     end: (
         event?: Partial<PerformanceEvent>,
-        error?: unknown
+        error?: unknown,
+        account?: AccountInfo
     ) => PerformanceEvent | null;
     discard: () => void;
     add: (fields: { [key: string]: {} | undefined }) => void;

package/src/telemetry/performance/PerformanceClient.ts

@@ -26,6 +26,7 @@ import { AuthError } from "../../error/AuthError.js";
 import { CacheError } from "../../error/CacheError.js";
 import { ServerError } from "../../error/ServerError.js";
 import { InteractionRequiredAuthError } from "../../error/InteractionRequiredAuthError.js";
+import { AccountInfo } from "../../account/AccountInfo.js";
 
 export interface PreQueueEvent {
     name: PerformanceEvents;
@@ -264,6 +265,22 @@ export function compactStackLine(line: string): string {
     return line.trimStart();
 }
 
+export function getAccountType(
+    account?: AccountInfo
+): "AAD" | "MSA" | "B2C" | undefined {
+    const idTokenClaims = account?.idTokenClaims;
+    if (idTokenClaims?.tfp || idTokenClaims?.acr) {
+        return "B2C";
+    }
+
+    if (!idTokenClaims?.tid) {
+        return undefined;
+    } else if (idTokenClaims?.tid === "9188040d-6c67-4c5b-b112-36a304b66dad") {
+        return "MSA";
+    }
+    return "AAD";
+}
+
 export abstract class PerformanceClient implements IPerformanceClient {
     protected authority: string;
     protected libraryName: string;
@@ -562,7 +579,8 @@ export abstract class PerformanceClient implements IPerformanceClient {
         return {
             end: (
                 event?: Partial<PerformanceEvent>,
-                error?: unknown
+                error?: unknown,
+                account?: AccountInfo
             ): PerformanceEvent | null => {
                 return this.endMeasurement(
                     {
@@ -571,7 +589,8 @@ export abstract class PerformanceClient implements IPerformanceClient {
                         // Properties set when event ends
                         ...event,
                     },
-                    error
+                    error,
+                    account
                 );
             },
             discard: () => {
@@ -599,11 +618,13 @@ export abstract class PerformanceClient implements IPerformanceClient {
      *
      * @param {PerformanceEvent} event
      * @param {unknown} error
+     * @param {AccountInfo?} account
      * @returns {(PerformanceEvent | null)}
      */
     endMeasurement(
         event: PerformanceEvent,
-        error?: unknown
+        error?: unknown,
+        account?: AccountInfo
     ): PerformanceEvent | null {
         const rootEvent: PerformanceEvent | undefined =
             this.eventsByCorrelationId.get(event.correlationId);
@@ -691,6 +712,11 @@ export abstract class PerformanceClient implements IPerformanceClient {
             incompleteSubsCount,
             context,
         };
+        if (account) {
+            finalEvent.accountType = getAccountType(account);
+            finalEvent.dataBoundary = account.dataBoundary;
+        }
+
         this.truncateIntegralFields(finalEvent);
         this.emitEvents([finalEvent], event.correlationId);
 

package/src/telemetry/performance/PerformanceEvent.ts

@@ -3,6 +3,8 @@
  * Licensed under the MIT License.
  */
 
+import { DataBoundary } from "../../account/AccountInfo.js";
+
 /**
  * Enumeration of operations that are instrumented by have their performance measured by the PerformanceClient.
  *
@@ -912,6 +914,8 @@ export type PerformanceEvent = {
     sameClientIdInstanceCount?: number;
 
     navigateCallbackResult?: boolean;
+
+    dataBoundary?: DataBoundary;
 };
 
 export type PerformanceEventContext = {