Skip to content

Commit 5b242a6

Browse files
jo-arroyojo-arroyo
committed
Merge branch 'msal-v5' of https://github.com/AzureAD/microsoft-authentication-library-for-js into fix-merge-error
2 parents 40a61ae + 39b019d commit 5b242a6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+612
-234
lines changed

‎change/@azure-msal-angular-4fa3b34e-2f11-4135-9ee1-cf4b7c6cfb63.json

-7
This file was deleted.

‎change/@azure-msal-browser-8facee7b-c316-482c-8c39-8638baa2bbd0.json

-7
This file was deleted.

‎change/@azure-msal-browser-b8331fbd-7e54-4c81-9dbf-d133b23b93bb.json

-7
This file was deleted.

‎change/@azure-msal-common-a198dabd-e74d-48c4-90fe-b9c1e4c81e93.json

-7
This file was deleted.

‎change/@azure-msal-node-5da4bb96-46cf-43ee-bf4e-e2e181744c66.json

-7
This file was deleted.

‎change/@azure-msal-node-9aa1a5a1-daa9-4887-890e-6b873f5e0b8f.json

-7
This file was deleted.

‎extensions/msal-node-extensions/CHANGELOG.json

+33
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,39 @@
11
{
22
"name": "@azure/msal-node-extensions",
33
"entries": [
4+
{
5+
"date": "Tue, 08 Apr 2025 16:56:06 GMT",
6+
"version": "1.5.10",
7+
"tag": "@azure/msal-node-extensions_v1.5.10",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "beachball",
12+
"package": "@azure/msal-node-extensions",
13+
"comment": "Bump @azure/msal-common to v15.5.0",
14+
"commit": "not available"
15+
},
16+
{
17+
"author": "beachball",
18+
"package": "@azure/msal-node-extensions",
19+
"comment": "Bump eslint-config-msal to v0.0.0",
20+
"commit": "not available"
21+
},
22+
{
23+
"author": "beachball",
24+
"package": "@azure/msal-node-extensions",
25+
"comment": "Bump msal-test-utils to v0.0.1",
26+
"commit": "not available"
27+
},
28+
{
29+
"author": "beachball",
30+
"package": "@azure/msal-node-extensions",
31+
"comment": "Bump rollup-msal to v0.0.0",
32+
"commit": "not available"
33+
}
34+
]
35+
}
36+
},
437
{
538
"date": "Tue, 25 Mar 2025 22:29:34 GMT",
639
"version": "1.5.9",

‎extensions/msal-node-extensions/CHANGELOG.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
# Change Log - @azure/msal-node-extensions
22

3-
<!-- This log was last generated on Tue, 25 Mar 2025 22:29:34 GMT and should not be manually modified. -->
3+
<!-- This log was last generated on Tue, 08 Apr 2025 16:56:06 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 1.5.10
8+
9+
Tue, 08 Apr 2025 16:56:06 GMT
10+
11+
### Patches
12+
13+
- Bump @azure/msal-common to v15.5.0
14+
- Bump eslint-config-msal to v0.0.0
15+
- Bump msal-test-utils to v0.0.1
16+
- Bump rollup-msal to v0.0.0
17+
718
## 1.5.9
819

920
Tue, 25 Mar 2025 22:29:34 GMT

‎extensions/msal-node-extensions/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@azure/msal-node-extensions",
3-
"version": "1.5.9",
3+
"version": "1.5.10",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/AzureAD/microsoft-authentication-library-for-js.git"
@@ -64,7 +64,7 @@
6464
]
6565
},
6666
"dependencies": {
67-
"@azure/msal-common": "15.4.0",
67+
"@azure/msal-common": "15.5.0",
6868
"@azure/msal-node-runtime": "^0.18.1",
6969
"keytar": "^7.8.0"
7070
},

‎extensions/msal-node-extensions/src/packageMetadata.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/* eslint-disable header/header */
22
export const name = "@azure/msal-node-extensions";
3-
export const version = "1.5.9";
3+
export const version = "1.5.10";

‎lib/msal-angular/CHANGELOG.json

