Skip to content

Commit 24f3394

Browse files
authored
[v5] Fix merge error imports (#7726)
This PR fixes discrepancies caused by merging `dev` into `msal-v5` branches. - MSAL Angular v5 requires same version of rxjs for dependencies, this includes samples. Unnecessary css imports were also removed. - `secureCookies` was removed in #7669 but added in again by merge - AccountEntity.ts imports were removed in #7674 but added in again by merge This PR also regenerates the package-lock for MSAL
1 parent 35d8027 commit 24f3394

14 files changed

Lines changed: 309 additions & 294 deletions

File tree

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "minor",
3+
"comment": "Update rxjs dependency #7726",
4+
"packageName": "@azure/msal-angular",
5+
"email": "joarroyo@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fix v4 merge errors #7726",
4+
"packageName": "@azure/msal-browser",
5+
"email": "joarroyo@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fix v4 merge errors #7726",
4+
"packageName": "@azure/msal-common",
5+
"email": "joarroyo@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

lib/msal-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"karma-jasmine-html-reporter": "^2.0.0",
6363
"ng-packagr": "^19.2.0",
6464
"prettier": "2.8.7",
65-
"rxjs": "^7.8.1",
65+
"rxjs": "^7.8.2",
6666
"ts-node": "~8.3.0",
6767
"tslib": "^2.0.0",
6868
"typescript": "~5.8.2",

lib/msal-angular/tsconfig.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@
1818
"paths": {
1919
"msal-angular": [
2020
"dist/msal-angular"
21-
]
21+
],
22+
"rxjs": [
23+
"node_modules/rxjs"
24+
],
25+
"rxjs/*": [
26+
"node_modules/rxjs/*"
27+
],
2228
},
2329
"useDefineForClassFields": false
2430
}

lib/msal-browser/src/config/Configuration.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,6 @@ export type CacheOptions = {
123123
* @deprecated This option is deprecated and will be removed in the next major version.
124124
*/
125125
storeAuthStateInCookie?: boolean;
126-
/**
127-
* If set, MSAL sets the "Secure" flag on cookies so they can only be sent over HTTPS. By default this flag is set to true.
128-
* @deprecated This option will be removed in the next major version and all cookies set will include the Secure attribute.
129-
*/
130-
secureCookies?: boolean;
131126
/**
132127
* If set, MSAL will attempt to migrate cache entries from older versions on initialization. By default this flag is set to true if cacheLocation is localStorage, otherwise false.
133128
* @deprecated This option is deprecated and will be removed in the next major version.

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,7 @@
33
* Licensed under the MIT License.
44
*/
55

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";
6+
import { TenantProfile } from "../../account/AccountInfo.js";
267

278
/**
289
* Type that defines required and optional parameters for an Account field (based on universal cache schema implemented by all MSALs).

package-lock.json

Lines changed: 260 additions & 260 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/msal-angular-samples/angular-b2c-sample/angular.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"src/assets"
3131
],
3232
"styles": [
33-
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
3433
"src/styles.css"
3534
],
3635
"scripts": [],
@@ -123,7 +122,6 @@
123122
"src/assets"
124123
],
125124
"styles": [
126-
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
127125
"src/styles.css"
128126
],
129127
"scripts": []

samples/msal-angular-samples/angular-b2c-sample/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@azure/msal-angular": "^4.0.0",
2525
"@azure/msal-browser": "^4.0.0",
2626
"core-js": "^3.21.1",
27-
"rxjs": "^7.8.0",
27+
"rxjs": "^7.8.2",
2828
"tslib": "^2.3.0",
2929
"zone.js": "~0.15.0"
3030
},

0 commit comments

Comments
 (0)