@equinor/fusion-framework-module-msal 6.0.0 → 6.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/dist/esm/v2/create-proxy-provider.js +17 -6
- package/dist/esm/v2/create-proxy-provider.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +3 -3
- package/src/v2/create-proxy-provider.ts +19 -6
- package/src/version.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
+
## 6.0.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`e8d6784`](https://github.com/equinor/fusion-framework/commit/e8d67848d53b8e733ddb60335fedeae637131c8d) Thanks [@odinr](https://github.com/odinr)! - Fix request format handling in v2 proxy provider to support both v2 and v4 request formats.
|
|
8
|
+
|
|
9
|
+
The `acquireToken` and `acquireAccessToken` methods in the v2 proxy provider now correctly detect and handle requests in both v2 format (`{ scopes, account }`) and v4 format (`{ request: { scopes, account } }`), ensuring compatibility with both API versions.
|
|
10
|
+
|
|
3
11
|
## 6.0.0
|
|
4
12
|
|
|
5
13
|
### Major Changes
|
|
@@ -1,6 +1,19 @@
|
|
|
1
1
|
import { createProxyClient } from './create-proxy-client';
|
|
2
2
|
import { mapAccountInfo } from './map-account-info';
|
|
3
3
|
import { MsalModuleVersion } from '../static';
|
|
4
|
+
/**
|
|
5
|
+
* Checks if a request is in MSAL v4 format.
|
|
6
|
+
*
|
|
7
|
+
* @param req - The request object to check
|
|
8
|
+
* @returns True if the request is in v4 format (has a `request` property with `scopes` and `account`)
|
|
9
|
+
*/
|
|
10
|
+
function isRequestV4(req) {
|
|
11
|
+
if (typeof req !== 'object' || req === null) {
|
|
12
|
+
return false;
|
|
13
|
+
}
|
|
14
|
+
const requestV4 = req;
|
|
15
|
+
return 'request' in requestV4;
|
|
16
|
+
}
|
|
4
17
|
/**
|
|
5
18
|
* Creates a proxy provider for MSAL v2 compatibility.
|
|
6
19
|
*
|
|
@@ -66,9 +79,8 @@ export function createProxyProvider(provider) {
|
|
|
66
79
|
case 'acquireToken': {
|
|
67
80
|
// Adapt v4 acquireToken to v2 signature with proper type mapping
|
|
68
81
|
const acquireToken = async (req) => {
|
|
69
|
-
const
|
|
70
|
-
|
|
71
|
-
});
|
|
82
|
+
const request = isRequestV4(req) ? req : { scopes: req.scopes, account: req.account };
|
|
83
|
+
const result = await target.acquireToken(request);
|
|
72
84
|
// Convert null to undefined for v2 compatibility
|
|
73
85
|
return result || undefined;
|
|
74
86
|
};
|
|
@@ -77,9 +89,8 @@ export function createProxyProvider(provider) {
|
|
|
77
89
|
case 'acquireAccessToken': {
|
|
78
90
|
// Adapt v4 acquireAccessToken to v2 signature
|
|
79
91
|
const acquireAccessToken = async (req) => {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
});
|
|
92
|
+
const request = isRequestV4(req) ? req : { scopes: req.scopes, account: req.account };
|
|
93
|
+
return await target.acquireAccessToken(request);
|
|
83
94
|
};
|
|
84
95
|
return acquireAccessToken;
|
|
85
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-proxy-provider.js","sourceRoot":"","sources":["../../../src/v2/create-proxy-provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create-proxy-provider.js","sourceRoot":"","sources":["../../../src/v2/create-proxy-provider.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C;;;;;GAKG;AACH,SAAS,WAAW,CAAC,GAAY;IAC/B,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QAC5C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,SAAS,GAAG,GAA0B,CAAC;IAC7C,OAAO,SAAS,IAAI,SAAS,CAAC;AAChC,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAAuB;IACzD,mEAAmE;IACnE,MAAM,QAAQ,GAAG,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEpD,mFAAmF;IACnF,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,QAAQ,EAAE;QAChC,GAAG,EAAE,CAAC,MAAqB,EAAE,IAA4B,EAAE,EAAE;YAC3D,QAAQ,IAAI,EAAE,CAAC;gBACb,KAAK,SAAS,CAAC,CAAC,CAAC;oBACf,OAAO,QAAQ,CAAC,OAAO,CAAC;gBAC1B,CAAC;gBACD,KAAK,aAAa,CAAC,CAAC,CAAC;oBACnB,OAAO,iBAAiB,CAAC,EAAE,CAAC;gBAC9B,CAAC;gBACD,KAAK,QAAQ,CAAC,CAAC,CAAC;oBACd,0CAA0C;oBAC1C,OAAO,QAAiD,CAAC;gBAC3D,CAAC;gBACD,KAAK,eAAe,CAAC,CAAC,CAAC;oBACrB,wDAAwD;oBACxD,OAAO,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;oBAChE,OAAO,QAAwD,CAAC;gBAClE,CAAC;gBACD,KAAK,gBAAgB,CAAC,CAAC,CAAC;oBACtB,yDAAyD;oBACzD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;oBAC/B,MAAM,cAAc,GAAuC,OAAO;wBAChE,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC;wBACzB,CAAC,CAAC,SAAS,CAAC;oBACd,OAAO,cAAc,CAAC;gBACxB,CAAC;gBACD,KAAK,eAAe,CAAC,CAAC,CAAC;oBACrB,4CAA4C;oBAC5C,OAAO,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAC;oBACpE,OAAO,SAAS,CAAC;gBACnB,CAAC;gBACD,KAAK,cAAc,CAAC,CAAC,CAAC;oBACpB,6DAA6D;oBAC7D,OAAO,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;oBACtD,MAAM,YAAY,GAAqC,GAAG,EAAE,CAAC,QAAQ,CAAC;oBACtE,OAAO,YAAY,CAAC;gBACtB,CAAC;gBACD,KAAK,cAAc,CAAC,CAAC,CAAC;oBACpB,iEAAiE;oBACjE,MAAM,YAAY,GAAqC,KAAK,EAAE,GAG7D,EAAE,EAAE;wBACH,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;wBACtF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,OAA8B,CAAC,CAAC;wBAEzE,iDAAiD;wBACjD,OAAO,MAAM,IAAI,SAAS,CAAC;oBAC7B,CAAC,CAAC;oBACF,OAAO,YAAY,CAAC;gBACtB,CAAC;gBACD,KAAK,oBAAoB,CAAC,CAAC,CAAC;oBAC1B,8CAA8C;oBAC9C,MAAM,kBAAkB,GAA2C,KAAK,EAAE,GAGzE,EAAE,EAAE;wBACH,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;wBACtF,OAAO,MAAM,MAAM,CAAC,kBAAkB,CAAC,OAA8B,CAAC,CAAC;oBACzE,CAAC,CAAC;oBACF,OAAO,kBAAkB,CAAC;gBAC5B,CAAC;gBACD,KAAK,OAAO,CAAC,CAAC,CAAC;oBACb,0DAA0D;oBAC1D,MAAM,KAAK,GAA8B,KAAK,EAAE,OAE/C,EAAE,EAAE;wBACH,iEAAiE;wBACjE,IAAI,OAAO,EAAE,cAAc,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;4BAC9C,OAAO;wBACT,CAAC;wBACD,gDAAgD;wBAChD,MAAM,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;oBAClD,CAAC,CAAC;oBACF,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,KAAK,QAAQ,CAAC,CAAC,CAAC;oBACd,kCAAkC;oBAClC,MAAM,MAAM,GAA+B,KAAK,EAAE,OAAkC,EAAE,EAAE;wBACtF,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;oBAC7D,CAAC,CAAC;oBACF,OAAO,MAAM,CAAC;gBAChB,CAAC;gBACD,KAAK,gBAAgB,CAAC,CAAC,CAAC;oBACtB,0CAA0C;oBAC1C,MAAM,cAAc,GAAuC,KAAK,IAAI,EAAE;wBACpE,MAAM,MAAM,CAAC,cAAc,EAAE,CAAC;wBAC9B,0CAA0C;wBAC1C,OAAO,IAAI,CAAC;oBACd,CAAC,CAAC;oBACF,OAAO,cAAc,CAAC;gBACxB,CAAC;gBACD,KAAK,qBAAqB,CAAC,CAAC,CAAC;oBAC3B,kEAAkE;oBAClE,MAAM,mBAAmB,GAA4C,CACnE,OAAe,EACf,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAA4B,CAAM,CAAC;oBACnE,OAAO,mBAAmB,CAAC;gBAC7B,CAAC;gBACD,KAAK,SAAS,CAAC,CAAC,CAAC;oBACf,4CAA4C;oBAC5C,OAAO,GAAG,EAAE;wBACV,WAAW;oBACb,CAAC,CAAC;gBACJ,CAAC;gBACD,OAAO,CAAC,CAAC,CAAC;oBACR,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;wBACpB,OAAO,SAAS,CAAC;oBACnB,CAAC;oBACD,2DAA2D;oBAC3D,MAAM,eAAe,GAAU,IAAI,CAAC;oBACpC,yEAAyE;oBACzE,OAAQ,MAAwB,CAAC,eAAe,CAAC,CAAC;gBACpD,CAAC;YACH,CAAC;QACH,CAAC;KACF,CAAC,CAAC;IAEH,wDAAwD;IACxD,OAAO,KAAoC,CAAC;AAC9C,CAAC"}
|
package/dist/esm/version.js
CHANGED