Merge branch 'dev' of https://github.com/AzureAD/microsoft-authentication-library-for-js into msal-v5

jo-arroyo · jo-arroyo · commit 2968e57f6aed · 2025-04-24T11:12:18.000-07:00
diff --git a/change/@azure-msal-angular-34f593f3-625c-453f-bd2b-4793cf05757f.json b/change/@azure-msal-angular-34f593f3-625c-453f-bd2b-4793cf05757f.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fix circular dependency",
+  "packageName": "@azure/msal-angular",
+  "email": "thomas.norling@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-msal-browser-3ef5a999-873c-4c3c-adac-ece031405cc6.json b/change/@azure-msal-browser-3ef5a999-873c-4c3c-adac-ece031405cc6.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fix circular type imports",
+  "packageName": "@azure/msal-browser",
+  "email": "thomas.norling@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-msal-common-589fd386-e7e6-432e-8aee-2bf17430df4c.json b/change/@azure-msal-common-589fd386-e7e6-432e-8aee-2bf17430df4c.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fix circular type imports",
+  "packageName": "@azure/msal-common",
+  "email": "thomas.norling@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@azure-msal-node-50ccabcc-b72f-496a-bc19-28502ee3dbf3.json b/change/@azure-msal-node-50ccabcc-b72f-496a-bc19-28502ee3dbf3.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Fix circular type imports",
+  "packageName": "@azure/msal-node",
+  "email": "thomas.norling@microsoft.com",
+  "dependentChangeType": "patch"
+}
diff --git a/lib/msal-angular/src/msal.broadcast.service.ts b/lib/msal-angular/src/msal.broadcast.service.ts
@@ -11,9 +11,9 @@ import {
   InteractionStatus,
 } from "@azure/msal-browser";
 import { BehaviorSubject, Observable, ReplaySubject, Subject } from "rxjs";
-import { MsalService } from "./msal.service";
 import { MsalBroadcastConfiguration } from "./msal.broadcast.config";
 import { MSAL_BROADCAST_CONFIG, MSAL_INSTANCE } from "./constants";
