Skip to content

Commit 431bced

Browse files
jo-arroyojo-arroyo
committed
Merge branch 'msal-v5' of https://github.com/AzureAD/microsoft-authentication-library-for-js into config-change-cache
2 parents 9e89fb9 + 2968e57 commit 431bced

19 files changed

+73
-23
lines changed

‎change/@azure-msal-angular-34f593f3-625c-453f-bd2b-4793cf05757f.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fix circular dependency",
4+
"packageName": "@azure/msal-angular",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@azure-msal-browser-3ef5a999-873c-4c3c-adac-ece031405cc6.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fix circular type imports",
4+
"packageName": "@azure/msal-browser",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@azure-msal-common-589fd386-e7e6-432e-8aee-2bf17430df4c.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fix circular type imports",
4+
"packageName": "@azure/msal-common",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@azure-msal-node-50ccabcc-b72f-496a-bc19-28502ee3dbf3.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fix circular type imports",
4+
"packageName": "@azure/msal-node",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎lib/msal-angular/src/msal.broadcast.service.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import {
1111
InteractionStatus,
1212
} from "@azure/msal-browser";
1313
import { BehaviorSubject, Observable, ReplaySubject, Subject } from "rxjs";
14-
import { MsalService } from "./msal.service";
1514
import { MsalBroadcastConfiguration } from "./msal.broadcast.config";
1615
import { MSAL_BROADCAST_CONFIG, MSAL_INSTANCE } from "./constants";
16+
import { name, version } from "./packageMetadata";
1717

