@axa-fr/react-oidc 6.13.4 → 6.14.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/dist/OidcServiceWorker.js +36 -9
- package/dist/vanilla/crypto.d.ts +4 -0
- package/dist/vanilla/crypto.d.ts.map +1 -0
- package/dist/vanilla/crypto.js +81 -0
- package/dist/vanilla/crypto.js.map +1 -0
- package/dist/vanilla/initSession.d.ts +6 -4
- package/dist/vanilla/initSession.d.ts.map +1 -1
- package/dist/vanilla/initSession.js +22 -15
- package/dist/vanilla/initSession.js.map +1 -1
- package/dist/vanilla/initWorker.d.ts +4 -2
- package/dist/vanilla/initWorker.d.ts.map +1 -1
- package/dist/vanilla/initWorker.js +39 -18
- package/dist/vanilla/initWorker.js.map +1 -1
- package/dist/vanilla/login.d.ts +5 -1
- package/dist/vanilla/login.d.ts.map +1 -1
- package/dist/vanilla/login.js +70 -143
- package/dist/vanilla/login.js.map +1 -1
- package/dist/vanilla/logout.d.ts +4 -0
- package/dist/vanilla/logout.d.ts.map +1 -0
- package/dist/vanilla/logout.js +113 -0
- package/dist/vanilla/logout.js.map +1 -0
- package/dist/vanilla/oidc.d.ts +11 -6
- package/dist/vanilla/oidc.d.ts.map +1 -1
- package/dist/vanilla/oidc.js +26 -94
- package/dist/vanilla/oidc.js.map +1 -1
- package/dist/vanilla/requests.d.ts +14 -0
- package/dist/vanilla/requests.d.ts.map +1 -1
- package/dist/vanilla/requests.js +56 -1
- package/dist/vanilla/requests.js.map +1 -1
- package/dist/vanilla/route-utils.js +2 -2
- package/dist/vanilla/route-utils.js.map +1 -1
- package/package.json +2 -2
- package/src/oidc/vanilla/OidcServiceWorker.js +36 -9
- package/src/oidc/vanilla/crypto.ts +57 -0
- package/src/oidc/vanilla/initSession.ts +25 -15
- package/src/oidc/vanilla/initWorker.ts +43 -18
- package/src/oidc/vanilla/login.ts +76 -148
- package/src/oidc/vanilla/logout.ts +95 -0
- package/src/oidc/vanilla/oidc.ts +35 -98
- package/src/oidc/vanilla/requests.spec.ts +4 -0
- package/src/oidc/vanilla/requests.ts +55 -0
- package/src/oidc/vanilla/route-utils.ts +2 -2
- package/dist/vanilla/memoryStorageBackend.d.ts +0 -11
- package/dist/vanilla/memoryStorageBackend.d.ts.map +0 -1
- package/dist/vanilla/memoryStorageBackend.js +0 -31
- package/dist/vanilla/memoryStorageBackend.js.map +0 -1
- package/dist/vanilla/noHashQueryStringUtils.d.ts +0 -8
- package/dist/vanilla/noHashQueryStringUtils.d.ts.map +0 -1
- package/dist/vanilla/noHashQueryStringUtils.js +0 -32
- package/dist/vanilla/noHashQueryStringUtils.js.map +0 -1
- package/src/oidc/vanilla/memoryStorageBackend.ts +0 -40
- package/src/oidc/vanilla/noHashQueryStringUtils.ts +0 -32
package/dist/vanilla/login.js
CHANGED
|
@@ -10,22 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.loginCallbackAsync = exports.defaultLoginAsync = void 0;
|
|
13
|
-
const
|
|
13
|
+
const crypto_1 = require("./crypto");
|
|
14
14
|
const events_1 = require("./events");
|
|
15
15
|
const initSession_1 = require("./initSession");
|
|
16
16
|
const initWorker_1 = require("./initWorker");
|
|
17
|
-
const memoryStorageBackend_1 = require("./memoryStorageBackend");
|
|
18
|
-
const noHashQueryStringUtils_1 = require("./noHashQueryStringUtils");
|
|
19
17
|
const parseTokens_1 = require("./parseTokens");
|
|
18
|
+
const requests_1 = require("./requests");
|
|
20
19
|
const route_utils_1 = require("./route-utils");
|
|
21
|
-
const randomString = function (length) {
|
|
22
|
-
let text = '';
|
|
23
|
-
const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
|
|
24
|
-
for (let i = 0; i < length; i++) {
|
|
25
|
-
text += possible.charAt(Math.floor(Math.random() * possible.length));
|
|
26
|
-
}
|
|
27
|
-
return text;
|
|
28
|
-
};
|
|
29
20
|
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
30
21
|
const defaultLoginAsync = (window, configurationName, configuration, publishEvent, initAsync) => (callbackPath = undefined, extras = null, isSilentSignin = false, scope = undefined) => {
|
|
31
22
|
const originExtras = extras;
|
|
@@ -34,10 +25,8 @@ const defaultLoginAsync = (window, configurationName, configuration, publishEven
|
|
|
34
25
|
var _a;
|
|
35
26
|
const location = window.location;
|
|
36
27
|
const url = callbackPath || location.pathname + (location.search || '') + (location.hash || '');
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
state = extras.state;
|
|
40
|
-
delete extras.state;
|
|
28
|
+
if (!('state' in extras)) {
|
|
29
|
+
extras.state = (0, crypto_1.generateRandom)(16);
|
|
41
30
|
}
|
|
42
31
|
publishEvent(events_1.eventNames.loginAsync_begin, {});
|
|
43
32
|
if (extras) {
|
|
@@ -54,38 +43,28 @@ const defaultLoginAsync = (window, configurationName, configuration, publishEven
|
|
|
54
43
|
}
|
|
55
44
|
const extraFinal = !configuration.extras ? extras : Object.assign(Object.assign({}, configuration.extras), extras);
|
|
56
45
|
if (!extraFinal.nonce) {
|
|
57
|
-
extraFinal.nonce =
|
|
46
|
+
extraFinal.nonce = (0, crypto_1.generateRandom)(12);
|
|
58
47
|
}
|
|
59
48
|
const nonce = { nonce: extraFinal.nonce };
|
|
60
49
|
const serviceWorker = yield (0, initWorker_1.initWorkerAsync)(configuration.service_worker_relative_url, configurationName);
|
|
61
50
|
const oidcServerConfiguration = yield initAsync(configuration.authority, configuration.authority_configuration);
|
|
62
51
|
let storage;
|
|
63
52
|
if (serviceWorker) {
|
|
64
|
-
serviceWorker.setLoginParams(configurationName, { callbackPath: url, extras: originExtras
|
|
53
|
+
serviceWorker.setLoginParams(configurationName, { callbackPath: url, extras: originExtras });
|
|
65
54
|
serviceWorker.startKeepAliveServiceWorker();
|
|
66
55
|
yield serviceWorker.initAsync(oidcServerConfiguration, 'loginAsync', configuration);
|
|
67
56
|
yield serviceWorker.setNonceAsync(nonce);
|
|
68
|
-
storage =
|
|
69
|
-
yield storage.setItem('dummy', {});
|
|
57
|
+
storage = serviceWorker;
|
|
70
58
|
}
|
|
71
59
|
else {
|
|
72
60
|
const session = (0, initSession_1.initSession)(configurationName, (_a = configuration.storage) !== null && _a !== void 0 ? _a : sessionStorage);
|
|
73
|
-
session.setLoginParams(configurationName, { callbackPath: url, extras: originExtras
|
|
61
|
+
session.setLoginParams(configurationName, { callbackPath: url, extras: originExtras });
|
|
74
62
|
yield session.setNonceAsync(nonce);
|
|
75
|
-
storage =
|
|
63
|
+
storage = session;
|
|
76
64
|
}
|
|
77
65
|
// @ts-ignore
|
|
78
|
-
const
|
|
79
|
-
|
|
80
|
-
const authRequest = new appauth_1.AuthorizationRequest({
|
|
81
|
-
client_id: configuration.client_id,
|
|
82
|
-
redirect_uri: redirectUri,
|
|
83
|
-
scope,
|
|
84
|
-
response_type: appauth_1.AuthorizationRequest.RESPONSE_TYPE_CODE,
|
|
85
|
-
state,
|
|
86
|
-
extras: extraFinal,
|
|
87
|
-
});
|
|
88
|
-
authorizationHandler.performAuthorizationRequest(oidcServerConfiguration, authRequest);
|
|
66
|
+
const extraInternal = Object.assign({ client_id: configuration.client_id, redirect_uri: redirectUri, scope, response_type: 'code' }, extraFinal);
|
|
67
|
+
yield (0, requests_1.performAuthorizationRequestAsync)(storage)(oidcServerConfiguration.authorizationEndpoint, extraInternal);
|
|
89
68
|
}
|
|
90
69
|
catch (exception) {
|
|
91
70
|
publishEvent(events_1.eventNames.loginAsync_error, exception);
|
|
@@ -108,131 +87,79 @@ const loginCallbackAsync = (oidc) => (isSilentSignin = false) => __awaiter(void
|
|
|
108
87
|
const queryParams = (0, route_utils_1.getParseQueryStringFromLocation)(window.location.href);
|
|
109
88
|
const sessionState = queryParams.session_state;
|
|
110
89
|
const serviceWorker = yield (0, initWorker_1.initWorkerAsync)(configuration.service_worker_relative_url, oidc.configurationName);
|
|
111
|
-
let storage
|
|
112
|
-
let nonceData
|
|
113
|
-
let getLoginParams
|
|
90
|
+
let storage;
|
|
91
|
+
let nonceData;
|
|
92
|
+
let getLoginParams;
|
|
93
|
+
let state;
|
|
114
94
|
if (serviceWorker) {
|
|
115
95
|
serviceWorker.startKeepAliveServiceWorker();
|
|
116
96
|
yield serviceWorker.initAsync(oidcServerConfiguration, 'loginCallbackAsync', configuration);
|
|
117
|
-
const items = yield serviceWorker.loadItemsAsync();
|
|
118
|
-
storage = new memoryStorageBackend_1.MemoryStorageBackend(serviceWorker.saveItemsAsync, items);
|
|
119
|
-
const dummy = yield storage.getItem('dummy');
|
|
120
|
-
if (!dummy) {
|
|
121
|
-
throw new Error('Service Worker storage disapear');
|
|
122
|
-
}
|
|
123
|
-
yield storage.removeItem('dummy');
|
|
124
97
|
yield serviceWorker.setSessionStateAsync(sessionState);
|
|
125
98
|
nonceData = yield serviceWorker.getNonceAsync();
|
|
126
99
|
getLoginParams = serviceWorker.getLoginParams(oidc.configurationName);
|
|
100
|
+
state = yield serviceWorker.getStateAsync();
|
|
101
|
+
storage = serviceWorker;
|
|
127
102
|
}
|
|
128
103
|
else {
|
|
129
104
|
const session = (0, initSession_1.initSession)(oidc.configurationName, (_a = configuration.storage) !== null && _a !== void 0 ? _a : sessionStorage);
|
|
130
|
-
session.
|
|
131
|
-
const items = yield session.loadItemsAsync();
|
|
132
|
-
storage = new memoryStorageBackend_1.MemoryStorageBackend(session.saveItemsAsync, items);
|
|
105
|
+
yield session.setSessionStateAsync(sessionState);
|
|
133
106
|
nonceData = yield session.getNonceAsync();
|
|
134
107
|
getLoginParams = session.getLoginParams(oidc.configurationName);
|
|
108
|
+
state = yield session.getStateAsync();
|
|
109
|
+
storage = session;
|
|
135
110
|
}
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
111
|
+
const params = (0, route_utils_1.getParseQueryStringFromLocation)(window.location.toString());
|
|
112
|
+
if (params.iss && params.iss !== oidcServerConfiguration.issuer) {
|
|
113
|
+
throw new Error('issuer not valid');
|
|
114
|
+
}
|
|
115
|
+
if (params.state && params.state !== state) {
|
|
116
|
+
throw new Error('state not valid');
|
|
117
|
+
}
|
|
118
|
+
const data = {
|
|
119
|
+
code: params.code,
|
|
120
|
+
grant_type: 'authorization_code',
|
|
121
|
+
client_id: configuration.client_id,
|
|
122
|
+
redirect_uri: redirectUri,
|
|
123
|
+
};
|
|
124
|
+
const extras = {};
|
|
125
|
+
// @ts-ignore
|
|
126
|
+
if (configuration.token_request_extras) {
|
|
127
|
+
for (const [key, value] of Object.entries(configuration.token_request_extras)) {
|
|
128
|
+
extras[key] = value;
|
|
143
129
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
reject(error);
|
|
150
|
-
return;
|
|
151
|
-
}
|
|
152
|
-
if (!response) {
|
|
153
|
-
reject(new Error('no response'));
|
|
154
|
-
return;
|
|
155
|
-
}
|
|
156
|
-
const extras = {};
|
|
157
|
-
if (request && request.internal) {
|
|
158
|
-
// @ts-ignore
|
|
159
|
-
extras.code_verifier = request.internal.code_verifier;
|
|
160
|
-
if (configuration.token_request_extras) {
|
|
161
|
-
for (const [key, value] of Object.entries(configuration.token_request_extras)) {
|
|
162
|
-
extras[key] = value;
|
|
163
|
-
}
|
|
164
|
-
}
|
|
165
|
-
if (getLoginParams && getLoginParams.extras) {
|
|
166
|
-
for (const [key, value] of Object.entries(getLoginParams.extras)) {
|
|
167
|
-
if (key.endsWith(':token_request')) {
|
|
168
|
-
extras[key.replace(':token_request', '')] = value;
|
|
169
|
-
}
|
|
170
|
-
}
|
|
171
|
-
}
|
|
172
|
-
}
|
|
173
|
-
const tokenRequest = new appauth_1.TokenRequest({
|
|
174
|
-
client_id: clientId,
|
|
175
|
-
redirect_uri: redirectUri,
|
|
176
|
-
grant_type: appauth_1.GRANT_TYPE_AUTHORIZATION_CODE,
|
|
177
|
-
code: response.code,
|
|
178
|
-
refresh_token: undefined,
|
|
179
|
-
extras,
|
|
180
|
-
});
|
|
181
|
-
let timeoutId = setTimeout(() => {
|
|
182
|
-
reject(new Error('performTokenRequest timeout'));
|
|
183
|
-
timeoutId = null;
|
|
184
|
-
}, tokenRequestTimeout !== null && tokenRequestTimeout !== void 0 ? tokenRequestTimeout : 12000);
|
|
185
|
-
try {
|
|
186
|
-
const tokenHandler = new appauth_1.BaseTokenRequestHandler(new appauth_1.FetchRequestor());
|
|
187
|
-
tokenHandler.performTokenRequest(oidcServerConfiguration, tokenRequest).then((tokenResponse) => __awaiter(void 0, void 0, void 0, function* () {
|
|
188
|
-
if (timeoutId) {
|
|
189
|
-
clearTimeout(timeoutId);
|
|
190
|
-
oidc.timeoutId = null;
|
|
191
|
-
let loginParams = null;
|
|
192
|
-
let formattedTokens = null;
|
|
193
|
-
if (serviceWorker) {
|
|
194
|
-
const { tokens } = yield serviceWorker.initAsync(oidcServerConfiguration, 'syncTokensAsync', configuration);
|
|
195
|
-
loginParams = serviceWorker.getLoginParams(oidc.configurationName);
|
|
196
|
-
formattedTokens = tokens;
|
|
197
|
-
}
|
|
198
|
-
else {
|
|
199
|
-
const session = (0, initSession_1.initSession)(oidc.configurationName, configuration.storage);
|
|
200
|
-
loginParams = session.getLoginParams(oidc.configurationName);
|
|
201
|
-
formattedTokens = (0, parseTokens_1.setTokens)(tokenResponse, null, configuration.token_renew_mode);
|
|
202
|
-
}
|
|
203
|
-
if (!(0, parseTokens_1.isTokensOidcValid)(formattedTokens, nonceData.nonce, oidcServerConfiguration)) {
|
|
204
|
-
const exception = new Error('Tokens are not OpenID valid');
|
|
205
|
-
if (timeoutId) {
|
|
206
|
-
clearTimeout(timeoutId);
|
|
207
|
-
oidc.timeoutId = null;
|
|
208
|
-
oidc.publishEvent(events_1.eventNames.loginCallbackAsync_error, exception);
|
|
209
|
-
console.error(exception);
|
|
210
|
-
reject(exception);
|
|
211
|
-
}
|
|
212
|
-
}
|
|
213
|
-
oidc.startCheckSessionAsync(oidcServerConfiguration.check_session_iframe, clientId, sessionState, isSilentSignin).then(() => {
|
|
214
|
-
oidc.publishEvent(events_1.eventNames.loginCallbackAsync_end, {});
|
|
215
|
-
resolve({
|
|
216
|
-
tokens: formattedTokens,
|
|
217
|
-
state: request.state,
|
|
218
|
-
callbackPath: loginParams.callbackPath,
|
|
219
|
-
});
|
|
220
|
-
});
|
|
221
|
-
}
|
|
222
|
-
}));
|
|
223
|
-
}
|
|
224
|
-
catch (exception) {
|
|
225
|
-
if (timeoutId) {
|
|
226
|
-
clearTimeout(timeoutId);
|
|
227
|
-
oidc.timeoutId = null;
|
|
228
|
-
oidc.publishEvent(events_1.eventNames.loginCallbackAsync_error, exception);
|
|
229
|
-
console.error(exception);
|
|
230
|
-
reject(exception);
|
|
231
|
-
}
|
|
130
|
+
}
|
|
131
|
+
if (getLoginParams && getLoginParams.extras) {
|
|
132
|
+
for (const [key, value] of Object.entries(getLoginParams.extras)) {
|
|
133
|
+
if (key.endsWith(':token_request')) {
|
|
134
|
+
extras[key.replace(':token_request', '')] = value;
|
|
232
135
|
}
|
|
233
|
-
}
|
|
234
|
-
|
|
235
|
-
});
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
const tokenResponse = yield (0, requests_1.performFirstTokenRequestAsync)(storage)(oidcServerConfiguration.tokenEndpoint, Object.assign(Object.assign({}, data), extras), oidc.configuration.token_renew_mode, tokenRequestTimeout);
|
|
139
|
+
let loginParams = null;
|
|
140
|
+
const formattedTokens = tokenResponse.data.tokens;
|
|
141
|
+
if (serviceWorker) {
|
|
142
|
+
yield serviceWorker.initAsync(redirectUri, 'syncTokensAsync', configuration);
|
|
143
|
+
loginParams = serviceWorker.getLoginParams(oidc.configurationName);
|
|
144
|
+
}
|
|
145
|
+
else {
|
|
146
|
+
const session = (0, initSession_1.initSession)(oidc.configurationName, configuration.storage);
|
|
147
|
+
loginParams = session.getLoginParams(oidc.configurationName);
|
|
148
|
+
}
|
|
149
|
+
// @ts-ignore
|
|
150
|
+
if (tokenResponse.data.state !== extras.state) {
|
|
151
|
+
throw new Error('state is not valid');
|
|
152
|
+
}
|
|
153
|
+
if (!(0, parseTokens_1.isTokensOidcValid)(formattedTokens, nonceData.nonce, oidcServerConfiguration)) {
|
|
154
|
+
throw new Error('Tokens are not OpenID valid');
|
|
155
|
+
}
|
|
156
|
+
yield oidc.startCheckSessionAsync(oidcServerConfiguration.check_session_iframe, clientId, sessionState, isSilentSignin);
|
|
157
|
+
oidc.publishEvent(events_1.eventNames.loginCallbackAsync_end, {});
|
|
158
|
+
return {
|
|
159
|
+
tokens: formattedTokens,
|
|
160
|
+
state: 'request.state',
|
|
161
|
+
callbackPath: loginParams.callbackPath,
|
|
162
|
+
};
|
|
236
163
|
}
|
|
237
164
|
catch (exception) {
|
|
238
165
|
console.error(exception);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/oidc/vanilla/login.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/oidc/vanilla/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { StringMap } from './types';
|
|
2
|
+
export declare const destroyAsync: (oidc: any) => (status: any) => Promise<void>;
|
|
3
|
+
export declare const logoutAsync: (oidc: any, oidcDatabase: any) => (callbackPathOrUrl?: string | null | undefined, extras?: StringMap) => Promise<void>;
|
|
4
|
+
//# sourceMappingURL=logout.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/logout.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,eAAO,MAAM,YAAY,+CAexB,CAAC;AAEF,eAAO,MAAM,WAAW,yDAAqD,MAAM,GAAG,IAAI,GAAG,SAAS,WAAsB,SAAS,kBAuEpI,CAAC"}
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.logoutAsync = exports.destroyAsync = void 0;
|
|
16
|
+
const initSession_1 = require("./initSession");
|
|
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);
|
|
22
|
+
oidc.timeoutId = null;
|
|
23
|
+
if (oidc.checkSessionIFrame) {
|
|
24
|
+
oidc.checkSessionIFrame.stop();
|
|
25
|
+
}
|
|
26
|
+
const serviceWorker = yield (0, initWorker_1.initWorkerAsync)(oidc.configuration.service_worker_relative_url, oidc.configurationName);
|
|
27
|
+
if (!serviceWorker) {
|
|
28
|
+
const session = (0, initSession_1.initSession)(oidc.configurationName, oidc.configuration.storage);
|
|
29
|
+
yield session.clearAsync(status);
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
yield serviceWorker.clearAsync(status);
|
|
33
|
+
}
|
|
34
|
+
oidc.tokens = null;
|
|
35
|
+
oidc.userInfo = null;
|
|
36
|
+
});
|
|
37
|
+
exports.destroyAsync = destroyAsync;
|
|
38
|
+
const logoutAsync = (oidc, oidcDatabase) => (callbackPathOrUrl = undefined, extras = null) => __awaiter(void 0, void 0, void 0, function* () {
|
|
39
|
+
const configuration = oidc.configuration;
|
|
40
|
+
const oidcServerConfiguration = yield oidc.initAsync(configuration.authority, configuration.authority_configuration);
|
|
41
|
+
if (callbackPathOrUrl && (typeof callbackPathOrUrl !== 'string')) {
|
|
42
|
+
callbackPathOrUrl = undefined;
|
|
43
|
+
console.warn('callbackPathOrUrl path is not a string');
|
|
44
|
+
}
|
|
45
|
+
const path = (callbackPathOrUrl === null || callbackPathOrUrl === undefined) ? location.pathname + (location.search || '') + (location.hash || '') : callbackPathOrUrl;
|
|
46
|
+
let isUri = false;
|
|
47
|
+
if (callbackPathOrUrl) {
|
|
48
|
+
isUri = callbackPathOrUrl.includes('https://') || callbackPathOrUrl.includes('http://');
|
|
49
|
+
}
|
|
50
|
+
const url = isUri ? callbackPathOrUrl : window.location.origin + path;
|
|
51
|
+
// @ts-ignore
|
|
52
|
+
const idToken = oidc.tokens ? oidc.tokens.idToken : '';
|
|
53
|
+
try {
|
|
54
|
+
const revocationEndpoint = oidcServerConfiguration.revocationEndpoint;
|
|
55
|
+
if (revocationEndpoint) {
|
|
56
|
+
const promises = [];
|
|
57
|
+
const accessToken = oidc.tokens.accessToken;
|
|
58
|
+
if (accessToken) {
|
|
59
|
+
const revokeAccessTokenPromise = (0, requests_1.performRevocationRequestAsync)(revocationEndpoint, accessToken, requests_1.TOKEN_TYPE.access_token, configuration.client_id);
|
|
60
|
+
promises.push(revokeAccessTokenPromise);
|
|
61
|
+
}
|
|
62
|
+
const refreshToken = oidc.tokens.refreshToken;
|
|
63
|
+
if (refreshToken) {
|
|
64
|
+
const revokeRefreshTokenPromise = (0, requests_1.performRevocationRequestAsync)(revocationEndpoint, refreshToken, requests_1.TOKEN_TYPE.refresh_token, configuration.client_id);
|
|
65
|
+
promises.push(revokeRefreshTokenPromise);
|
|
66
|
+
}
|
|
67
|
+
if (promises.length > 0) {
|
|
68
|
+
yield Promise.all(promises);
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
catch (exception) {
|
|
73
|
+
console.warn(exception);
|
|
74
|
+
}
|
|
75
|
+
// @ts-ignore
|
|
76
|
+
const sub = oidc.tokens && oidc.tokens.idTokenPayload ? oidc.tokens.idTokenPayload.sub : null;
|
|
77
|
+
yield oidc.destroyAsync('LOGGED_OUT');
|
|
78
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
79
|
+
for (const [key, itemOidc] of Object.entries(oidcDatabase)) {
|
|
80
|
+
if (itemOidc !== oidc) {
|
|
81
|
+
// @ts-ignore
|
|
82
|
+
yield oidc.logoutSameTabAsync(oidc.configuration.client_id, sub);
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
if (oidcServerConfiguration.endSessionEndpoint) {
|
|
86
|
+
if (!extras) {
|
|
87
|
+
extras = {
|
|
88
|
+
id_token_hint: idToken,
|
|
89
|
+
};
|
|
90
|
+
if (callbackPathOrUrl !== null) {
|
|
91
|
+
extras.post_logout_redirect_uri = url;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
let queryString = '';
|
|
95
|
+
if (extras) {
|
|
96
|
+
for (const [key, value] of Object.entries(extras)) {
|
|
97
|
+
if (queryString === '') {
|
|
98
|
+
queryString += '?';
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
queryString += '&';
|
|
102
|
+
}
|
|
103
|
+
queryString += `${key}=${encodeURIComponent(value)}`;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
window.location.href = `${oidcServerConfiguration.endSessionEndpoint}${queryString}`;
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
window.location.reload();
|
|
110
|
+
}
|
|
111
|
+
});
|
|
112
|
+
exports.logoutAsync = logoutAsync;
|
|
113
|
+
//# sourceMappingURL=logout.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/oidc/vanilla/logout.ts"],"names":[],"mappings":"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"}
|
package/dist/vanilla/oidc.d.ts
CHANGED
|
@@ -1,14 +1,17 @@
|
|
|
1
|
-
import { AuthorizationServiceConfiguration } from '@openid/appauth';
|
|
2
|
-
import { AuthorizationServiceConfigurationJson } from '@openid/appauth/src/authorization_service_configuration';
|
|
3
1
|
import { Tokens } from './parseTokens';
|
|
4
2
|
import { AuthorityConfiguration, OidcConfiguration, StringMap } from './types';
|
|
5
|
-
export interface OidcAuthorizationServiceConfigurationJson
|
|
3
|
+
export interface OidcAuthorizationServiceConfigurationJson {
|
|
6
4
|
check_session_iframe?: string;
|
|
7
5
|
issuer: string;
|
|
8
6
|
}
|
|
9
|
-
export declare class OidcAuthorizationServiceConfiguration
|
|
10
|
-
private
|
|
7
|
+
export declare class OidcAuthorizationServiceConfiguration {
|
|
8
|
+
private checkSessionIframe;
|
|
11
9
|
private issuer;
|
|
10
|
+
private authorizationEndpoint;
|
|
11
|
+
private tokenEndpoint;
|
|
12
|
+
private revocationEndpoint;
|
|
13
|
+
private userInfoEndpoint;
|
|
14
|
+
private endSessionEndpoint;
|
|
12
15
|
constructor(request: any);
|
|
13
16
|
}
|
|
14
17
|
export declare type LoginCallback = {
|
|
@@ -84,10 +87,12 @@ export declare class Oidc {
|
|
|
84
87
|
loginCallbackWithAutoTokensRenewAsync(): Promise<LoginCallback>;
|
|
85
88
|
userInfoPromise: Promise<any>;
|
|
86
89
|
userInfoAsync(): Promise<any>;
|
|
87
|
-
|
|
90
|
+
renewTokensPromise: Promise<any>;
|
|
91
|
+
renewTokensAsync(extras?: StringMap): Promise<any>;
|
|
88
92
|
destroyAsync(status: any): Promise<void>;
|
|
89
93
|
logoutSameTabAsync(clientId: string, sub: any): Promise<void>;
|
|
90
94
|
logoutOtherTabAsync(clientId: string, sub: any): Promise<void>;
|
|
95
|
+
logoutPromise: Promise<void>;
|
|
91
96
|
logoutAsync(callbackPathOrUrl?: string | null | undefined, extras?: StringMap): Promise<void>;
|
|
92
97
|
}
|
|
93
98
|
export default Oidc;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/oidc.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../../src/oidc/vanilla/oidc.ts"],"names":[],"mappings":"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"}
|