@axa-fr/react-oidc 6.16.7 → 6.16.8-alpha1
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/FetchToken.js +12 -7
- package/dist/FetchToken.js.map +1 -1
- package/dist/OidcProvider.js +50 -43
- package/dist/OidcProvider.js.map +1 -1
- package/dist/OidcSecure.js +14 -9
- package/dist/OidcSecure.js.map +1 -1
- package/dist/ReactOidc.js +35 -29
- package/dist/ReactOidc.js.map +1 -1
- package/dist/User.js +12 -8
- package/dist/User.js.map +1 -1
- package/dist/core/default-component/AuthenticateError.component.js +5 -3
- package/dist/core/default-component/AuthenticateError.component.js.map +1 -1
- package/dist/core/default-component/Authenticating.component.js +5 -3
- package/dist/core/default-component/Authenticating.component.js.map +1 -1
- package/dist/core/default-component/Callback.component.js +22 -15
- package/dist/core/default-component/Callback.component.js.map +1 -1
- package/dist/core/default-component/Loading.component.js +5 -3
- package/dist/core/default-component/Loading.component.js.map +1 -1
- package/dist/core/default-component/ServiceWorkerNotSupported.component.js +5 -3
- package/dist/core/default-component/ServiceWorkerNotSupported.component.js.map +1 -1
- package/dist/core/default-component/SessionLost.component.js +7 -3
- package/dist/core/default-component/SessionLost.component.js.map +1 -1
- package/dist/core/default-component/SilentCallback.component.js +9 -7
- package/dist/core/default-component/SilentCallback.component.js.map +1 -1
- package/dist/core/default-component/SilentLogin.component.js +11 -9
- package/dist/core/default-component/SilentLogin.component.js.map +1 -1
- package/dist/core/default-component/index.js +19 -6
- package/dist/core/default-component/index.js.map +1 -1
- package/dist/core/routes/OidcRoutes.js +46 -18
- package/dist/core/routes/OidcRoutes.js.map +1 -1
- package/dist/core/routes/withRouter.js +7 -2
- package/dist/core/routes/withRouter.js.map +1 -1
- package/dist/index.js +20 -6
- package/dist/index.js.map +1 -1
- package/dist/service_worker/{OidcServiceWorker.js → OidcServiceWorker.mjs} +1 -1
- package/dist/service_worker/OidcServiceWorker.mjs.map +1 -0
- package/dist/vanilla/cache.js +7 -2
- package/dist/vanilla/cache.js.map +1 -1
- package/dist/vanilla/checkSession.js +9 -5
- package/dist/vanilla/checkSession.js.map +1 -1
- package/dist/vanilla/checkSessionIFrame.js +5 -1
- package/dist/vanilla/checkSessionIFrame.js.map +1 -1
- package/dist/vanilla/crypto.js +33 -4
- package/dist/vanilla/crypto.js.map +1 -1
- package/dist/vanilla/events.js +4 -1
- package/dist/vanilla/events.js.map +1 -1
- package/dist/vanilla/initSession.js +5 -1
- package/dist/vanilla/initSession.js.map +1 -1
- package/dist/vanilla/initWorker.js +21 -11
- package/dist/vanilla/initWorker.js.map +1 -1
- package/dist/vanilla/login.js +31 -26
- package/dist/vanilla/login.js.map +1 -1
- package/dist/vanilla/logout.js +19 -11
- package/dist/vanilla/logout.js.map +1 -1
- package/dist/vanilla/oidc.js +107 -76
- package/dist/vanilla/oidc.js.map +1 -1
- package/dist/vanilla/parseTokens.js +24 -15
- package/dist/vanilla/parseTokens.js.map +1 -1
- package/dist/vanilla/renewTokens.js +21 -13
- package/dist/vanilla/renewTokens.js.map +1 -1
- package/dist/vanilla/requests.js +26 -18
- package/dist/vanilla/requests.js.map +1 -1
- package/dist/vanilla/route-utils.js +11 -5
- package/dist/vanilla/route-utils.js.map +1 -1
- package/dist/vanilla/silentLogin.js +24 -16
- package/dist/vanilla/silentLogin.js.map +1 -1
- package/dist/vanilla/timer.js +3 -1
- package/dist/vanilla/timer.js.map +1 -1
- package/dist/vanilla/types.js +2 -1
- package/dist/vanilla/user.js +9 -5
- package/dist/vanilla/user.js.map +1 -1
- package/dist/vanilla/vanillaOidc.js +11 -7
- package/dist/vanilla/vanillaOidc.js.map +1 -1
- package/package.json +1 -2
- package/service_worker/dist/{OidcServiceWorker.js → OidcServiceWorker.mjs} +1 -1
- package/service_worker/dist/OidcServiceWorker.mjs.map +1 -0
- package/dist/service_worker/OidcServiceWorker.js.map +0 -1
- package/service_worker/dist/OidcServiceWorker.js.map +0 -1
package/dist/vanilla/crypto.js
CHANGED
|
@@ -1,4 +1,30 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
exports.deriveChallengeAsync = exports.textEncodeLite = exports.generateRandom = void 0;
|
|
27
|
+
const base64 = __importStar(require("base64-js"));
|
|
2
28
|
const crytoInfo = () => {
|
|
3
29
|
const hasCrypto = typeof window !== 'undefined' && !!window.crypto;
|
|
4
30
|
const hasSubtleCrypto = hasCrypto && !!window.crypto.subtle;
|
|
@@ -17,7 +43,7 @@ const urlSafe = (buffer) => {
|
|
|
17
43
|
const encoded = base64.fromByteArray(new Uint8Array(buffer));
|
|
18
44
|
return encoded.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
|
|
19
45
|
};
|
|
20
|
-
|
|
46
|
+
const generateRandom = (size) => {
|
|
21
47
|
const buffer = new Uint8Array(size);
|
|
22
48
|
const { hasCrypto } = crytoInfo();
|
|
23
49
|
if (hasCrypto) {
|
|
@@ -31,7 +57,8 @@ export const generateRandom = (size) => {
|
|
|
31
57
|
}
|
|
32
58
|
return bufferToString(buffer);
|
|
33
59
|
};
|
|
34
|
-
|
|
60
|
+
exports.generateRandom = generateRandom;
|
|
61
|
+
function textEncodeLite(str) {
|
|
35
62
|
const buf = new ArrayBuffer(str.length);
|
|
36
63
|
const bufView = new Uint8Array(buf);
|
|
37
64
|
for (let i = 0; i < str.length; i++) {
|
|
@@ -39,7 +66,8 @@ export function textEncodeLite(str) {
|
|
|
39
66
|
}
|
|
40
67
|
return bufView;
|
|
41
68
|
}
|
|
42
|
-
|
|
69
|
+
exports.textEncodeLite = textEncodeLite;
|
|
70
|
+
const deriveChallengeAsync = (code) => {
|
|
43
71
|
if (code.length < 43 || code.length > 128) {
|
|
44
72
|
return Promise.reject(new Error('Invalid code length.'));
|
|
45
73
|
}
|
|
@@ -53,4 +81,5 @@ export const deriveChallengeAsync = (code) => {
|
|
|
53
81
|
}, error => reject(error));
|
|
54
82
|
});
|
|
55
83
|
};
|
|
84
|
+
exports.deriveChallengeAsync = deriveChallengeAsync;
|
|
56
85
|
//# sourceMappingURL=crypto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/oidc/vanilla/crypto.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"crypto.js","sourceRoot":"","sources":["../../src/oidc/vanilla/crypto.ts"],"names":[],"mappings":"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"}
|
package/dist/vanilla/events.js
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.eventNames = void 0;
|
|
4
|
+
exports.eventNames = {
|
|
2
5
|
service_worker_not_supported_by_browser: 'service_worker_not_supported_by_browser',
|
|
3
6
|
token_aquired: 'token_aquired',
|
|
4
7
|
logout_from_another_tab: 'logout_from_another_tab',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/oidc/vanilla/events.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/oidc/vanilla/events.ts"],"names":[],"mappings":";;;AACa,QAAA,UAAU,GAAG;IACtB,uCAAuC,EAAE,yCAAyC;IAClF,aAAa,EAAE,eAAe;IAC9B,uBAAuB,EAAE,yBAAyB;IAClD,oBAAoB,EAAE,sBAAsB;IAC5C,aAAa,EAAE,eAAe;IAC9B,WAAW,EAAE,aAAa;IAC1B,gBAAgB,EAAE,kBAAkB;IACpC,gBAAgB,EAAE,kBAAkB;IACpC,wBAAwB,EAAE,0BAA0B;IACpD,sBAAsB,EAAE,wBAAwB;IAChD,wBAAwB,EAAE,0BAA0B;IACpD,wBAAwB,EAAE,0BAA0B;IACpD,kBAAkB,EAAE,oBAAoB;IACxC,sBAAsB,EAAE,wBAAwB;IAChD,wBAAwB,EAAE,0BAA0B;IACpD,+BAA+B,EAAE,iCAAiC;IAClE,iCAAiC,EAAE,mCAAmC;IACtE,+BAA+B,EAAE,iCAAiC;IAClE,iCAAiC,EAAE,mCAAmC;IACtE,sBAAsB,EAAE,wBAAwB;IAChD,gBAAgB,EAAE,kBAAkB;IACpC,oBAAoB,EAAE,sBAAsB;IAC5C,sBAAsB,EAAE,wBAAwB;IAChD,qBAAqB,EAAE,uBAAuB;IAC9C,mBAAmB,EAAE,qBAAqB;IAC1C,qBAAqB,EAAE,uBAAuB;CACjD,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -7,7 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
9
|
});
|
|
9
10
|
};
|
|
10
|
-
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.initSession = void 0;
|
|
13
|
+
const initSession = (configurationName, storage = sessionStorage) => {
|
|
11
14
|
const clearAsync = (status) => {
|
|
12
15
|
storage[`oidc.${configurationName}`] = JSON.stringify({ tokens: null, status });
|
|
13
16
|
return Promise.resolve();
|
|
@@ -83,4 +86,5 @@ export const initSession = (configurationName, storage = sessionStorage) => {
|
|
|
83
86
|
setCodeVerifierAsync,
|
|
84
87
|
};
|
|
85
88
|
};
|
|
89
|
+
exports.initSession = initSession;
|
|
86
90
|
//# sourceMappingURL=initSession.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initSession.js","sourceRoot":"","sources":["../../src/oidc/vanilla/initSession.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"initSession.js","sourceRoot":"","sources":["../../src/oidc/vanilla/initSession.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -7,9 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
9
|
});
|
|
9
10
|
};
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
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.initWorkerAsync = exports.excludeOs = exports.sleepAsync = exports.getOperatingSystem = void 0;
|
|
16
|
+
const parseTokens_js_1 = require("./parseTokens.js");
|
|
17
|
+
const timer_js_1 = __importDefault(require("./timer.js"));
|
|
18
|
+
const getOperatingSystem = (navigator) => {
|
|
13
19
|
const nVer = navigator.appVersion;
|
|
14
20
|
const nAgt = navigator.userAgent;
|
|
15
21
|
const unknown = '-';
|
|
@@ -73,6 +79,7 @@ export const getOperatingSystem = (navigator) => {
|
|
|
73
79
|
osVersion,
|
|
74
80
|
};
|
|
75
81
|
};
|
|
82
|
+
exports.getOperatingSystem = getOperatingSystem;
|
|
76
83
|
function getBrowser() {
|
|
77
84
|
const ua = navigator.userAgent;
|
|
78
85
|
let tem;
|
|
@@ -104,14 +111,15 @@ function getBrowser() {
|
|
|
104
111
|
};
|
|
105
112
|
}
|
|
106
113
|
let keepAliveServiceWorkerTimeoutId = null;
|
|
107
|
-
|
|
108
|
-
return new Promise(resolve =>
|
|
114
|
+
const sleepAsync = (milliseconds) => {
|
|
115
|
+
return new Promise(resolve => timer_js_1.default.setTimeout(resolve, milliseconds));
|
|
109
116
|
};
|
|
117
|
+
exports.sleepAsync = sleepAsync;
|
|
110
118
|
const keepAlive = () => {
|
|
111
119
|
try {
|
|
112
120
|
const promise = fetch('/OidcKeepAliveServiceWorker.json');
|
|
113
121
|
promise.catch(error => { console.log(error); });
|
|
114
|
-
sleepAsync(230 * 1000).then(keepAlive);
|
|
122
|
+
(0, exports.sleepAsync)(230 * 1000).then(keepAlive);
|
|
115
123
|
}
|
|
116
124
|
catch (error) {
|
|
117
125
|
console.log(error);
|
|
@@ -126,7 +134,7 @@ const isServiceWorkerProxyActiveAsync = () => {
|
|
|
126
134
|
return response.statusText === 'oidc-service-worker';
|
|
127
135
|
}).catch(error => { console.log(error); });
|
|
128
136
|
};
|
|
129
|
-
|
|
137
|
+
const excludeOs = (operatingSystem) => {
|
|
130
138
|
if (operatingSystem.os === 'iOS' && operatingSystem.osVersion.startsWith('12')) {
|
|
131
139
|
return true;
|
|
132
140
|
}
|
|
@@ -135,6 +143,7 @@ export const excludeOs = (operatingSystem) => {
|
|
|
135
143
|
}
|
|
136
144
|
return false;
|
|
137
145
|
};
|
|
146
|
+
exports.excludeOs = excludeOs;
|
|
138
147
|
const sendMessageAsync = (registration) => (data) => {
|
|
139
148
|
return new Promise(function (resolve, reject) {
|
|
140
149
|
const messageChannel = new MessageChannel();
|
|
@@ -149,7 +158,7 @@ const sendMessageAsync = (registration) => (data) => {
|
|
|
149
158
|
registration.active.postMessage(data, [messageChannel.port2]);
|
|
150
159
|
});
|
|
151
160
|
};
|
|
152
|
-
|
|
161
|
+
const initWorkerAsync = (serviceWorkerRelativeUrl, configurationName) => __awaiter(void 0, void 0, void 0, function* () {
|
|
153
162
|
if (typeof window === 'undefined' || typeof navigator === 'undefined' || !navigator.serviceWorker || !serviceWorkerRelativeUrl) {
|
|
154
163
|
return null;
|
|
155
164
|
}
|
|
@@ -168,8 +177,8 @@ export const initWorkerAsync = (serviceWorkerRelativeUrl, configurationName) =>
|
|
|
168
177
|
if (name === 'ie') {
|
|
169
178
|
return null;
|
|
170
179
|
}
|
|
171
|
-
const operatingSystem = getOperatingSystem(navigator);
|
|
172
|
-
if (excludeOs(operatingSystem)) {
|
|
180
|
+
const operatingSystem = (0, exports.getOperatingSystem)(navigator);
|
|
181
|
+
if ((0, exports.excludeOs)(operatingSystem)) {
|
|
173
182
|
return null;
|
|
174
183
|
}
|
|
175
184
|
const registration = yield navigator.serviceWorker.register(serviceWorkerRelativeUrl);
|
|
@@ -213,7 +222,7 @@ export const initWorkerAsync = (serviceWorkerRelativeUrl, configurationName) =>
|
|
|
213
222
|
configurationName,
|
|
214
223
|
});
|
|
215
224
|
// @ts-ignore
|
|
216
|
-
return { tokens: parseOriginalTokens(result.tokens, null, oidcConfiguration.token_renew_mode), status: result.status };
|
|
225
|
+
return { tokens: (0, parseTokens_js_1.parseOriginalTokens)(result.tokens, null, oidcConfiguration.token_renew_mode), status: result.status };
|
|
217
226
|
});
|
|
218
227
|
const startKeepAliveServiceWorker = () => {
|
|
219
228
|
if (keepAliveServiceWorkerTimeoutId == null) {
|
|
@@ -284,4 +293,5 @@ export const initWorkerAsync = (serviceWorkerRelativeUrl, configurationName) =>
|
|
|
284
293
|
setCodeVerifierAsync,
|
|
285
294
|
};
|
|
286
295
|
});
|
|
296
|
+
exports.initWorkerAsync = initWorkerAsync;
|
|
287
297
|
//# sourceMappingURL=initWorker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initWorker.js","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"initWorker.js","sourceRoot":"","sources":["../../src/oidc/vanilla/initWorker.ts"],"names":[],"mappings":"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"}
|
package/dist/vanilla/login.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -7,15 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
9
|
});
|
|
9
10
|
};
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.loginCallbackAsync = exports.defaultLoginAsync = void 0;
|
|
13
|
+
const crypto_js_1 = require("./crypto.js");
|
|
14
|
+
const events_js_1 = require("./events.js");
|
|
15
|
+
const initSession_js_1 = require("./initSession.js");
|
|
16
|
+
const initWorker_js_1 = require("./initWorker.js");
|
|
17
|
+
const parseTokens_js_1 = require("./parseTokens.js");
|
|
18
|
+
const requests_js_1 = require("./requests.js");
|
|
19
|
+
const route_utils_js_1 = require("./route-utils.js");
|
|
17
20
|
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
18
|
-
|
|
21
|
+
const defaultLoginAsync = (window, configurationName, configuration, publishEvent, initAsync) => (callbackPath = undefined, extras = null, isSilentSignin = false, scope = undefined) => {
|
|
19
22
|
const originExtras = extras;
|
|
20
23
|
extras = Object.assign({}, extras);
|
|
21
24
|
const loginLocalAsync = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -23,9 +26,9 @@ export const defaultLoginAsync = (window, configurationName, configuration, publ
|
|
|
23
26
|
const location = window.location;
|
|
24
27
|
const url = callbackPath || location.pathname + (location.search || '') + (location.hash || '');
|
|
25
28
|
if (!('state' in extras)) {
|
|
26
|
-
extras.state = generateRandom(16);
|
|
29
|
+
extras.state = (0, crypto_js_1.generateRandom)(16);
|
|
27
30
|
}
|
|
28
|
-
publishEvent(eventNames.loginAsync_begin, {});
|
|
31
|
+
publishEvent(events_js_1.eventNames.loginAsync_begin, {});
|
|
29
32
|
if (extras) {
|
|
30
33
|
for (const key of Object.keys(extras)) {
|
|
31
34
|
if (key.endsWith(':token_request')) {
|
|
@@ -40,10 +43,10 @@ export const defaultLoginAsync = (window, configurationName, configuration, publ
|
|
|
40
43
|
}
|
|
41
44
|
const extraFinal = !configuration.extras ? extras : Object.assign(Object.assign({}, configuration.extras), extras);
|
|
42
45
|
if (!extraFinal.nonce) {
|
|
43
|
-
extraFinal.nonce = generateRandom(12);
|
|
46
|
+
extraFinal.nonce = (0, crypto_js_1.generateRandom)(12);
|
|
44
47
|
}
|
|
45
48
|
const nonce = { nonce: extraFinal.nonce };
|
|
46
|
-
const serviceWorker = yield initWorkerAsync(configuration.service_worker_relative_url, configurationName);
|
|
49
|
+
const serviceWorker = yield (0, initWorker_js_1.initWorkerAsync)(configuration.service_worker_relative_url, configurationName);
|
|
47
50
|
const oidcServerConfiguration = yield initAsync(configuration.authority, configuration.authority_configuration);
|
|
48
51
|
let storage;
|
|
49
52
|
if (serviceWorker) {
|
|
@@ -54,35 +57,36 @@ export const defaultLoginAsync = (window, configurationName, configuration, publ
|
|
|
54
57
|
storage = serviceWorker;
|
|
55
58
|
}
|
|
56
59
|
else {
|
|
57
|
-
const session = initSession(configurationName, (_a = configuration.storage) !== null && _a !== void 0 ? _a : sessionStorage);
|
|
60
|
+
const session = (0, initSession_js_1.initSession)(configurationName, (_a = configuration.storage) !== null && _a !== void 0 ? _a : sessionStorage);
|
|
58
61
|
session.setLoginParams(configurationName, { callbackPath: url, extras: originExtras });
|
|
59
62
|
yield session.setNonceAsync(nonce);
|
|
60
63
|
storage = session;
|
|
61
64
|
}
|
|
62
65
|
// @ts-ignore
|
|
63
66
|
const extraInternal = Object.assign({ client_id: configuration.client_id, redirect_uri: redirectUri, scope, response_type: 'code' }, extraFinal);
|
|
64
|
-
yield performAuthorizationRequestAsync(storage)(oidcServerConfiguration.authorizationEndpoint, extraInternal);
|
|
67
|
+
yield (0, requests_js_1.performAuthorizationRequestAsync)(storage)(oidcServerConfiguration.authorizationEndpoint, extraInternal);
|
|
65
68
|
}
|
|
66
69
|
catch (exception) {
|
|
67
|
-
publishEvent(eventNames.loginAsync_error, exception);
|
|
70
|
+
publishEvent(events_js_1.eventNames.loginAsync_error, exception);
|
|
68
71
|
throw exception;
|
|
69
72
|
}
|
|
70
73
|
});
|
|
71
74
|
return loginLocalAsync();
|
|
72
75
|
};
|
|
73
|
-
|
|
76
|
+
exports.defaultLoginAsync = defaultLoginAsync;
|
|
77
|
+
const loginCallbackAsync = (oidc) => (isSilentSignin = false) => __awaiter(void 0, void 0, void 0, function* () {
|
|
74
78
|
var _a;
|
|
75
79
|
try {
|
|
76
|
-
oidc.publishEvent(eventNames.loginCallbackAsync_begin, {});
|
|
80
|
+
oidc.publishEvent(events_js_1.eventNames.loginCallbackAsync_begin, {});
|
|
77
81
|
const configuration = oidc.configuration;
|
|
78
82
|
const clientId = configuration.client_id;
|
|
79
83
|
const redirectUri = isSilentSignin ? configuration.silent_redirect_uri : configuration.redirect_uri;
|
|
80
84
|
const authority = configuration.authority;
|
|
81
85
|
const tokenRequestTimeout = configuration.token_request_timeout;
|
|
82
86
|
const oidcServerConfiguration = yield oidc.initAsync(authority, configuration.authority_configuration);
|
|
83
|
-
const queryParams = getParseQueryStringFromLocation(window.location.href);
|
|
87
|
+
const queryParams = (0, route_utils_js_1.getParseQueryStringFromLocation)(window.location.href);
|
|
84
88
|
const sessionState = queryParams.session_state;
|
|
85
|
-
const serviceWorker = yield initWorkerAsync(configuration.service_worker_relative_url, oidc.configurationName);
|
|
89
|
+
const serviceWorker = yield (0, initWorker_js_1.initWorkerAsync)(configuration.service_worker_relative_url, oidc.configurationName);
|
|
86
90
|
let storage;
|
|
87
91
|
let nonceData;
|
|
88
92
|
let getLoginParams;
|
|
@@ -97,14 +101,14 @@ export const loginCallbackAsync = (oidc) => (isSilentSignin = false) => __awaite
|
|
|
97
101
|
storage = serviceWorker;
|
|
98
102
|
}
|
|
99
103
|
else {
|
|
100
|
-
const session = initSession(oidc.configurationName, (_a = configuration.storage) !== null && _a !== void 0 ? _a : sessionStorage);
|
|
104
|
+
const session = (0, initSession_js_1.initSession)(oidc.configurationName, (_a = configuration.storage) !== null && _a !== void 0 ? _a : sessionStorage);
|
|
101
105
|
yield session.setSessionStateAsync(sessionState);
|
|
102
106
|
nonceData = yield session.getNonceAsync();
|
|
103
107
|
getLoginParams = session.getLoginParams(oidc.configurationName);
|
|
104
108
|
state = yield session.getStateAsync();
|
|
105
109
|
storage = session;
|
|
106
110
|
}
|
|
107
|
-
const params = getParseQueryStringFromLocation(window.location.toString());
|
|
111
|
+
const params = (0, route_utils_js_1.getParseQueryStringFromLocation)(window.location.toString());
|
|
108
112
|
if (params.iss && params.iss !== oidcServerConfiguration.issuer) {
|
|
109
113
|
throw new Error('issuer not valid');
|
|
110
114
|
}
|
|
@@ -131,7 +135,7 @@ export const loginCallbackAsync = (oidc) => (isSilentSignin = false) => __awaite
|
|
|
131
135
|
}
|
|
132
136
|
}
|
|
133
137
|
}
|
|
134
|
-
const tokenResponse = yield performFirstTokenRequestAsync(storage)(oidcServerConfiguration.tokenEndpoint, Object.assign(Object.assign({}, data), extras), oidc.configuration.token_renew_mode, tokenRequestTimeout);
|
|
138
|
+
const tokenResponse = yield (0, requests_js_1.performFirstTokenRequestAsync)(storage)(oidcServerConfiguration.tokenEndpoint, Object.assign(Object.assign({}, data), extras), oidc.configuration.token_renew_mode, tokenRequestTimeout);
|
|
135
139
|
if (!tokenResponse.success) {
|
|
136
140
|
throw new Error('Token request failed');
|
|
137
141
|
}
|
|
@@ -142,19 +146,19 @@ export const loginCallbackAsync = (oidc) => (isSilentSignin = false) => __awaite
|
|
|
142
146
|
loginParams = serviceWorker.getLoginParams(oidc.configurationName);
|
|
143
147
|
}
|
|
144
148
|
else {
|
|
145
|
-
const session = initSession(oidc.configurationName, configuration.storage);
|
|
149
|
+
const session = (0, initSession_js_1.initSession)(oidc.configurationName, configuration.storage);
|
|
146
150
|
loginParams = session.getLoginParams(oidc.configurationName);
|
|
147
151
|
}
|
|
148
152
|
// @ts-ignore
|
|
149
153
|
if (tokenResponse.data.state !== extras.state) {
|
|
150
154
|
throw new Error('state is not valid');
|
|
151
155
|
}
|
|
152
|
-
const { isValid, reason } = isTokensOidcValid(formattedTokens, nonceData.nonce, oidcServerConfiguration);
|
|
156
|
+
const { isValid, reason } = (0, parseTokens_js_1.isTokensOidcValid)(formattedTokens, nonceData.nonce, oidcServerConfiguration);
|
|
153
157
|
if (!isValid) {
|
|
154
158
|
throw new Error(`Tokens are not OpenID valid, reason: ${reason}`);
|
|
155
159
|
}
|
|
156
160
|
yield oidc.startCheckSessionAsync(oidcServerConfiguration.checkSessionIframe, clientId, sessionState, isSilentSignin);
|
|
157
|
-
oidc.publishEvent(eventNames.loginCallbackAsync_end, {});
|
|
161
|
+
oidc.publishEvent(events_js_1.eventNames.loginCallbackAsync_end, {});
|
|
158
162
|
return {
|
|
159
163
|
tokens: formattedTokens,
|
|
160
164
|
state: 'request.state',
|
|
@@ -163,8 +167,9 @@ export const loginCallbackAsync = (oidc) => (isSilentSignin = false) => __awaite
|
|
|
163
167
|
}
|
|
164
168
|
catch (exception) {
|
|
165
169
|
console.error(exception);
|
|
166
|
-
oidc.publishEvent(eventNames.loginCallbackAsync_error, exception);
|
|
170
|
+
oidc.publishEvent(events_js_1.eventNames.loginCallbackAsync_error, exception);
|
|
167
171
|
throw exception;
|
|
168
172
|
}
|
|
169
173
|
});
|
|
174
|
+
exports.loginCallbackAsync = loginCallbackAsync;
|
|
170
175
|
//# 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,3 +1,4 @@
|
|
|
1
|
+
"use strict";
|
|
1
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -7,19 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
9
|
});
|
|
9
10
|
};
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
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_js_1 = require("./initSession.js");
|
|
17
|
+
const initWorker_js_1 = require("./initWorker.js");
|
|
18
|
+
const requests_js_1 = require("./requests.js");
|
|
19
|
+
const timer_js_1 = __importDefault(require("./timer.js"));
|
|
20
|
+
const destroyAsync = (oidc) => (status) => __awaiter(void 0, void 0, void 0, function* () {
|
|
21
|
+
timer_js_1.default.clearTimeout(oidc.timeoutId);
|
|
16
22
|
oidc.timeoutId = null;
|
|
17
23
|
if (oidc.checkSessionIFrame) {
|
|
18
24
|
oidc.checkSessionIFrame.stop();
|
|
19
25
|
}
|
|
20
|
-
const serviceWorker = yield initWorkerAsync(oidc.configuration.service_worker_relative_url, oidc.configurationName);
|
|
26
|
+
const serviceWorker = yield (0, initWorker_js_1.initWorkerAsync)(oidc.configuration.service_worker_relative_url, oidc.configurationName);
|
|
21
27
|
if (!serviceWorker) {
|
|
22
|
-
const session = initSession(oidc.configurationName, oidc.configuration.storage);
|
|
28
|
+
const session = (0, initSession_js_1.initSession)(oidc.configurationName, oidc.configuration.storage);
|
|
23
29
|
yield session.clearAsync(status);
|
|
24
30
|
}
|
|
25
31
|
else {
|
|
@@ -28,7 +34,8 @@ export const destroyAsync = (oidc) => (status) => __awaiter(void 0, void 0, void
|
|
|
28
34
|
oidc.tokens = null;
|
|
29
35
|
oidc.userInfo = null;
|
|
30
36
|
});
|
|
31
|
-
|
|
37
|
+
exports.destroyAsync = destroyAsync;
|
|
38
|
+
const logoutAsync = (oidc, oidcDatabase) => (callbackPathOrUrl = undefined, extras = null) => __awaiter(void 0, void 0, void 0, function* () {
|
|
32
39
|
const configuration = oidc.configuration;
|
|
33
40
|
const oidcServerConfiguration = yield oidc.initAsync(configuration.authority, configuration.authority_configuration);
|
|
34
41
|
if (callbackPathOrUrl && (typeof callbackPathOrUrl !== 'string')) {
|
|
@@ -49,12 +56,12 @@ export const logoutAsync = (oidc, oidcDatabase) => (callbackPathOrUrl = undefine
|
|
|
49
56
|
const promises = [];
|
|
50
57
|
const accessToken = oidc.tokens.accessToken;
|
|
51
58
|
if (accessToken) {
|
|
52
|
-
const revokeAccessTokenPromise = performRevocationRequestAsync(revocationEndpoint, accessToken, TOKEN_TYPE.access_token, configuration.client_id);
|
|
59
|
+
const revokeAccessTokenPromise = (0, requests_js_1.performRevocationRequestAsync)(revocationEndpoint, accessToken, requests_js_1.TOKEN_TYPE.access_token, configuration.client_id);
|
|
53
60
|
promises.push(revokeAccessTokenPromise);
|
|
54
61
|
}
|
|
55
62
|
const refreshToken = oidc.tokens.refreshToken;
|
|
56
63
|
if (refreshToken) {
|
|
57
|
-
const revokeRefreshTokenPromise = performRevocationRequestAsync(revocationEndpoint, refreshToken, TOKEN_TYPE.refresh_token, configuration.client_id);
|
|
64
|
+
const revokeRefreshTokenPromise = (0, requests_js_1.performRevocationRequestAsync)(revocationEndpoint, refreshToken, requests_js_1.TOKEN_TYPE.refresh_token, configuration.client_id);
|
|
58
65
|
promises.push(revokeRefreshTokenPromise);
|
|
59
66
|
}
|
|
60
67
|
if (promises.length > 0) {
|
|
@@ -102,4 +109,5 @@ export const logoutAsync = (oidc, oidcDatabase) => (callbackPathOrUrl = undefine
|
|
|
102
109
|
window.location.reload();
|
|
103
110
|
}
|
|
104
111
|
});
|
|
112
|
+
exports.logoutAsync = logoutAsync;
|
|
105
113
|
//# 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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"}
|