@equinor/fusion-framework-module-msal 4.0.2 → 4.0.3
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 +9 -0
- package/dist/esm/module.js +6 -16
- package/dist/esm/module.js.map +1 -1
- package/dist/esm/resolve-version.js +1 -1
- package/dist/esm/resolve-version.js.map +1 -1
- package/dist/esm/static.js +1 -1
- package/dist/esm/v2/client/client.js +42 -57
- package/dist/esm/v2/client/client.js.map +1 -1
- package/dist/esm/v2/client/create-auth-client.js +9 -3
- package/dist/esm/v2/client/create-auth-client.js.map +1 -1
- package/dist/esm/v2/client/log/console.js +19 -19
- package/dist/esm/v2/client/log/console.js.map +1 -1
- package/dist/esm/v2/configurator.js +9 -20
- package/dist/esm/v2/configurator.js.map +1 -1
- package/dist/esm/v2/provider.js +33 -62
- package/dist/esm/v2/provider.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/static.d.ts +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +3 -10
- package/src/version.ts +1 -1
- package/tsconfig.json +4 -10
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
+
## 4.0.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#3012](https://github.com/equinor/fusion-framework/pull/3012) [`f53b60b`](https://github.com/equinor/fusion-framework/commit/f53b60b7805706ce7617e614f0ac0c24317a2e43) Thanks [@odinr](https://github.com/odinr)! - removed `typesVersions` from packages, since we no longer support TS < 4.7, also corrected `types` path in package.json
|
|
8
|
+
|
|
9
|
+
- Updated dependencies [[`f53b60b`](https://github.com/equinor/fusion-framework/commit/f53b60b7805706ce7617e614f0ac0c24317a2e43)]:
|
|
10
|
+
- @equinor/fusion-framework-module@4.3.8
|
|
11
|
+
|
|
3
12
|
## 4.0.2
|
|
4
13
|
|
|
5
14
|
### Patch Changes
|
package/dist/esm/module.js
CHANGED
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { SemanticVersion, } from '@equinor/fusion-framework-module';
|
|
11
2
|
import { MsalModuleVersion } from './static';
|
|
12
3
|
import { AuthConfigurator, AuthProvider } from './v2';
|
|
@@ -14,15 +5,14 @@ export const module = {
|
|
|
14
5
|
name: 'auth',
|
|
15
6
|
version: new SemanticVersion(MsalModuleVersion.Latest),
|
|
16
7
|
configure: () => new AuthConfigurator(),
|
|
17
|
-
initialize: (init) =>
|
|
18
|
-
|
|
19
|
-
const config = yield init.config.createConfigAsync(init);
|
|
8
|
+
initialize: async (init) => {
|
|
9
|
+
const config = await init.config.createConfigAsync(init);
|
|
20
10
|
// configured to use a custom provider
|
|
21
11
|
if (config.provider) {
|
|
22
12
|
return config.provider;
|
|
23
13
|
}
|
|
24
14
|
// check if the provider is defined in the parent module
|
|
25
|
-
const hostProvider =
|
|
15
|
+
const hostProvider = init.ref?.auth;
|
|
26
16
|
if (hostProvider) {
|
|
27
17
|
try {
|
|
28
18
|
return hostProvider.createProxyProvider(config.version);
|
|
@@ -39,11 +29,11 @@ export const module = {
|
|
|
39
29
|
// create a new provider
|
|
40
30
|
const authProvider = new AuthProvider(config.client);
|
|
41
31
|
if (config.requiresAuth) {
|
|
42
|
-
|
|
43
|
-
|
|
32
|
+
await authProvider.handleRedirect();
|
|
33
|
+
await authProvider.login({ onlyIfRequired: true });
|
|
44
34
|
}
|
|
45
35
|
return authProvider;
|
|
46
|
-
}
|
|
36
|
+
},
|
|
47
37
|
};
|
|
48
38
|
export const enableMSAL = (
|
|
49
39
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
package/dist/esm/module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,GAChB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAA6C,MAAM,MAAM,CAAC;AAKjG,MAAM,CAAC,MAAM,MAAM,GAAe;IAChC,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,IAAI,eAAe,CAAC,iBAAiB,CAAC,MAAM,CAAC;IACtD,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,gBAAgB,EAAE;IACvC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACzB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAEzD,sCAAsC;QACtC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC,QAAQ,CAAC;QACzB,CAAC;QAED,wDAAwD;QACxD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,IAAoB,CAAC;QACpD,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,CAAC;gBACH,OAAO,YAAY,CAAC,mBAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC1D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,6CAA6C,EAAE,KAAK,CAAC,CAAC;gBACpE,kEAAkE;gBAClE,OAAO,YAAY,CAAC;YACtB,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CACb,wFAAwF,CACzF,CAAC;QACJ,CAAC;QAED,wBAAwB;QACxB,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAErD,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;YACxB,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC;YACpC,MAAM,YAAY,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CACF,CAAC;AAOF,MAAM,CAAC,MAAM,UAAU,GAAG;AACxB,8DAA8D;AAC9D,YAA4C,EAC5C,SAAwB,EAClB,EAAE;IACR,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;IACjE,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,SAAuB,EAAE,EAAE,CAAC,CAAC;IACzD,MAAM;IACN,SAAS;CACV,CAAC,CAAC;AAQH,eAAe,MAAM,CAAC"}
|
|
@@ -14,7 +14,7 @@ export function resolveVersion(version) {
|
|
|
14
14
|
if (semver.gt(wantedVersion, latestVersion)) {
|
|
15
15
|
throw new Error(`Requested version ${version} is greater than the latest version ${MsalModuleVersion.Latest}`);
|
|
16
16
|
}
|
|
17
|
-
const enumVersion = Object.values(MsalModuleVersion).find((x) =>
|
|
17
|
+
const enumVersion = Object.values(MsalModuleVersion).find((x) => semver.coerce(x)?.major === wantedVersion.major);
|
|
18
18
|
return {
|
|
19
19
|
wantedVersion,
|
|
20
20
|
latestVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-version.js","sourceRoot":"","sources":["../../src/resolve-version.ts"],"names":[],"mappings":"AAAA,OAAO,MAAuB,MAAM,QAAQ,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C,MAAM,UAAU,cAAc,CAAC,OAAwB;IAOrD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACzE,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC9D,2CAA2C;IAC3C,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,mBAAmB,OAAO,WAAW,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,0CAA0C;IAC1C,IAAI,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,aAAc,CAAC,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CACb,qBAAqB,OAAO,uCAAuC,iBAAiB,CAAC,MAAM,EAAE,CAC9F,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CACvD,CAAC,CAAC,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"resolve-version.js","sourceRoot":"","sources":["../../src/resolve-version.ts"],"names":[],"mappings":"AAAA,OAAO,MAAuB,MAAM,QAAQ,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C,MAAM,UAAU,cAAc,CAAC,OAAwB;IAOrD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACzE,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC9D,2CAA2C;IAC3C,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,mBAAmB,OAAO,WAAW,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,0CAA0C;IAC1C,IAAI,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,aAAc,CAAC,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CACb,qBAAqB,OAAO,uCAAuC,iBAAiB,CAAC,MAAM,EAAE,CAC9F,CAAC;IACJ,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CACvD,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,aAAa,CAAC,KAAK,CAClC,CAAC;IAEvB,OAAO;QACL,aAAa;QACb,aAAa;QACb,WAAW;QACX,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC;QACpD,eAAe,EAAE,aAAa,CAAC,KAAK,KAAK,aAAa,CAAC,KAAK;KAC7D,CAAC;AACJ,CAAC;AAED,eAAe,cAAc,CAAC"}
|
package/dist/esm/static.js
CHANGED
|
@@ -3,6 +3,6 @@ export const ModuleName = 'msal';
|
|
|
3
3
|
export var MsalModuleVersion;
|
|
4
4
|
(function (MsalModuleVersion) {
|
|
5
5
|
MsalModuleVersion["V2"] = "v2";
|
|
6
|
-
MsalModuleVersion["Latest"] = "4.0.
|
|
6
|
+
MsalModuleVersion["Latest"] = "4.0.3";
|
|
7
7
|
})(MsalModuleVersion || (MsalModuleVersion = {}));
|
|
8
8
|
//# sourceMappingURL=static.js.map
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { PublicClientApplication, } from '@azure/msal-browser';
|
|
11
2
|
import { defaultBehavior } from './behavior';
|
|
12
3
|
/**
|
|
@@ -41,6 +32,7 @@ import { defaultBehavior } from './behavior';
|
|
|
41
32
|
* @see [Microsoft identity platform](https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow)
|
|
42
33
|
*/
|
|
43
34
|
export class AuthClient extends PublicClientApplication {
|
|
35
|
+
tenantId;
|
|
44
36
|
/**
|
|
45
37
|
* @returns
|
|
46
38
|
* Returns account for client tenant that MSAL currently has data for.
|
|
@@ -48,12 +40,11 @@ export class AuthClient extends PublicClientApplication {
|
|
|
48
40
|
*/
|
|
49
41
|
get account() {
|
|
50
42
|
const accounts = this.getAllAccounts();
|
|
51
|
-
const account = accounts.find((a) =>
|
|
43
|
+
const account = accounts.find((a) => a.idTokenClaims?.aud === this.clientId);
|
|
52
44
|
return account;
|
|
53
45
|
}
|
|
54
46
|
get hasValidClaims() {
|
|
55
|
-
|
|
56
|
-
const idTokenClaims = (_a = this.account) === null || _a === void 0 ? void 0 : _a.idTokenClaims;
|
|
47
|
+
const idTokenClaims = this.account?.idTokenClaims;
|
|
57
48
|
if (idTokenClaims) {
|
|
58
49
|
const epoch = Math.ceil(Date.now() / 1000);
|
|
59
50
|
return idTokenClaims.exp > epoch;
|
|
@@ -64,8 +55,7 @@ export class AuthClient extends PublicClientApplication {
|
|
|
64
55
|
* @returns - Configured client id
|
|
65
56
|
*/
|
|
66
57
|
get clientId() {
|
|
67
|
-
|
|
68
|
-
return (_a = this.config.auth) === null || _a === void 0 ? void 0 : _a.clientId;
|
|
58
|
+
return this.config.auth?.clientId;
|
|
69
59
|
}
|
|
70
60
|
get requestOrigin() {
|
|
71
61
|
return this.browserStorage.getTemporaryCache('request.origin', true);
|
|
@@ -89,31 +79,28 @@ export class AuthClient extends PublicClientApplication {
|
|
|
89
79
|
* @returns
|
|
90
80
|
* Promise that is fulfilled when this function has completed, or rejected if an error was raised.
|
|
91
81
|
*/
|
|
92
|
-
login(
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
const res = yield this.ssoSilent(request);
|
|
102
|
-
return res;
|
|
103
|
-
}
|
|
104
|
-
catch (_b) {
|
|
105
|
-
this.logger.verbose('Silent login attempt failed');
|
|
106
|
-
}
|
|
82
|
+
async login(options, behavior = defaultBehavior, silent = true) {
|
|
83
|
+
const loginHint = options?.loginHint || this.account?.username;
|
|
84
|
+
const scopes = options?.scopes || [];
|
|
85
|
+
const request = { ...options, loginHint, scopes };
|
|
86
|
+
if (loginHint && silent) {
|
|
87
|
+
this.logger.verbose('Attempting to login in silently');
|
|
88
|
+
try {
|
|
89
|
+
const res = await this.ssoSilent(request);
|
|
90
|
+
return res;
|
|
107
91
|
}
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
case 'popup':
|
|
111
|
-
return this.loginPopup(request);
|
|
112
|
-
case 'redirect': {
|
|
113
|
-
return this.loginRedirect(request);
|
|
114
|
-
}
|
|
92
|
+
catch {
|
|
93
|
+
this.logger.verbose('Silent login attempt failed');
|
|
115
94
|
}
|
|
116
|
-
}
|
|
95
|
+
}
|
|
96
|
+
this.logger.verbose(`Attempting to login in by [${behavior}]`);
|
|
97
|
+
switch (behavior) {
|
|
98
|
+
case 'popup':
|
|
99
|
+
return this.loginPopup(request);
|
|
100
|
+
case 'redirect': {
|
|
101
|
+
return this.loginRedirect(request);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
117
104
|
}
|
|
118
105
|
/**
|
|
119
106
|
* Will try to silently acquire an access token for a given set of scopes.
|
|
@@ -129,28 +116,26 @@ export class AuthClient extends PublicClientApplication {
|
|
|
129
116
|
* @returns
|
|
130
117
|
* Promise that is fulfilled when this function has completed, or rejected if an error was raised.
|
|
131
118
|
*/
|
|
132
|
-
acquireToken() {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
return token;
|
|
140
|
-
}
|
|
141
|
-
catch (err) {
|
|
142
|
-
this.logger.info('Expected to navigate away from the current page but timeout occurred.');
|
|
143
|
-
}
|
|
119
|
+
async acquireToken(options = { scopes: [] }, behavior = defaultBehavior, silent = true) {
|
|
120
|
+
const account = await this.account;
|
|
121
|
+
if (silent && account) {
|
|
122
|
+
this.logger.verbose('Attempting to acquire token in silently');
|
|
123
|
+
try {
|
|
124
|
+
const token = await this.acquireTokenSilent({ account, ...options });
|
|
125
|
+
return token;
|
|
144
126
|
}
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
case 'popup':
|
|
148
|
-
return this.acquireTokenPopup(options);
|
|
149
|
-
case 'redirect': {
|
|
150
|
-
return this.acquireTokenRedirect(options);
|
|
151
|
-
}
|
|
127
|
+
catch (err) {
|
|
128
|
+
this.logger.info('Expected to navigate away from the current page but timeout occurred.');
|
|
152
129
|
}
|
|
153
|
-
}
|
|
130
|
+
}
|
|
131
|
+
this.logger.verbose(`Attempting to acquire token by [${behavior}]`);
|
|
132
|
+
switch (behavior) {
|
|
133
|
+
case 'popup':
|
|
134
|
+
return this.acquireTokenPopup(options);
|
|
135
|
+
case 'redirect': {
|
|
136
|
+
return this.acquireTokenRedirect(options);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
154
139
|
}
|
|
155
140
|
}
|
|
156
141
|
export default AuthClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../src/v2/client/client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../src/v2/client/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,9 +21,15 @@ import { normalizeUri } from './util/url';
|
|
|
21
21
|
* @param ctor - optional client class
|
|
22
22
|
*/
|
|
23
23
|
export const createAuthClient = (tenantId, clientId, redirectUri, config, ctor) => {
|
|
24
|
-
const auth =
|
|
25
|
-
|
|
26
|
-
|
|
24
|
+
const auth = {
|
|
25
|
+
clientId,
|
|
26
|
+
redirectUri: normalizeUri(redirectUri || ''),
|
|
27
|
+
navigateToLoginRequestUrl: false,
|
|
28
|
+
authority: `https://login.microsoftonline.com/${tenantId}`,
|
|
29
|
+
...config?.auth,
|
|
30
|
+
};
|
|
31
|
+
const cache = { cacheLocation: 'localStorage', ...config?.cache };
|
|
32
|
+
const system = config?.system;
|
|
27
33
|
return new (ctor || AuthClient)(tenantId, { auth, cache, system });
|
|
28
34
|
};
|
|
29
35
|
export default createAuthClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-auth-client.js","sourceRoot":"","sources":["../../../../src/v2/client/create-auth-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAM1C;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,QAAgB,EAChB,QAAgB,EAChB,WAAoB,EACpB,MAAyB,EACzB,IAAyD,EACtD,EAAE;IACL,MAAM,IAAI,
|
|
1
|
+
{"version":3,"file":"create-auth-client.js","sourceRoot":"","sources":["../../../../src/v2/client/create-auth-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAM1C;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,QAAgB,EAChB,QAAgB,EAChB,WAAoB,EACpB,MAAyB,EACzB,IAAyD,EACtD,EAAE;IACL,MAAM,IAAI,GAA0B;QAClC,QAAQ;QACR,WAAW,EAAE,YAAY,CAAC,WAAW,IAAI,EAAE,CAAC;QAC5C,yBAAyB,EAAE,KAAK;QAChC,SAAS,EAAE,qCAAqC,QAAQ,EAAE;QAC1D,GAAG,MAAM,EAAE,IAAI;KAChB,CAAC;IACF,MAAM,KAAK,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC;IAC9B,OAAO,IAAI,CAAC,IAAI,IAAI,UAAU,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAM,CAAC;AAC1E,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
|
|
@@ -16,30 +16,30 @@ export class ConsoleLogger extends Logger {
|
|
|
16
16
|
logLevel,
|
|
17
17
|
loggerCallback: (...args) => this.loggerCallback(...args),
|
|
18
18
|
});
|
|
19
|
-
/**
|
|
20
|
-
* Map log level to console log function type
|
|
21
|
-
*
|
|
22
|
-
* @default LogLevel.Verbose
|
|
23
|
-
*/
|
|
24
|
-
this.getLogType = (lvl) => {
|
|
25
|
-
switch (lvl) {
|
|
26
|
-
case LogLevel.Error:
|
|
27
|
-
return 'error';
|
|
28
|
-
case LogLevel.Warning:
|
|
29
|
-
return 'warn';
|
|
30
|
-
case LogLevel.Info:
|
|
31
|
-
return 'info';
|
|
32
|
-
case LogLevel.Verbose:
|
|
33
|
-
return 'debug';
|
|
34
|
-
default:
|
|
35
|
-
return this.getLogType(LogLevel.Verbose);
|
|
36
|
-
}
|
|
37
|
-
};
|
|
38
19
|
}
|
|
39
20
|
/** @inheritdoc */
|
|
40
21
|
loggerCallback(lvl, msg, _containsPii) {
|
|
41
22
|
console[this.getLogType(lvl)](`%c FUSION::MSAL %c %s`, 'border: 1px solid;', 'border: none;', msg);
|
|
42
23
|
}
|
|
24
|
+
/**
|
|
25
|
+
* Map log level to console log function type
|
|
26
|
+
*
|
|
27
|
+
* @default LogLevel.Verbose
|
|
28
|
+
*/
|
|
29
|
+
getLogType = (lvl) => {
|
|
30
|
+
switch (lvl) {
|
|
31
|
+
case LogLevel.Error:
|
|
32
|
+
return 'error';
|
|
33
|
+
case LogLevel.Warning:
|
|
34
|
+
return 'warn';
|
|
35
|
+
case LogLevel.Info:
|
|
36
|
+
return 'info';
|
|
37
|
+
case LogLevel.Verbose:
|
|
38
|
+
return 'debug';
|
|
39
|
+
default:
|
|
40
|
+
return this.getLogType(LogLevel.Verbose);
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
43
|
}
|
|
44
44
|
export default ConsoleLogger;
|
|
45
45
|
//# sourceMappingURL=console.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../../../src/v2/client/log/console.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAOvD;;;;;;;GAOG;AACH,MAAM,OAAO,aAAc,SAAQ,MAAM;IACvC;;OAEG;IACH,YAAY,QAAmB;QAC7B,KAAK,CAAC;YACJ,QAAQ;YACR,cAAc,EAAE,CAAC,GAAG,IAAiC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;SACvF,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"console.js","sourceRoot":"","sources":["../../../../../src/v2/client/log/console.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAOvD;;;;;;;GAOG;AACH,MAAM,OAAO,aAAc,SAAQ,MAAM;IACvC;;OAEG;IACH,YAAY,QAAmB;QAC7B,KAAK,CAAC;YACJ,QAAQ;YACR,cAAc,EAAE,CAAC,GAAG,IAAiC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;SACvF,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB;IACR,cAAc,CAAC,GAAa,EAAE,GAAW,EAAE,YAAsB;QACzE,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAC3B,uBAAuB,EACvB,oBAAoB,EACpB,eAAe,EACf,GAAG,CACJ,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACO,UAAU,GAAG,CAAC,GAAa,EAAgB,EAAE;QACrD,QAAQ,GAAG,EAAE,CAAC;YACZ,KAAK,QAAQ,CAAC,KAAK;gBACjB,OAAO,OAAO,CAAC;YACjB,KAAK,QAAQ,CAAC,OAAO;gBACnB,OAAO,MAAM,CAAC;YAChB,KAAK,QAAQ,CAAC,IAAI;gBAChB,OAAO,MAAM,CAAC;YAChB,KAAK,QAAQ,CAAC,OAAO;gBACnB,OAAO,OAAO,CAAC;YACjB;gBACE,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC,CAAC;CACH;AAED,eAAe,aAAa,CAAC"}
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import z from 'zod';
|
|
11
2
|
import { BaseConfigBuilder } from '@equinor/fusion-framework-module';
|
|
12
3
|
import { MsalModuleVersion } from '../static';
|
|
@@ -26,28 +17,26 @@ const AuthConfigSchema = z.object({
|
|
|
26
17
|
version: VersionSchema,
|
|
27
18
|
});
|
|
28
19
|
export class AuthConfigurator extends BaseConfigBuilder {
|
|
20
|
+
version = MsalModuleVersion.Latest;
|
|
29
21
|
constructor() {
|
|
30
22
|
super();
|
|
31
|
-
this.version
|
|
32
|
-
this._set('version', () => __awaiter(this, void 0, void 0, function* () { return this.version; }));
|
|
23
|
+
this._set('version', async () => this.version);
|
|
33
24
|
}
|
|
34
25
|
setClientConfig(config) {
|
|
35
|
-
this._set('client', () =>
|
|
26
|
+
this._set('client', async () => config);
|
|
36
27
|
}
|
|
37
28
|
setRequiresAuth(requiresAuth) {
|
|
38
|
-
this._set('requiresAuth', () =>
|
|
29
|
+
this._set('requiresAuth', async () => requiresAuth);
|
|
39
30
|
}
|
|
40
31
|
setProvider(provider) {
|
|
41
|
-
this._set('provider', () =>
|
|
32
|
+
this._set('provider', async () => provider);
|
|
42
33
|
}
|
|
43
34
|
setVersion(version) {
|
|
44
|
-
this._set('version', () =>
|
|
35
|
+
this._set('version', async () => version);
|
|
45
36
|
}
|
|
46
|
-
_processConfig(config) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
return AuthConfigSchema.parseAsync(config);
|
|
50
|
-
});
|
|
37
|
+
async _processConfig(config) {
|
|
38
|
+
// TODO: handle parsing of clientConfig
|
|
39
|
+
return AuthConfigSchema.parseAsync(config);
|
|
51
40
|
}
|
|
52
41
|
}
|
|
53
42
|
//# sourceMappingURL=configurator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configurator.js","sourceRoot":"","sources":["../../../src/v2/configurator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configurator.js","sourceRoot":"","sources":["../../../src/v2/configurator.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AAEpB,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEpF,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IACtC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACnC,CAAC,CAAC;AAEH,4DAA4D;AAC5D,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,EAAiB,CAAC;AAEnD,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,MAAM,EAAE,sBAAsB,CAAC,QAAQ,EAAE;IACzC,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IACrC,YAAY,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACpC,OAAO,EAAE,aAAa;CACvB,CAAC,CAAC;AAKH,MAAM,OAAO,gBAAiB,SAAQ,iBAA6B;IAC1D,OAAO,GAAG,iBAAiB,CAAC,MAAe,CAAC;IAEnD;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,eAAe,CAAC,MAA+C;QAC7D,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED,eAAe,CAAC,YAAqB;QACnC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,YAAY,CAAC,CAAC;IACtD,CAAC;IAED,WAAW,CAAC,QAA2C;QACrD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAED,UAAU,CAAC,OAAe;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,MAAkB;QACrC,uCAAuC;QACvC,OAAO,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;CACF"}
|
package/dist/esm/v2/provider.js
CHANGED
|
@@ -1,29 +1,10 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
|
-
var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
|
|
11
|
-
if (kind === "m") throw new TypeError("Private method is not writable");
|
|
12
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
|
|
13
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
|
|
14
|
-
return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
|
|
15
|
-
};
|
|
16
|
-
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
|
|
17
|
-
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
|
|
18
|
-
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
19
|
-
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
20
|
-
};
|
|
21
|
-
var _AuthProvider_client;
|
|
22
1
|
import { createAuthClient, ConsoleLogger } from './client';
|
|
23
2
|
import { MsalModuleVersion } from '../static';
|
|
24
3
|
import resolveVersion from '../resolve-version';
|
|
25
4
|
import { SemanticVersion } from '@equinor/fusion-framework-module';
|
|
26
5
|
export class AuthProvider {
|
|
6
|
+
_config;
|
|
7
|
+
#client;
|
|
27
8
|
get version() {
|
|
28
9
|
return new SemanticVersion(MsalModuleVersion.Latest);
|
|
29
10
|
}
|
|
@@ -40,12 +21,11 @@ export class AuthProvider {
|
|
|
40
21
|
}
|
|
41
22
|
constructor(_config) {
|
|
42
23
|
this._config = _config;
|
|
43
|
-
|
|
44
|
-
__classPrivateFieldSet(this, _AuthProvider_client, this.createClient(), "f");
|
|
24
|
+
this.#client = this.createClient();
|
|
45
25
|
}
|
|
46
26
|
/** @deprecated */
|
|
47
27
|
getClient() {
|
|
48
|
-
return
|
|
28
|
+
return this.#client;
|
|
49
29
|
}
|
|
50
30
|
/** @deprecated */
|
|
51
31
|
createClient() {
|
|
@@ -54,50 +34,42 @@ export class AuthProvider {
|
|
|
54
34
|
client.setLogger(new ConsoleLogger(0));
|
|
55
35
|
return client;
|
|
56
36
|
}
|
|
57
|
-
handleRedirect() {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
window.location.replace('/');
|
|
68
|
-
}
|
|
69
|
-
else {
|
|
70
|
-
window.location.replace(requestOrigin || '/');
|
|
71
|
-
}
|
|
37
|
+
async handleRedirect() {
|
|
38
|
+
const { redirectUri } = this.defaultConfig || {};
|
|
39
|
+
if (window.location.pathname === redirectUri) {
|
|
40
|
+
const client = this.defaultClient;
|
|
41
|
+
const logger = client.getLogger();
|
|
42
|
+
const { requestOrigin } = client;
|
|
43
|
+
await client.handleRedirectPromise();
|
|
44
|
+
if (requestOrigin === redirectUri) {
|
|
45
|
+
logger.warning(`detected callback loop from url ${redirectUri}, redirecting to root`);
|
|
46
|
+
window.location.replace('/');
|
|
72
47
|
}
|
|
73
|
-
|
|
74
|
-
|
|
48
|
+
else {
|
|
49
|
+
window.location.replace(requestOrigin || '/');
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return null;
|
|
75
53
|
}
|
|
76
54
|
acquireToken(req) {
|
|
77
55
|
return this.defaultClient.acquireToken(req);
|
|
78
56
|
}
|
|
79
|
-
acquireAccessToken(req) {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
return token ? token.accessToken : undefined;
|
|
83
|
-
});
|
|
57
|
+
async acquireAccessToken(req) {
|
|
58
|
+
const token = await this.acquireToken(req);
|
|
59
|
+
return token ? token.accessToken : undefined;
|
|
84
60
|
}
|
|
85
|
-
login(options) {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
yield this.defaultClient.login();
|
|
92
|
-
});
|
|
61
|
+
async login(options) {
|
|
62
|
+
// skip login if already logged in and has valid claims
|
|
63
|
+
if (options?.onlyIfRequired && this.defaultClient.hasValidClaims) {
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
await this.defaultClient.login();
|
|
93
67
|
}
|
|
94
|
-
logout(options) {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
account: this.defaultAccount,
|
|
100
|
-
});
|
|
68
|
+
async logout(options) {
|
|
69
|
+
// TODO - might have an option for popup or redirect
|
|
70
|
+
await this.defaultClient.logoutRedirect({
|
|
71
|
+
postLogoutRedirectUri: options?.redirectUri,
|
|
72
|
+
account: this.defaultAccount,
|
|
101
73
|
});
|
|
102
74
|
}
|
|
103
75
|
createProxyProvider(version) {
|
|
@@ -136,5 +108,4 @@ export class AuthProvider {
|
|
|
136
108
|
});
|
|
137
109
|
}
|
|
138
110
|
}
|
|
139
|
-
_AuthProvider_client = new WeakMap();
|
|
140
111
|
//# sourceMappingURL=provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/v2/provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/v2/provider.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/version.js
CHANGED