1818
@Injectable()
1919
export class MsalBroadcastService {
@@ -24,7 +24,6 @@ export class MsalBroadcastService {
2424

2525
constructor(
2626
@Inject(MSAL_INSTANCE) private msalInstance: IPublicClientApplication,
27-
private authService: MsalService,
2827
@Optional()
2928
@Inject(MSAL_BROADCAST_CONFIG)
3029
private msalBroadcastConfig?: MsalBroadcastConfiguration
@@ -34,8 +33,9 @@ export class MsalBroadcastService {
3433
this.msalBroadcastConfig &&
3534
this.msalBroadcastConfig.eventsToReplay > 0
3635
) {
37-
this.authService
36+
this.msalInstance
3837
.getLogger()
38+
.clone(name, version)
3939
.verbose(
4040
`BroadcastService - eventsToReplay set on BroadcastConfig, replaying the last ${this.msalBroadcastConfig.eventsToReplay} events`
4141
);
@@ -62,8 +62,9 @@ export class MsalBroadcastService {
6262
this._inProgress.value
6363
);
6464
if (status !== null) {
65-
this.authService
65+
this.msalInstance
6666
.getLogger()
67+
.clone(name, version)
6768
.verbose(
6869
`BroadcastService - ${message.eventType} results in setting inProgress from ${this._inProgress.value} to ${status}`
6970
);

‎lib/msal-angular/src/msal.navigation.client.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const msalInstance = new PublicClientApplication({
2626
});
2727

2828
describe("MsalCustomNaviationClient", () => {
29-
beforeAll(() => {
29+
beforeEach(() => {
3030
TestBed.resetTestingModule();
3131

3232
TestBed.configureTestingModule({

‎lib/msal-angular/src/msal.redirect.component.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function initializeMsal() {
3535
}
3636

3737
describe("MsalRedirectComponent", () => {
38-
beforeAll(initializeMsal);
38+
beforeEach(initializeMsal);
3939

4040
it("calls handleRedirectObservable on ngInit", (done) => {
4141
const sampleAccessToken = {

‎lib/msal-angular/src/msal.service.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function initializeMsal() {
4040
}
4141

4242
describe("MsalService", () => {
43-
beforeAll(initializeMsal);
43+
beforeEach(initializeMsal);
4444

4545
describe("loginPopup", () => {
4646
it("success", (done) => {

‎lib/msal-browser/src/cache/ITokenCache.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
* Licensed under the MIT License.
44
*/
55

6-
import { ExternalTokenResponse } from "@azure/msal-common/browser";
7-
import { SilentRequest } from "../request/SilentRequest.js";
8-
import { LoadTokenOptions } from "./TokenCache.js";
9-
import { AuthenticationResult } from "../response/AuthenticationResult.js";
6+
import type { ExternalTokenResponse } from "@azure/msal-common/browser";
7+
import type { SilentRequest } from "../request/SilentRequest.js";
8+
import type { LoadTokenOptions } from "./TokenCache.js";
9+
import type { AuthenticationResult } from "../response/AuthenticationResult.js";
1010

1111
export interface ITokenCache {
1212
/**

‎lib/msal-browser/src/cache/TokenCache.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ import {
2323
AccountEntityUtils,
2424
} from "@azure/msal-common/browser";
2525
import { BrowserConfiguration } from "../config/Configuration.js";
26-
import { SilentRequest } from "../request/SilentRequest.js";
26+
import type { SilentRequest } from "../request/SilentRequest.js";
2727
import { BrowserCacheManager } from "./BrowserCacheManager.js";
28-
import { ITokenCache } from "./ITokenCache.js";
28+
import type { ITokenCache } from "./ITokenCache.js";
2929
import {
3030
createBrowserAuthError,
3131
BrowserAuthErrorCodes,
3232
} from "../error/BrowserAuthError.js";
33-
import { AuthenticationResult } from "../response/AuthenticationResult.js";
33+
import type { AuthenticationResult } from "../response/AuthenticationResult.js";
3434
import { base64Decode } from "../encode/Base64Decode.js";
3535
import * as BrowserCrypto from "../crypto/BrowserCrypto.js";
3636

‎lib/msal-browser/src/utils/BrowserUtils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
BrowserConfigurationAuthErrorCodes,
2020
createBrowserConfigurationAuthError,
2121
} from "../error/BrowserConfigurationAuthError.js";
22-
import { BrowserConfiguration } from "../config/Configuration.js";
22+
import type { BrowserConfiguration } from "../config/Configuration.js";
2323

2424
/**
2525
* Clears hash from window url.

‎lib/msal-common/src/authority/Authority.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import { CloudDiscoveryMetadata } from "./CloudDiscoveryMetadata.js";
5151
import { RegionDiscovery } from "./RegionDiscovery.js";
5252
import { RegionDiscoveryMetadata } from "./RegionDiscoveryMetadata.js";
5353
import { ImdsOptions } from "./ImdsOptions.js";
54-
import { AzureCloudOptions } from "../config/ClientConfiguration.js";
54+
import type { AzureCloudOptions } from "../config/ClientConfiguration.js";
5555
import { Logger } from "../logger/Logger.js";
5656
import { AuthError } from "../error/AuthError.js";
5757
import { IPerformanceClient } from "../telemetry/performance/IPerformanceClient.js";

‎lib/msal-common/src/cache/entities/AccountEntity.ts

+21-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,27 @@
33
* Licensed under the MIT License.
44
*/
55

6-
import { TenantProfile } from "../../account/AccountInfo.js";
6+
import { CacheAccountType, Separators } from "../../utils/Constants.js";
7+
import type { Authority } from "../../authority/Authority.js";
8+
import { ICrypto } from "../../crypto/ICrypto.js";
9+
import { ClientInfo, buildClientInfo } from "../../account/ClientInfo.js";
10+
import {
11+
AccountInfo,
12+
TenantProfile,
13+
buildTenantProfile,
14+
} from "../../account/AccountInfo.js";
15+
import {
16+
createClientAuthError,
17+
ClientAuthErrorCodes,
18+
} from "../../error/ClientAuthError.js";
19+
import { AuthorityType } from "../../authority/AuthorityType.js";
20+
import { Logger } from "../../logger/Logger.js";
21+
import {
22+
TokenClaims,
23+
getTenantIdFromIdTokenClaims,
24+
} from "../../account/TokenClaims.js";
25+
import { ProtocolMode } from "../../authority/ProtocolMode.js";
26+
727
/**
828
* Type that defines required and optional parameters for an Account field (based on universal cache schema implemented by all MSALs).
929
*

‎lib/msal-common/src/config/ClientConfiguration.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
DEFAULT_TOKEN_RENEWAL_OFFSET_SEC,
1212
} from "../utils/Constants.js";
1313
import { version } from "../packageMetadata.js";
14-
import { Authority } from "../authority/Authority.js";
14+
import type { Authority } from "../authority/Authority.js";
1515
import { AzureCloudInstance } from "../authority/AuthorityOptions.js";
1616
import { CacheManager, DefaultStorageClass } from "../cache/CacheManager.js";
1717
import { ServerTelemetryManager } from "../telemetry/server/ServerTelemetryManager.js";

‎lib/msal-common/src/crypto/ICrypto.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import {
77
ClientAuthErrorCodes,
88
createClientAuthError,
99
} from "../error/ClientAuthError.js";
10-
import { BaseAuthRequest } from "../request/BaseAuthRequest.js";
11-
import { ShrOptions, SignedHttpRequest } from "./SignedHttpRequest.js";
10+
import type { BaseAuthRequest } from "../request/BaseAuthRequest.js";
11+
import type { ShrOptions, SignedHttpRequest } from "./SignedHttpRequest.js";
1212

1313
/**
1414
* The PkceCodes type describes the structure

‎lib/msal-common/src/logger/Logger.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License.
44
*/
55

6-
import { LoggerOptions } from "../config/ClientConfiguration.js";
6+
import type { LoggerOptions } from "../config/ClientConfiguration.js";
77
import { Constants } from "../utils/Constants.js";
88

99
/**

‎lib/msal-common/src/request/BaseAuthRequest.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
import { AuthenticationScheme } from "../utils/Constants.js";
7-
import { AzureCloudOptions } from "../config/ClientConfiguration.js";
7+
import type { AzureCloudOptions } from "../config/ClientConfiguration.js";
88
import { StringDict } from "../utils/MsalTypes.js";
99
import { StoreInCache } from "./StoreInCache.js";
1010
import { ShrOptions } from "../crypto/SignedHttpRequest.js";

‎lib/msal-node/src/config/ManagedIdentityId.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
DEFAULT_MANAGED_IDENTITY_ID,
1212
ManagedIdentityIdType,
1313
} from "../utils/Constants.js";
14-
import { ManagedIdentityIdParams } from "./Configuration.js";
14+
import type { ManagedIdentityIdParams } from "./Configuration.js";
1515

1616
export class ManagedIdentityId {
1717
private _id: string;

‎shared-configs/eslint-config-msal/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ module.exports = {
8181
],
8282
"import/first": 2,
8383
"import/no-commonjs": 2,
84+
"import/no-cycle": 2,
8485
"import/no-duplicates": 2,
8586
"import/no-extraneous-dependencies": 2,
8687
"import/no-unresolved": 2,

0 commit comments

Comments
 (0)