+33
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,39 @@
11
{
22
"name": "@azure/msal-angular",
33
"entries": [
4+
{
5+
"date": "Tue, 08 Apr 2025 16:56:05 GMT",
6+
"version": "4.0.9",
7+
"tag": "@azure/msal-angular_v4.0.9",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "[email protected]",
12+
"package": "@azure/msal-angular",
13+
"commit": "fabf962dcb69611b4516342107bc7bcc364c4e68",
14+
"comment": "added resetInProgressEvent function to reset event after handleRedirectPromise is called #7682"
15+
},
16+
{
17+
"author": "[email protected]",
18+
"package": "@azure/msal-angular",
19+
"commit": "fabf962dcb69611b4516342107bc7bcc364c4e68",
20+
"comment": "Deprecate logout() in Angular"
21+
},
22+
{
23+
"author": "beachball",
24+
"package": "@azure/msal-angular",
25+
"comment": "Bump @azure/msal-browser to v4.10.0",
26+
"commit": "not available"
27+
},
28+
{
29+
"author": "beachball",
30+
"package": "@azure/msal-angular",
31+
"comment": "Bump eslint-config-msal to v0.0.0",
32+
"commit": "not available"
33+
}
34+
]
35+
}
36+
},
437
{
538
"date": "Tue, 25 Mar 2025 22:29:34 GMT",
639
"version": "4.0.8",

‎lib/msal-angular/CHANGELOG.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
# Change Log - @azure/msal-angular
22

3-
<!-- This log was last generated on Tue, 25 Mar 2025 22:29:34 GMT and should not be manually modified. -->
3+
<!-- This log was last generated on Tue, 08 Apr 2025 16:56:05 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 4.0.9
8+
9+
Tue, 08 Apr 2025 16:56:05 GMT
10+
11+
### Patches
12+
13+
- added resetInProgressEvent function to reset event after handleRedirectPromise is called #7682 ([email protected])
14+
- Deprecate logout() in Angular ([email protected])
15+
- Bump @azure/msal-browser to v4.10.0
16+
- Bump eslint-config-msal to v0.0.0
17+
718
## 4.0.8
819

920
Tue, 25 Mar 2025 22:29:34 GMT

‎lib/msal-angular/karma.conf.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ module.exports = function (config) {
1818
jasmine: {
1919
failSpecWithNoExpectations: true
2020
},
21-
clearContext: false // leave Jasmine Spec Runner output visible in browser
21+
clearContext: false, // leave Jasmine Spec Runner output visible in browser
22+
captureConsole: true // turns on console logging for test debugging
2223
},
2324
coverageIstanbulReporter: {
2425
dir: require("path").join(__dirname, "./coverage"),

‎lib/msal-angular/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@azure/msal-angular",
3-
"version": "4.0.8",
3+
"version": "4.0.9",
44
"author": {
55
"name": "Microsoft",
66
"email": "[email protected]",
@@ -48,7 +48,7 @@
4848
"@angular/platform-browser": "^19.2.2",
4949
"@angular/platform-browser-dynamic": "^19.2.2",
5050
"@angular/router": "^19.2.2",
51-
"@azure/msal-browser": "^4.7.0",
51+
"@azure/msal-browser": "^4.10.0",
5252
"@types/jasmine": "~3.6.0",
5353
"@types/jasminewd2": "~2.0.3",
5454
"@types/node": "^12.11.1",
@@ -69,7 +69,7 @@
6969
"zone.js": "~0.15.0"
7070
},
7171
"peerDependencies": {
72-
"@azure/msal-browser": "^4.9.0",
72+
"@azure/msal-browser": "^4.10.0",
7373
"rxjs": "^7.0.0"
7474
}
7575
}

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

+26
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ function initializeMsal(providers: any[] = []) {
4040
}),
4141
],
4242
providers: [MsalBroadcastService, ...providers],
43+
teardown: { destroyAfterEach: false },
4344
});
4445
broadcastService = TestBed.inject(MsalBroadcastService);
4546
}
@@ -442,4 +443,29 @@ describe("MsalBroadcastService", () => {
442443
InteractionType.Redirect
443444
);
444445
});
446+
447+
it("automatically sets inProgress to None when handleRedirectPromise returns without emitting an event", (done) => {
448+
const expectedInProgress = [
449+
InteractionStatus.Startup,
450+
InteractionStatus.None,
451+
];
452+
let index = 0;
453+
454+
subscription = broadcastService.inProgress$.subscribe((result) => {
455+
expect(result).toEqual(expectedInProgress[index]);
456+
if (index === expectedInProgress.length - 1) {
457+
done();
458+
} else if (expectedInProgress[index] === InteractionStatus.Startup) {
459+
index++;
460+
broadcastService.resetInProgressEvent();
461+
} else {
462+
index++;
463+
}
464+
});
465+
466+
eventHandler.emitEvent(
467+
EventType.INITIALIZE_START,
468+
InteractionType.Redirect
469+
);
470+
});
445471
});

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

+9
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,13 @@ export class MsalBroadcastService {
7171
}
7272
});
7373
}
74+
75+
/**
76+
* Resets inProgress state to None
77+
*/
78+
resetInProgressEvent(): void {
79+
if (this._inProgress.value === InteractionStatus.Startup) {
80+
this._inProgress.next(InteractionStatus.None);
81+
}
82+
}
7483
}

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

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ function initializeMsal(providers: any[] = []) {
7777
provideHttpClientTesting(),
7878
provideRouter([]),
7979
],
80+
teardown: { destroyAfterEach: false },
8081
});
8182

8283
authService = TestBed.inject(MsalService);

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

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ function initializeMsal() {
131131
provideHttpClientTesting(),
132132
provideRouter([]),
133133
],
134+
teardown: { destroyAfterEach: false },
134135
});
135136

136137
interceptor = TestBed.inject(MsalInterceptor);

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

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ describe("MsalCustomNaviationClient", () => {
4444
MsalService,
4545
MsalGuard,
4646
],
47+
teardown: { destroyAfterEach: false },
4748
});
4849
authService = TestBed.inject(MsalService);
4950
navigationClient = TestBed.inject(MsalCustomNavigationClient);

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

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ function initializeMsal() {
2727
declarations: [MsalRedirectComponent],
2828
imports: [MsalModule.forRoot(MSALInstanceFactory(), null, null)],
2929
providers: [],
30+
teardown: { destroyAfterEach: false },
3031
});
3132

3233
authService = TestBed.inject(MsalService);

0 commit comments

Comments
 (0)