Skip to content

Commit a7ff4db

Browse files
jo-arroyojo-arroyo
committed
Merge branch 'fix-merge-error' of https://github.com/AzureAD/microsoft-authentication-library-for-js into fix-merge-error
2 parents e71679f + 7ccc15e commit a7ff4db

File tree

209 files changed

+8529
-8947
lines changed

Some content is hidden

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

209 files changed

+8529
-8947
lines changed

‎change/@azure-msal-angular-35bd9ab8-a838-4a1d-b209-23121483cd59.json

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

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

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Deprecate logout() in Angular",
4+
"packageName": "@azure/msal-angular",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@azure-msal-angular-820dcb09-5891-41ea-8f1d-b104f96cfffb.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "major",
3+
"comment": "Remove deprecated functions and parameters",
4+
"packageName": "@azure/msal-angular",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@azure-msal-browser-1a65b4dc-cf2d-4661-8274-979fc585230f.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "major",
3+
"comment": "Remove deprecated functions and parameters",
4+
"packageName": "@azure/msal-browser",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@azure-msal-browser-fac3c638-31fb-4b30-bca8-dcba43a3e70a.json renamed to ‎change/@azure-msal-browser-8facee7b-c316-482c-8c39-8638baa2bbd0.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"type": "patch",
3-
"comment": "refactor RequestParameterBuilder",
3+
"comment": "Export additional function internally for use in tests",
44
"packageName": "@azure/msal-browser",
55
"email": "[email protected]",
66
"dependentChangeType": "patch"

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

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "update cache miss to warning from error",
4+
"packageName": "@azure/msal-browser",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@azure-msal-common-8ac1af0a-9ef9-4ee0-be7f-6b1d9de8d169.json

-7
This file was deleted.

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

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "minor",
3+
"comment": "Implemented a Retry Policy for the IMDS Managed Identity Source #7614",
4+
"packageName": "@azure/msal-common",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@azure-msal-common-c89d1c4f-49ca-48a8-bf87-78bd05b1e7cb.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "major",
3+
"comment": "Remove deprecated functions and parameters",
4+
"packageName": "@azure/msal-common",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@azure-msal-node-150e21b9-3631-48cf-96fe-b0c1ba24171e.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "major",
3+
"comment": "Remove deprecated functions and parameters",
4+
"packageName": "@azure/msal-node",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

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

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Machine Learning Managed Identity now correctly uses MSI's 2017 API instead of the 2019 API #7631",
4+
"packageName": "@azure/msal-node",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@azure-msal-node-8304ae25-1718-4f95-8511-303fb19fa240.json

-7
This file was deleted.

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

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "minor",
3+
"comment": "Implemented a Retry Policy for the IMDS Managed Identity Source #7614",
4+
"packageName": "@azure/msal-node",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

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

