@axa-fr/react-oidc 6.15.9 → 6.16.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/bin/{copy.js → copy.cjs} +5 -2
- package/dist/FetchToken.js +7 -12
- package/dist/FetchToken.js.map +1 -1
- package/dist/OidcProvider.js +43 -50
- package/dist/OidcProvider.js.map +1 -1
- package/dist/OidcSecure.js +9 -14
- package/dist/OidcSecure.js.map +1 -1
- package/dist/ReactOidc.js +29 -35
- package/dist/ReactOidc.js.map +1 -1
- package/dist/User.js +8 -12
- package/dist/User.js.map +1 -1
- package/dist/core/default-component/AuthenticateError.component.js +3 -5
- package/dist/core/default-component/AuthenticateError.component.js.map +1 -1
- package/dist/core/default-component/Authenticating.component.js +3 -5
- package/dist/core/default-component/Authenticating.component.js.map +1 -1
- package/dist/core/default-component/Callback.component.js +15 -22
- package/dist/core/default-component/Callback.component.js.map +1 -1
- package/dist/core/default-component/Loading.component.js +3 -5
- package/dist/core/default-component/Loading.component.js.map +1 -1
- package/dist/core/default-component/ServiceWorkerNotSupported.component.js +3 -5
- package/dist/core/default-component/ServiceWorkerNotSupported.component.js.map +1 -1
- package/dist/core/default-component/SessionLost.component.js +3 -7
- package/dist/core/default-component/SessionLost.component.js.map +1 -1
- package/dist/core/default-component/SilentCallback.component.js +7 -9
- package/dist/core/default-component/SilentCallback.component.js.map +1 -1
- package/dist/core/default-component/SilentLogin.component.js +9 -11
- package/dist/core/default-component/SilentLogin.component.js.map +1 -1
- package/dist/core/default-component/index.js +6 -19
- package/dist/core/default-component/index.js.map +1 -1
- package/dist/core/routes/OidcRoutes.js +18 -46
- package/dist/core/routes/OidcRoutes.js.map +1 -1
- package/dist/core/routes/withRouter.js +2 -7
- package/dist/core/routes/withRouter.js.map +1 -1
- package/dist/index.js +6 -20
- package/dist/index.js.map +1 -1
- package/dist/service_worker/OidcServiceWorker.d.ts +2 -0
- package/dist/service_worker/OidcServiceWorker.d.ts.map +1 -0
- package/dist/service_worker/OidcServiceWorker.js +369 -0
- package/dist/service_worker/OidcServiceWorker.js.map +1 -0
- package/dist/service_worker/constants.d.ts +18 -0
- package/dist/service_worker/constants.d.ts.map +1 -0
- package/dist/service_worker/types.d.ts +80 -0
- package/dist/service_worker/types.d.ts.map +1 -0
- package/dist/service_worker/utils/domains.d.ts +6 -0
- package/dist/service_worker/utils/domains.d.ts.map +1 -0
- package/dist/service_worker/utils/index.d.ts +6 -0
- package/dist/service_worker/utils/index.d.ts.map +1 -0
- package/dist/service_worker/utils/serializeHeaders.d.ts +3 -0
- package/dist/service_worker/utils/serializeHeaders.d.ts.map +1 -0
- package/dist/service_worker/utils/sleep.d.ts +3 -0
- package/dist/service_worker/utils/sleep.d.ts.map +1 -0
- package/dist/service_worker/utils/strings.d.ts +8 -0
- package/dist/service_worker/utils/strings.d.ts.map +1 -0
- package/dist/service_worker/utils/tokens.d.ts +12 -0
- package/dist/service_worker/utils/tokens.d.ts.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/vanilla/cache.js +2 -7
- package/dist/vanilla/cache.js.map +1 -1
- package/dist/vanilla/checkSession.js +5 -9
- package/dist/vanilla/checkSession.js.map +1 -1
- package/dist/vanilla/checkSessionIFrame.js +1 -5
- package/dist/vanilla/checkSessionIFrame.js.map +1 -1
- package/dist/vanilla/crypto.js +4 -33
- package/dist/vanilla/crypto.js.map +1 -1
- package/dist/vanilla/events.js +1 -4
- package/dist/vanilla/events.js.map +1 -1
- package/dist/vanilla/initSession.js +1 -5
- package/dist/vanilla/initSession.js.map +1 -1
- package/dist/vanilla/initWorker.js +11 -21
- package/dist/vanilla/initWorker.js.map +1 -1
- package/dist/vanilla/login.js +26 -31
- package/dist/vanilla/login.js.map +1 -1
- package/dist/vanilla/logout.js +11 -19
- package/dist/vanilla/logout.js.map +1 -1
- package/dist/vanilla/oidc.js +76 -107
- package/dist/vanilla/oidc.js.map +1 -1
- package/dist/vanilla/parseTokens.js +15 -24
- package/dist/vanilla/parseTokens.js.map +1 -1
- package/dist/vanilla/renewTokens.js +13 -21
- package/dist/vanilla/renewTokens.js.map +1 -1
- package/dist/vanilla/requests.js +18 -26
- package/dist/vanilla/requests.js.map +1 -1
- package/dist/vanilla/route-utils.js +5 -11
- package/dist/vanilla/route-utils.js.map +1 -1
- package/dist/vanilla/silentLogin.js +16 -24
- package/dist/vanilla/silentLogin.js.map +1 -1
- package/dist/vanilla/timer.js +1 -3
- package/dist/vanilla/timer.js.map +1 -1
- package/dist/vanilla/types.js +1 -2
- package/dist/vanilla/user.js +5 -9
- package/dist/vanilla/user.js.map +1 -1
- package/dist/vanilla/vanillaOidc.js +7 -11
- package/dist/vanilla/vanillaOidc.js.map +1 -1
- package/package.json +17 -9
- package/service_worker/.eslintrc.cjs +18 -0
- package/service_worker/OidcServiceWorker.ts +387 -0
- package/service_worker/constants.ts +32 -0
- package/service_worker/dist/OidcServiceWorker.d.ts +2 -0
- package/service_worker/dist/OidcServiceWorker.d.ts.map +1 -0
- package/service_worker/dist/OidcServiceWorker.js +369 -0
- package/service_worker/dist/OidcServiceWorker.js.map +1 -0
- package/service_worker/dist/constants.d.ts +18 -0
- package/service_worker/dist/constants.d.ts.map +1 -0
- package/service_worker/dist/types.d.ts +80 -0
- package/service_worker/dist/types.d.ts.map +1 -0
- package/service_worker/dist/utils/domains.d.ts +6 -0
- package/service_worker/dist/utils/domains.d.ts.map +1 -0
- package/service_worker/dist/utils/index.d.ts +6 -0
- package/service_worker/dist/utils/index.d.ts.map +1 -0
- package/service_worker/dist/utils/serializeHeaders.d.ts +3 -0
- package/service_worker/dist/utils/serializeHeaders.d.ts.map +1 -0
- package/service_worker/dist/utils/sleep.d.ts +3 -0
- package/service_worker/dist/utils/sleep.d.ts.map +1 -0
- package/service_worker/dist/utils/strings.d.ts +8 -0
- package/service_worker/dist/utils/strings.d.ts.map +1 -0
- package/service_worker/dist/utils/tokens.d.ts +12 -0
- package/service_worker/dist/utils/tokens.d.ts.map +1 -0
- package/service_worker/tsconfig.json +26 -0
- package/service_worker/types.ts +93 -0
- package/service_worker/utils/__tests__/domains.spec.ts +63 -0
- package/service_worker/utils/__tests__/serializeHeaders.spec.ts +11 -0
- package/service_worker/utils/__tests__/strings.spec.ts +9 -0
- package/service_worker/utils/__tests__/testHelper.ts +346 -0
- package/service_worker/utils/__tests__/tokens.spec.ts +68 -0
- package/service_worker/utils/domains.ts +95 -0
- package/service_worker/utils/index.ts +5 -0
- package/service_worker/utils/serializeHeaders.ts +12 -0
- package/service_worker/utils/sleep.ts +2 -0
- package/service_worker/utils/strings.ts +9 -0
- package/service_worker/utils/tokens.ts +198 -0
- package/dist/OidcServiceWorker.d.ts +0 -119
- package/dist/OidcServiceWorker.d.ts.map +0 -1
- package/dist/OidcServiceWorker.js +0 -498
- package/dist/OidcServiceWorker.js.map +0 -1
- /package/{dist → service_worker}/OidcTrustedDomains.js +0 -0
package/dist/vanilla/login.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
2
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
3
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -8,17 +7,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
8
|
});
|
|
10
9
|
};
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
const requests_1 = require("./requests");
|
|
19
|
-
const route_utils_1 = require("./route-utils");
|
|
10
|
+
import { generateRandom } from './crypto';
|
|
11
|
+
import { eventNames } from './events';
|
|
12
|
+
import { initSession } from './initSession';
|
|
13
|
+
import { initWorkerAsync } from './initWorker';
|
|
14
|
+
import { isTokensOidcValid } from './parseTokens';
|
|
15
|
+
import { performAuthorizationRequestAsync, performFirstTokenRequestAsync } from './requests';
|
|
16
|
+
import { getParseQueryStringFromLocation } from './route-utils';
|
|
20
17
|
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
21
|
-
const defaultLoginAsync = (window, configurationName, configuration, publishEvent, initAsync) => (callbackPath = undefined, extras = null, isSilentSignin = false, scope = undefined) => {
|
|
18
|
+
export const defaultLoginAsync = (window, configurationName, configuration, publishEvent, initAsync) => (callbackPath = undefined, extras = null, isSilentSignin = false, scope = undefined) => {
|
|
22
19
|
const originExtras = extras;
|
|
23
20
|
extras = Object.assign({}, extras);
|
|
24
21
|
const loginLocalAsync = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -26,9 +23,9 @@ const defaultLoginAsync = (window, configurationName, configuration, publishEven
|
|
|
26
23
|
const location = window.location;
|
|
27
24
|
const url = callbackPath || location.pathname + (location.search || '') + (location.hash || '');
|
|
28
25
|
if (!('state' in extras)) {
|
|
29
|
-
extras.state =
|
|
26
|
+
extras.state = generateRandom(16);
|
|
30
27
|
}
|
|
31
|
-
publishEvent(
|
|
28
|
+
publishEvent(eventNames.loginAsync_begin, {});
|
|
32
29
|
if (extras) {
|
|
33
30
|
for (const key of Object.keys(extras)) {
|
|
34
31
|
if (key.endsWith(':token_request')) {
|
|
@@ -43,10 +40,10 @@ const defaultLoginAsync = (window, configurationName, configuration, publishEven
|
|
|
43
40
|
}
|
|
44
41
|
const extraFinal = !configuration.extras ? extras : Object.assign(Object.assign({}, configuration.extras), extras);
|
|
45
42
|
if (!extraFinal.nonce) {
|
|
46
|
-
extraFinal.nonce =
|
|
43
|
+
extraFinal.nonce = generateRandom(12);
|
|
47
44
|
}
|
|
48
45
|
const nonce = { nonce: extraFinal.nonce };
|
|
49
|
-
const serviceWorker = yield
|
|
46
|
+
const serviceWorker = yield initWorkerAsync(configuration.service_worker_relative_url, configurationName);
|
|
50
47
|
const oidcServerConfiguration = yield initAsync(configuration.authority, configuration.authority_configuration);
|
|
51
48
|
let storage;
|
|
52
49
|
if (serviceWorker) {
|
|
@@ -57,36 +54,35 @@ const defaultLoginAsync = (window, configurationName, configuration, publishEven
|
|
|
57
54
|
storage = serviceWorker;
|
|
58
55
|
}
|
|
59
56
|
else {
|
|
60
|
-
const session =
|
|
57
|
+
const session = initSession(configurationName, (_a = configuration.storage) !== null && _a !== void 0 ? _a : sessionStorage);
|
|
61
58
|
session.setLoginParams(configurationName, { callbackPath: url, extras: originExtras });
|
|
62
59
|
yield session.setNonceAsync(nonce);
|
|
63
60
|
storage = session;
|
|
64
61
|
}
|
|
65
62
|
// @ts-ignore
|
|
66
63
|
const extraInternal = Object.assign({ client_id: configuration.client_id, redirect_uri: redirectUri, scope, response_type: 'code' }, extraFinal);
|
|
67
|
-
yield
|
|
64
|
+
yield performAuthorizationRequestAsync(storage)(oidcServerConfiguration.authorizationEndpoint, extraInternal);
|
|
68
65
|
}
|
|
69
66
|
catch (exception) {
|
|
70
|
-
publishEvent(
|
|
67
|
+
publishEvent(eventNames.loginAsync_error, exception);
|
|
71
68
|
throw exception;
|
|
72
69
|
}
|
|
73
70
|
});
|
|
74
71
|
return loginLocalAsync();
|
|
75
72
|
};
|
|
76
|
-
|
|
77
|
-
const loginCallbackAsync = (oidc) => (isSilentSignin = false) => __awaiter(void 0, void 0, void 0, function* () {
|
|
73
|
+
export const loginCallbackAsync = (oidc) => (isSilentSignin = false) => __awaiter(void 0, void 0, void 0, function* () {
|
|
78
74
|
var _a;
|
|
79
75
|
try {
|
|
80
|
-
oidc.publishEvent(
|
|
76
|
+
oidc.publishEvent(eventNames.loginCallbackAsync_begin, {});
|
|
81
77
|
const configuration = oidc.configuration;
|
|
82
78
|
const clientId = configuration.client_id;
|
|
83
79
|
const redirectUri = isSilentSignin ? configuration.silent_redirect_uri : configuration.redirect_uri;
|
|
84
80
|
const authority = configuration.authority;
|
|
85
81
|
const tokenRequestTimeout = configuration.token_request_timeout;
|
|
86
82
|
const oidcServerConfiguration = yield oidc.initAsync(authority, configuration.authority_configuration);
|
|
87
|
-
const queryParams =
|
|
83
|
+
const queryParams = getParseQueryStringFromLocation(window.location.href);
|
|
88
84
|
const sessionState = queryParams.session_state;
|
|
89
|
-
const serviceWorker = yield
|
|
85
|
+
const serviceWorker = yield initWorkerAsync(configuration.service_worker_relative_url, oidc.configurationName);
|
|
90
86
|
let storage;
|
|
91
87
|
let nonceData;
|
|
92
88
|
let getLoginParams;
|
|
@@ -101,14 +97,14 @@ const loginCallbackAsync = (oidc) => (isSilentSignin = false) => __awaiter(void
|
|
|
101
97
|
storage = serviceWorker;
|
|
102
98
|
}
|
|
103
99
|
else {
|
|
104
|
-
const session =
|
|
100
|
+
const session = initSession(oidc.configurationName, (_a = configuration.storage) !== null && _a !== void 0 ? _a : sessionStorage);
|
|
105
101
|
yield session.setSessionStateAsync(sessionState);
|
|
106
102
|
nonceData = yield session.getNonceAsync();
|
|
107
103
|
getLoginParams = session.getLoginParams(oidc.configurationName);
|
|
108
104
|
state = yield session.getStateAsync();
|
|
109
105
|
storage = session;
|
|
110
106
|
}
|
|
111
|
-
const params =
|
|
107
|
+
const params = getParseQueryStringFromLocation(window.location.toString());
|
|
112
108
|
if (params.iss && params.iss !== oidcServerConfiguration.issuer) {
|
|
113
109
|
throw new Error('issuer not valid');
|
|
114
110
|
}
|
|
@@ -135,7 +131,7 @@ const loginCallbackAsync = (oidc) => (isSilentSignin = false) => __awaiter(void
|
|
|
135
131
|
}
|
|
136
132
|
}
|
|
137
133
|
}
|
|
138
|
-
const tokenResponse = yield
|
|
134
|
+
const tokenResponse = yield performFirstTokenRequestAsync(storage)(oidcServerConfiguration.tokenEndpoint, Object.assign(Object.assign({}, data), extras), oidc.configuration.token_renew_mode, tokenRequestTimeout);
|
|
139
135
|
if (!tokenResponse.success) {
|
|
140
136
|
throw new Error('Token request failed');
|
|
141
137
|
}
|
|
@@ -146,19 +142,19 @@ const loginCallbackAsync = (oidc) => (isSilentSignin = false) => __awaiter(void
|
|
|
146
142
|
loginParams = serviceWorker.getLoginParams(oidc.configurationName);
|
|
147
143
|
}
|
|
148
144
|
else {
|
|
149
|
-
const session =
|
|
145
|
+
const session = initSession(oidc.configurationName, configuration.storage);
|
|
150
146
|
loginParams = session.getLoginParams(oidc.configurationName);
|
|
151
147
|
}
|
|
152
148
|
// @ts-ignore
|
|
153
149
|
if (tokenResponse.data.state !== extras.state) {
|
|
154
150
|
throw new Error('state is not valid');
|
|
155
151
|
}
|
|
156
|
-
const { isValid, reason } =
|
|
152
|
+
const { isValid, reason } = isTokensOidcValid(formattedTokens, nonceData.nonce, oidcServerConfiguration);
|
|
157
153
|
if (!isValid) {
|
|
158
154
|
throw new Error(`Tokens are not OpenID valid, reason: ${reason}`);
|
|
159
155
|
}
|
|
160
156
|
yield oidc.startCheckSessionAsync(oidcServerConfiguration.checkSessionIframe, clientId, sessionState, isSilentSignin);
|
|
161
|
-
oidc.publishEvent(
|
|
157
|
+
oidc.publishEvent(eventNames.loginCallbackAsync_end, {});
|
|
162
158
|
return {
|
|
163
159
|
tokens: formattedTokens,
|
|
164
160
|
state: 'request.state',
|
|
@@ -167,9 +163,8 @@ const loginCallbackAsync = (oidc) => (isSilentSignin = false) => __awaiter(void
|
|
|
167
163
|
}
|
|
168
164
|
catch (exception) {
|
|
169
165
|
console.error(exception);
|
|
170
|
-
oidc.publishEvent(
|
|
166
|
+
oidc.publishEvent(eventNames.loginCallbackAsync_error, exception);
|
|
171
167
|
throw exception;
|
|
172
168
|
}
|
|
173
169
|
});
|
|
174
|
-
exports.loginCallbackAsync = loginCallbackAsync;
|
|
175
170
|
//# sourceMappingURL=login.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/oidc/vanilla/login.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/oidc/vanilla/login.ts"],"names":[],"mappings":"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"}
|
package/dist/vanilla/logout.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
2
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
3
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -8,24 +7,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
8
|
});
|
|
10
9
|
};
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
};
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
const initWorker_1 = require("./initWorker");
|
|
18
|
-
const requests_1 = require("./requests");
|
|
19
|
-
const timer_1 = __importDefault(require("./timer"));
|
|
20
|
-
const destroyAsync = (oidc) => (status) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
-
timer_1.default.clearTimeout(oidc.timeoutId);
|
|
10
|
+
import { initSession } from './initSession';
|
|
11
|
+
import { initWorkerAsync } from './initWorker';
|
|
12
|
+
import { performRevocationRequestAsync, TOKEN_TYPE } from './requests';
|
|
13
|
+
import timer from './timer';
|
|
14
|
+
export const destroyAsync = (oidc) => (status) => __awaiter(void 0, void 0, void 0, function* () {
|
|
15
|
+
timer.clearTimeout(oidc.timeoutId);
|
|
22
16
|
oidc.timeoutId = null;
|
|
23
17
|
if (oidc.checkSessionIFrame) {
|
|
24
18
|
oidc.checkSessionIFrame.stop();
|
|
25
19
|
}
|
|
26
|
-
const serviceWorker = yield
|
|
20
|
+
const serviceWorker = yield initWorkerAsync(oidc.configuration.service_worker_relative_url, oidc.configurationName);
|
|
27
21
|
if (!serviceWorker) {
|
|
28
|
-
const session =
|
|
22
|
+
const session = initSession(oidc.configurationName, oidc.configuration.storage);
|
|
29
23
|
yield session.clearAsync(status);
|
|
30
24
|
}
|
|
31
25
|
else {
|
|
@@ -34,8 +28,7 @@ const destroyAsync = (oidc) => (status) => __awaiter(void 0, void 0, void 0, fun
|
|
|
34
28
|
oidc.tokens = null;
|
|
35
29
|
oidc.userInfo = null;
|
|
36
30
|
});
|
|
37
|
-
|
|
38
|
-
const logoutAsync = (oidc, oidcDatabase) => (callbackPathOrUrl = undefined, extras = null) => __awaiter(void 0, void 0, void 0, function* () {
|
|
31
|
+
export const logoutAsync = (oidc, oidcDatabase) => (callbackPathOrUrl = undefined, extras = null) => __awaiter(void 0, void 0, void 0, function* () {
|
|
39
32
|
const configuration = oidc.configuration;
|
|
40
33
|
const oidcServerConfiguration = yield oidc.initAsync(configuration.authority, configuration.authority_configuration);
|
|
41
34
|
if (callbackPathOrUrl && (typeof callbackPathOrUrl !== 'string')) {
|
|
@@ -56,12 +49,12 @@ const logoutAsync = (oidc, oidcDatabase) => (callbackPathOrUrl = undefined, extr
|
|
|
56
49
|
const promises = [];
|
|
57
50
|
const accessToken = oidc.tokens.accessToken;
|
|
58
51
|
if (accessToken) {
|
|
59
|
-
const revokeAccessTokenPromise =
|
|
52
|
+
const revokeAccessTokenPromise = performRevocationRequestAsync(revocationEndpoint, accessToken, TOKEN_TYPE.access_token, configuration.client_id);
|
|
60
53
|
promises.push(revokeAccessTokenPromise);
|
|
61
54
|
}
|
|
62
55
|
const refreshToken = oidc.tokens.refreshToken;
|
|
63
56
|
if (refreshToken) {
|
|
64
|
-
const revokeRefreshTokenPromise =
|
|
57
|
+
const revokeRefreshTokenPromise = performRevocationRequestAsync(revocationEndpoint, refreshToken, TOKEN_TYPE.refresh_token, configuration.client_id);
|
|
65
58
|
promises.push(revokeRefreshTokenPromise);
|
|
66
59
|
}
|
|
67
60
|
if (promises.length > 0) {
|
|
@@ -109,5 +102,4 @@ const logoutAsync = (oidc, oidcDatabase) => (callbackPathOrUrl = undefined, extr
|
|
|
109
102
|
window.location.reload();
|
|
110
103
|
}
|
|
111
104
|
});
|
|
112
|
-
exports.logoutAsync = logoutAsync;
|
|
113
105
|
//# sourceMappingURL=logout.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/oidc/vanilla/logout.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/oidc/vanilla/logout.ts"],"names":[],"mappings":"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"}
|