+import { name, version } from "./packageMetadata";
 
 @Injectable()
 export class MsalBroadcastService {
@@ -24,7 +24,6 @@ export class MsalBroadcastService {
 
   constructor(
     @Inject(MSAL_INSTANCE) private msalInstance: IPublicClientApplication,
-    private authService: MsalService,
     @Optional()
     @Inject(MSAL_BROADCAST_CONFIG)
     private msalBroadcastConfig?: MsalBroadcastConfiguration
@@ -34,8 +33,9 @@ export class MsalBroadcastService {
       this.msalBroadcastConfig &&
       this.msalBroadcastConfig.eventsToReplay > 0
     ) {
-      this.authService
+      this.msalInstance
         .getLogger()
+        .clone(name, version)
         .verbose(
           `BroadcastService - eventsToReplay set on BroadcastConfig, replaying the last ${this.msalBroadcastConfig.eventsToReplay} events`
         );
@@ -62,8 +62,9 @@ export class MsalBroadcastService {
         this._inProgress.value
       );
       if (status !== null) {
-        this.authService
+        this.msalInstance
           .getLogger()
+          .clone(name, version)
           .verbose(
             `BroadcastService - ${message.eventType} results in setting inProgress from ${this._inProgress.value} to ${status}`
           );
diff --git a/lib/msal-angular/src/msal.navigation.client.spec.ts b/lib/msal-angular/src/msal.navigation.client.spec.ts
@@ -26,7 +26,7 @@ const msalInstance = new PublicClientApplication({
 });
 
 describe("MsalCustomNaviationClient", () => {
-  beforeAll(() => {
+  beforeEach(() => {
     TestBed.resetTestingModule();
 
     TestBed.configureTestingModule({
diff --git a/lib/msal-angular/src/msal.redirect.component.spec.ts b/lib/msal-angular/src/msal.redirect.component.spec.ts
@@ -35,7 +35,7 @@ function initializeMsal() {
 }
 
 describe("MsalRedirectComponent", () => {
-  beforeAll(initializeMsal);
+  beforeEach(initializeMsal);
 
   it("calls handleRedirectObservable on ngInit", (done) => {
     const sampleAccessToken = {
diff --git a/lib/msal-angular/src/msal.service.spec.ts b/lib/msal-angular/src/msal.service.spec.ts
@@ -40,7 +40,7 @@ function initializeMsal() {
 }
 
 describe("MsalService", () => {
-  beforeAll(initializeMsal);
+  beforeEach(initializeMsal);
 
   describe("loginPopup", () => {
     it("success", (done) => {
diff --git a/lib/msal-browser/src/cache/ITokenCache.ts b/lib/msal-browser/src/cache/ITokenCache.ts
@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { ExternalTokenResponse } from "@azure/msal-common/browser";
-import { SilentRequest } from "../request/SilentRequest.js";
-import { LoadTokenOptions } from "./TokenCache.js";
-import { AuthenticationResult } from "../response/AuthenticationResult.js";
+import type { ExternalTokenResponse } from "@azure/msal-common/browser";
+import type { SilentRequest } from "../request/SilentRequest.js";
+import type { LoadTokenOptions } from "./TokenCache.js";
+import type { AuthenticationResult } from "../response/AuthenticationResult.js";
 
 export interface ITokenCache {
     /**
diff --git a/lib/msal-browser/src/cache/TokenCache.ts b/lib/msal-browser/src/cache/TokenCache.ts
@@ -23,14 +23,14 @@ import {
     AccountEntityUtils,
 } from "@azure/msal-common/browser";
 import { BrowserConfiguration } from "../config/Configuration.js";
-import { SilentRequest } from "../request/SilentRequest.js";
+import type { SilentRequest } from "../request/SilentRequest.js";
 import { BrowserCacheManager } from "./BrowserCacheManager.js";
-import { ITokenCache } from "./ITokenCache.js";
+import type { ITokenCache } from "./ITokenCache.js";
 import {
     createBrowserAuthError,
     BrowserAuthErrorCodes,
 } from "../error/BrowserAuthError.js";
-import { AuthenticationResult } from "../response/AuthenticationResult.js";
+import type { AuthenticationResult } from "../response/AuthenticationResult.js";
 import { base64Decode } from "../encode/Base64Decode.js";
 import * as BrowserCrypto from "../crypto/BrowserCrypto.js";
 
diff --git a/lib/msal-browser/src/utils/BrowserUtils.ts b/lib/msal-browser/src/utils/BrowserUtils.ts
@@ -19,7 +19,7 @@ import {
     BrowserConfigurationAuthErrorCodes,
     createBrowserConfigurationAuthError,
 } from "../error/BrowserConfigurationAuthError.js";
-import { BrowserConfiguration } from "../config/Configuration.js";
+import type { BrowserConfiguration } from "../config/Configuration.js";
 
 /**
  * Clears hash from window url.
diff --git a/lib/msal-common/src/authority/Authority.ts b/lib/msal-common/src/authority/Authority.ts
@@ -51,7 +51,7 @@ import { CloudDiscoveryMetadata } from "./CloudDiscoveryMetadata.js";
 import { RegionDiscovery } from "./RegionDiscovery.js";
 import { RegionDiscoveryMetadata } from "./RegionDiscoveryMetadata.js";
 import { ImdsOptions } from "./ImdsOptions.js";
-import { AzureCloudOptions } from "../config/ClientConfiguration.js";
+import type { AzureCloudOptions } from "../config/ClientConfiguration.js";
 import { Logger } from "../logger/Logger.js";
 import { AuthError } from "../error/AuthError.js";
 import { IPerformanceClient } from "../telemetry/performance/IPerformanceClient.js";
diff --git a/lib/msal-common/src/cache/entities/AccountEntity.ts b/lib/msal-common/src/cache/entities/AccountEntity.ts
@@ -3,7 +3,27 @@
  * Licensed under the MIT License.
  */
 
-import { TenantProfile } from "../../account/AccountInfo.js";
+import { CacheAccountType, Separators } from "../../utils/Constants.js";
+import type { Authority } from "../../authority/Authority.js";
+import { ICrypto } from "../../crypto/ICrypto.js";
+import { ClientInfo, buildClientInfo } from "../../account/ClientInfo.js";
+import {
+    AccountInfo,
+    TenantProfile,
+    buildTenantProfile,
+} from "../../account/AccountInfo.js";
+import {
+    createClientAuthError,
+    ClientAuthErrorCodes,
+} from "../../error/ClientAuthError.js";
+import { AuthorityType } from "../../authority/AuthorityType.js";
+import { Logger } from "../../logger/Logger.js";
+import {
+    TokenClaims,
+    getTenantIdFromIdTokenClaims,
+} from "../../account/TokenClaims.js";
+import { ProtocolMode } from "../../authority/ProtocolMode.js";
+
 /**
  * Type that defines required and optional parameters for an Account field (based on universal cache schema implemented by all MSALs).
  *
diff --git a/lib/msal-common/src/config/ClientConfiguration.ts b/lib/msal-common/src/config/ClientConfiguration.ts
@@ -11,7 +11,7 @@ import {
     DEFAULT_TOKEN_RENEWAL_OFFSET_SEC,
 } from "../utils/Constants.js";
 import { version } from "../packageMetadata.js";
-import { Authority } from "../authority/Authority.js";
+import type { Authority } from "../authority/Authority.js";
 import { AzureCloudInstance } from "../authority/AuthorityOptions.js";
 import { CacheManager, DefaultStorageClass } from "../cache/CacheManager.js";
 import { ServerTelemetryManager } from "../telemetry/server/ServerTelemetryManager.js";
diff --git a/lib/msal-common/src/crypto/ICrypto.ts b/lib/msal-common/src/crypto/ICrypto.ts
@@ -7,8 +7,8 @@ import {
     ClientAuthErrorCodes,
     createClientAuthError,
 } from "../error/ClientAuthError.js";
-import { BaseAuthRequest } from "../request/BaseAuthRequest.js";
-import { ShrOptions, SignedHttpRequest } from "./SignedHttpRequest.js";
+import type { BaseAuthRequest } from "../request/BaseAuthRequest.js";
+import type { ShrOptions, SignedHttpRequest } from "./SignedHttpRequest.js";
 
 /**
  * The PkceCodes type describes the structure
diff --git a/lib/msal-common/src/logger/Logger.ts b/lib/msal-common/src/logger/Logger.ts
@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { LoggerOptions } from "../config/ClientConfiguration.js";
+import type { LoggerOptions } from "../config/ClientConfiguration.js";
 import { Constants } from "../utils/Constants.js";
 
 /**
diff --git a/lib/msal-common/src/request/BaseAuthRequest.ts b/lib/msal-common/src/request/BaseAuthRequest.ts
@@ -4,7 +4,7 @@
  */
 
 import { AuthenticationScheme } from "../utils/Constants.js";
-import { AzureCloudOptions } from "../config/ClientConfiguration.js";
+import type { AzureCloudOptions } from "../config/ClientConfiguration.js";
 import { StringDict } from "../utils/MsalTypes.js";
 import { StoreInCache } from "./StoreInCache.js";
 import { ShrOptions } from "../crypto/SignedHttpRequest.js";
diff --git a/lib/msal-node/src/config/ManagedIdentityId.ts b/lib/msal-node/src/config/ManagedIdentityId.ts
@@ -11,7 +11,7 @@ import {
     DEFAULT_MANAGED_IDENTITY_ID,
     ManagedIdentityIdType,
 } from "../utils/Constants.js";
-import { ManagedIdentityIdParams } from "./Configuration.js";
+import type { ManagedIdentityIdParams } from "./Configuration.js";
 
 export class ManagedIdentityId {
     private _id: string;
diff --git a/shared-configs/eslint-config-msal/index.js b/shared-configs/eslint-config-msal/index.js
@@ -81,6 +81,7 @@ module.exports = {
         ],
         "import/first": 2,
         "import/no-commonjs": 2,
+        "import/no-cycle": 2,
         "import/no-duplicates": 2,
         "import/no-extraneous-dependencies": 2,
         "import/no-unresolved": 2,

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ function initializeMsal() {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`describe("MsalRedirectComponent", () => {`
`38`		`- beforeAll(initializeMsal);`
	`38`	`+ beforeEach(initializeMsal);`
`39`	`39`
`40`	`40`	`it("calls handleRedirectObservable on ngInit", (done) => {`
`41`	`41`	`const sampleAccessToken = {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ function initializeMsal() {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`describe("MsalService", () => {`
`43`		`- beforeAll(initializeMsal);`
	`43`	`+ beforeEach(initializeMsal);`
`44`	`44`
`45`	`45`	`describe("loginPopup", () => {`
`46`	`46`	`it("success", (done) => {`