+72
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,78 @@
11
{
22
"name": "@azure/msal-node-extensions",
33
"entries": [
4+
{
5+
"date": "Tue, 25 Mar 2025 22:29:34 GMT",
6+
"version": "1.5.9",
7+
"tag": "@azure/msal-node-extensions_v1.5.9",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "[email protected]",
12+
"package": "@azure/msal-node-extensions",
13+
"commit": "8bbed7012616d9106c923d08b5c4e408a741577f",
14+
"comment": "Update @azure/msal-node-runtime dependency to ^0.18.1"
15+
},
16+
{
17+
"author": "beachball",
18+
"package": "@azure/msal-node-extensions",
19+
"comment": "Bump @azure/msal-common to v15.4.0",
20+
"commit": "not available"
21+
},
22+
{
23+
"author": "beachball",
24+
"package": "@azure/msal-node-extensions",
25+
"comment": "Bump eslint-config-msal to v0.0.0",
26+
"commit": "not available"
27+
},
28+
{
29+
"author": "beachball",
30+
"package": "@azure/msal-node-extensions",
31+
"comment": "Bump msal-test-utils to v0.0.1",
32+
"commit": "not available"
33+
},
34+
{
35+
"author": "beachball",
36+
"package": "@azure/msal-node-extensions",
37+
"comment": "Bump rollup-msal to v0.0.0",
38+
"commit": "not available"
39+
}
40+
]
41+
}
42+
},
43+
{
44+
"date": "Thu, 20 Mar 2025 22:09:04 GMT",
45+
"version": "1.5.8",
46+
"tag": "@azure/msal-node-extensions_v1.5.8",
47+
"comments": {
48+
"patch": [
49+
{
50+
"author": "beachball",
51+
"package": "@azure/msal-node-extensions",
52+
"comment": "Bump @azure/msal-common to v15.3.0",
53+
"commit": "not available"
54+
},
55+
{
56+
"author": "beachball",
57+
"package": "@azure/msal-node-extensions",
58+
"comment": "Bump eslint-config-msal to v0.0.0",
59+
"commit": "not available"
60+
},
61+
{
62+
"author": "beachball",
63+
"package": "@azure/msal-node-extensions",
64+
"comment": "Bump msal-test-utils to v0.0.1",
65+
"commit": "not available"
66+
},
67+
{
68+
"author": "beachball",
69+
"package": "@azure/msal-node-extensions",
70+
"comment": "Bump rollup-msal to v0.0.0",
71+
"commit": "not available"
72+
}
73+
]
74+
}
75+
},
476
{
577
"date": "Tue, 11 Mar 2025 18:51:25 GMT",
678
"version": "1.5.7",

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

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

3-
<!-- This log was last generated on Tue, 11 Mar 2025 18:51:25 GMT and should not be manually modified. -->
3+
<!-- This log was last generated on Tue, 25 Mar 2025 22:29:34 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 1.5.9
8+
9+
Tue, 25 Mar 2025 22:29:34 GMT
10+
11+
### Patches
12+
13+
- Update @azure/msal-node-runtime dependency to ^0.18.1 ([email protected])
14+
- Bump @azure/msal-common to v15.4.0
15+
- Bump eslint-config-msal to v0.0.0
16+
- Bump msal-test-utils to v0.0.1
17+
- Bump rollup-msal to v0.0.0
18+
19+
## 1.5.8
20+
21+
Thu, 20 Mar 2025 22:09:04 GMT
22+
23+
### Patches
24+
25+
- Bump @azure/msal-common to v15.3.0
26+
- Bump eslint-config-msal to v0.0.0
27+
- Bump msal-test-utils to v0.0.1
28+
- Bump rollup-msal to v0.0.0
29+
730
## 1.5.7
831

932
Tue, 11 Mar 2025 18:51:25 GMT

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

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

‎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.7";
3+
export const version = "1.5.9";

‎lib/msal-angular/CHANGELOG.json

+48
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,54 @@
11
{
22
"name": "@azure/msal-angular",
33
"entries": [
4+
{
5+
"date": "Tue, 25 Mar 2025 22:29:34 GMT",
6+
"version": "4.0.8",
7+
"tag": "@azure/msal-angular_v4.0.8",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "[email protected]",
12+
"package": "@azure/msal-angular",
13+
"commit": "8bbed7012616d9106c923d08b5c4e408a741577f",
14+
"comment": "Fix request type for ssoSilent"
15+
},
16+
{
17+
"author": "beachball",
18+
"package": "@azure/msal-angular",
19+
"comment": "Bump @azure/msal-browser to v4.9.0",
20+
"commit": "not available"
21+
},
22+
{
23+
"author": "beachball",
24+
"package": "@azure/msal-angular",
25+
"comment": "Bump eslint-config-msal to v0.0.0",
26+
"commit": "not available"
27+
}
28+
]
29+
}
30+
},
31+
{
32+
"date": "Thu, 20 Mar 2025 22:09:04 GMT",
33+
"version": "4.0.7",
34+
"tag": "@azure/msal-angular_v4.0.7",
35+
"comments": {
36+
"patch": [
37+
{
38+
"author": "beachball",
39+
"package": "@azure/msal-angular",
40+
"comment": "Bump @azure/msal-browser to v4.8.0",
41+
"commit": "not available"
42+
},
43+
{
44+
"author": "beachball",
45+
"package": "@azure/msal-angular",
46+
"comment": "Bump eslint-config-msal to v0.0.0",
47+
"commit": "not available"
48+
}
49+
]
50+
}
51+
},
452
{
553
"date": "Tue, 11 Mar 2025 18:51:25 GMT",
654
"version": "4.0.6",

‎lib/msal-angular/CHANGELOG.md

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

3-
<!-- This log was last generated on Tue, 11 Mar 2025 18:51:25 GMT and should not be manually modified. -->
3+
<!-- This log was last generated on Tue, 25 Mar 2025 22:29:34 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 4.0.8
8+
9+
Tue, 25 Mar 2025 22:29:34 GMT
10+
11+
### Patches
12+
13+
- Fix request type for ssoSilent ([email protected])
14+
- Bump @azure/msal-browser to v4.9.0
15+
- Bump eslint-config-msal to v0.0.0
16+
17+
## 4.0.7
18+
19+
Thu, 20 Mar 2025 22:09:04 GMT
20+
21+
### Patches
22+
23+
- Bump @azure/msal-browser to v4.8.0
24+
- Bump eslint-config-msal to v0.0.0
25+
726
## 4.0.6
827

928
Tue, 11 Mar 2025 18:51:25 GMT

‎lib/msal-angular/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@azure/msal-angular",
3-
"version": "4.0.6",
3+
"version": "4.0.8",
44
"author": {
55
"name": "Microsoft",
66
"email": "[email protected]",
@@ -69,7 +69,7 @@
6969
"zone.js": "~0.15.0"
7070
},
7171
"peerDependencies": {
72-
"@azure/msal-browser": "^4.7.0",
72+
"@azure/msal-browser": "^4.9.0",
7373
"rxjs": "^7.0.0"
7474
}
7575
}

‎lib/msal-angular/src/IMsalService.ts

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
*/
55

66
import {
7-
EndSessionRequest,
8-
AuthorizationUrlRequest,
97
AuthenticationResult,
108
PopupRequest,
119
RedirectRequest,
1210
SilentRequest,
1311
Logger,
12+
SsoSilentRequest,
13+
EndSessionRequest,
14+
EndSessionPopupRequest,
1415
} from "@azure/msal-browser";
1516
import { Observable } from "rxjs";
1617

@@ -24,8 +25,9 @@ export interface IMsalService {
2425
handleRedirectObservable(): Observable<AuthenticationResult | null>;
2526
loginPopup(request?: PopupRequest): Observable<AuthenticationResult>;
2627
loginRedirect(request?: RedirectRequest): Observable<void>;
27-
logout(logoutRequest?: EndSessionRequest): Observable<void>;
28-
ssoSilent(request: AuthorizationUrlRequest): Observable<AuthenticationResult>;
28+
logoutRedirect(logoutRequest?: EndSessionRequest): Observable<void>;
29+
logoutPopup(logoutRequest?: EndSessionPopupRequest): Observable<void>;
30+
ssoSilent(request: SsoSilentRequest): Observable<AuthenticationResult>;
2931
getLogger(): Logger;
3032
setLogger(logger: Logger): void;
3133
}

0 commit comments

Comments
 (0)