@axa-fr/react-oidc 6.16.0 → 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/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/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 +1 -1
|
@@ -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,9 +7,7 @@ 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
|
-
exports.isTokensOidcValid = exports.getValidTokenAsync = exports.isTokensValid = exports.computeTimeLeft = exports.parseOriginalTokens = exports.setTokens = exports.TokenRenewMode = void 0;
|
|
13
|
-
const initWorker_1 = require("./initWorker");
|
|
10
|
+
import { sleepAsync } from './initWorker';
|
|
14
11
|
const b64DecodeUnicode = (str) => decodeURIComponent(Array.prototype.map.call(atob(str), (c) => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)).join(''));
|
|
15
12
|
const parseJwt = (token) => JSON.parse(b64DecodeUnicode(token.split('.')[1].replace('-', '+').replace('_', '/')));
|
|
16
13
|
const extractTokenPayload = (token) => {
|
|
@@ -33,12 +30,12 @@ const extractTokenPayload = (token) => {
|
|
|
33
30
|
const countLetter = (str, find) => {
|
|
34
31
|
return (str.split(find)).length - 1;
|
|
35
32
|
};
|
|
36
|
-
|
|
33
|
+
export const TokenRenewMode = {
|
|
37
34
|
access_token_or_id_token_invalid: 'access_token_or_id_token_invalid',
|
|
38
35
|
access_token_invalid: 'access_token_invalid',
|
|
39
36
|
id_token_invalid: 'id_token_invalid',
|
|
40
37
|
};
|
|
41
|
-
const setTokens = (tokens, oldTokens = null, tokenRenewMode) => {
|
|
38
|
+
export const setTokens = (tokens, oldTokens = null, tokenRenewMode) => {
|
|
42
39
|
if (!tokens) {
|
|
43
40
|
return null;
|
|
44
41
|
}
|
|
@@ -57,10 +54,10 @@ const setTokens = (tokens, oldTokens = null, tokenRenewMode) => {
|
|
|
57
54
|
const idTokenExpireAt = (_idTokenPayload && _idTokenPayload.exp) ? _idTokenPayload.exp : Number.MAX_VALUE;
|
|
58
55
|
const accessTokenExpiresAt = (accessTokenPayload && accessTokenPayload.exp) ? accessTokenPayload.exp : tokens.issuedAt + tokens.expiresIn;
|
|
59
56
|
let expiresAt;
|
|
60
|
-
if (tokenRenewMode ===
|
|
57
|
+
if (tokenRenewMode === TokenRenewMode.access_token_invalid) {
|
|
61
58
|
expiresAt = accessTokenExpiresAt;
|
|
62
59
|
}
|
|
63
|
-
else if (tokenRenewMode ===
|
|
60
|
+
else if (tokenRenewMode === TokenRenewMode.id_token_invalid) {
|
|
64
61
|
expiresAt = idTokenExpireAt;
|
|
65
62
|
}
|
|
66
63
|
else {
|
|
@@ -74,8 +71,7 @@ const setTokens = (tokens, oldTokens = null, tokenRenewMode) => {
|
|
|
74
71
|
}
|
|
75
72
|
return newTokens;
|
|
76
73
|
};
|
|
77
|
-
|
|
78
|
-
const parseOriginalTokens = (tokens, oldTokens, tokenRenewMode) => {
|
|
74
|
+
export const parseOriginalTokens = (tokens, oldTokens, tokenRenewMode) => {
|
|
79
75
|
if (!tokens) {
|
|
80
76
|
return null;
|
|
81
77
|
}
|
|
@@ -103,38 +99,34 @@ const parseOriginalTokens = (tokens, oldTokens, tokenRenewMode) => {
|
|
|
103
99
|
// @ts-ignore
|
|
104
100
|
data.idTokenPayload = tokens.idTokenPayload;
|
|
105
101
|
}
|
|
106
|
-
return
|
|
102
|
+
return setTokens(data, oldTokens, tokenRenewMode);
|
|
107
103
|
};
|
|
108
|
-
|
|
109
|
-
const computeTimeLeft = (refreshTimeBeforeTokensExpirationInSecond, expiresAt) => {
|
|
104
|
+
export const computeTimeLeft = (refreshTimeBeforeTokensExpirationInSecond, expiresAt) => {
|
|
110
105
|
const currentTimeUnixSecond = new Date().getTime() / 1000;
|
|
111
106
|
return Math.round(((expiresAt - refreshTimeBeforeTokensExpirationInSecond) - currentTimeUnixSecond));
|
|
112
107
|
};
|
|
113
|
-
|
|
114
|
-
const isTokensValid = (tokens) => {
|
|
108
|
+
export const isTokensValid = (tokens) => {
|
|
115
109
|
if (!tokens) {
|
|
116
110
|
return false;
|
|
117
111
|
}
|
|
118
|
-
return
|
|
112
|
+
return computeTimeLeft(0, tokens.expiresAt) > 0;
|
|
119
113
|
};
|
|
120
|
-
|
|
121
|
-
const getValidTokenAsync = (oidc, waitMs = 200, numberWait = 50) => __awaiter(void 0, void 0, void 0, function* () {
|
|
114
|
+
export const getValidTokenAsync = (oidc, waitMs = 200, numberWait = 50) => __awaiter(void 0, void 0, void 0, function* () {
|
|
122
115
|
let numberWaitTemp = numberWait;
|
|
123
|
-
while (!
|
|
124
|
-
yield
|
|
116
|
+
while (!isTokensValid(oidc.tokens) && numberWaitTemp > 0) {
|
|
117
|
+
yield sleepAsync(waitMs);
|
|
125
118
|
numberWaitTemp = numberWaitTemp - 1;
|
|
126
119
|
}
|
|
127
|
-
const isValid =
|
|
120
|
+
const isValid = isTokensValid(oidc.tokens);
|
|
128
121
|
return {
|
|
129
122
|
isTokensValid: isValid,
|
|
130
123
|
tokens: oidc.tokens,
|
|
131
124
|
numberWaited: numberWaitTemp - numberWait,
|
|
132
125
|
};
|
|
133
126
|
});
|
|
134
|
-
exports.getValidTokenAsync = getValidTokenAsync;
|
|
135
127
|
// https://openid.net/specs/openid-connect-core-1_0.html#IDTokenValidation (excluding rules #1, #4, #5, #7, #8, #12, and #13 which did not apply).
|
|
136
128
|
// https://github.com/openid/AppAuth-JS/issues/65
|
|
137
|
-
const isTokensOidcValid = (tokens, nonce, oidcServerConfiguration) => {
|
|
129
|
+
export const isTokensOidcValid = (tokens, nonce, oidcServerConfiguration) => {
|
|
138
130
|
if (tokens.idTokenPayload) {
|
|
139
131
|
const idTokenPayload = tokens.idTokenPayload;
|
|
140
132
|
// 2: The Issuer Identifier for the OpenID Provider (which is typically obtained during Discovery) MUST exactly match the value of the iss (issuer) Claim.
|
|
@@ -160,5 +152,4 @@ const isTokensOidcValid = (tokens, nonce, oidcServerConfiguration) => {
|
|
|
160
152
|
}
|
|
161
153
|
return { isValid: true, reason: '' };
|
|
162
154
|
};
|
|
163
|
-
exports.isTokensOidcValid = isTokensOidcValid;
|
|
164
155
|
//# sourceMappingURL=parseTokens.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseTokens.js","sourceRoot":"","sources":["../../src/oidc/vanilla/parseTokens.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parseTokens.js","sourceRoot":"","sources":["../../src/oidc/vanilla/parseTokens.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,23 +7,18 @@ 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 oidc_1 = __importDefault(require("./oidc"));
|
|
19
|
-
const parseTokens_1 = require("./parseTokens");
|
|
20
|
-
const timer_1 = __importDefault(require("./timer"));
|
|
21
|
-
function renewTokensAndStartTimerAsync(oidc, refreshToken, forceRefresh = false, extras = null) {
|
|
10
|
+
import { initSession } from './initSession';
|
|
11
|
+
import { initWorkerAsync } from './initWorker';
|
|
12
|
+
import Oidc from './oidc';
|
|
13
|
+
import { computeTimeLeft } from './parseTokens';
|
|
14
|
+
import timer from './timer';
|
|
15
|
+
export function renewTokensAndStartTimerAsync(oidc, refreshToken, forceRefresh = false, extras = null) {
|
|
22
16
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
17
|
const updateTokens = (tokens) => { oidc.tokens = tokens; };
|
|
24
18
|
const { tokens, status } = yield oidc.synchroniseTokensAsync(refreshToken, 0, forceRefresh, extras, updateTokens);
|
|
25
|
-
const serviceWorker = yield
|
|
19
|
+
const serviceWorker = yield initWorkerAsync(oidc.configuration.service_worker_relative_url, oidc.configurationName);
|
|
26
20
|
if (!serviceWorker) {
|
|
27
|
-
const session =
|
|
21
|
+
const session = initSession(oidc.configurationName, oidc.configuration.storage);
|
|
28
22
|
yield session.setTokens(oidc.tokens);
|
|
29
23
|
}
|
|
30
24
|
if (!oidc.tokens) {
|
|
@@ -32,20 +26,18 @@ function renewTokensAndStartTimerAsync(oidc, refreshToken, forceRefresh = false,
|
|
|
32
26
|
return;
|
|
33
27
|
}
|
|
34
28
|
if (oidc.timeoutId) {
|
|
35
|
-
oidc.timeoutId =
|
|
29
|
+
oidc.timeoutId = autoRenewTokens(oidc, tokens.refreshToken, oidc.tokens.expiresAt, extras);
|
|
36
30
|
}
|
|
37
31
|
return oidc.tokens;
|
|
38
32
|
});
|
|
39
33
|
}
|
|
40
|
-
|
|
41
|
-
const autoRenewTokens = (oidc, refreshToken, expiresAt, extras = null) => {
|
|
34
|
+
export const autoRenewTokens = (oidc, refreshToken, expiresAt, extras = null) => {
|
|
42
35
|
const refreshTimeBeforeTokensExpirationInSecond = oidc.configuration.refresh_time_before_tokens_expiration_in_second;
|
|
43
|
-
return
|
|
44
|
-
const timeLeft =
|
|
36
|
+
return timer.setTimeout(() => __awaiter(void 0, void 0, void 0, function* () {
|
|
37
|
+
const timeLeft = computeTimeLeft(refreshTimeBeforeTokensExpirationInSecond, expiresAt);
|
|
45
38
|
const timeInfo = { timeLeft };
|
|
46
|
-
oidc.publishEvent(
|
|
39
|
+
oidc.publishEvent(Oidc.eventNames.token_timer, timeInfo);
|
|
47
40
|
yield renewTokensAndStartTimerAsync(oidc, refreshToken, false, extras);
|
|
48
41
|
}), 1000);
|
|
49
42
|
};
|
|
50
|
-
exports.autoRenewTokens = autoRenewTokens;
|
|
51
43
|
//# sourceMappingURL=renewTokens.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renewTokens.js","sourceRoot":"","sources":["../../src/oidc/vanilla/renewTokens.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"renewTokens.js","sourceRoot":"","sources":["../../src/oidc/vanilla/renewTokens.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,MAAM,SAAS,CAAC;AAG5B,MAAM,UAAgB,6BAA6B,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,GAAG,KAAK,EAAE,SAAmB,IAAI;;QACjH,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3D,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;QAElH,MAAM,aAAa,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,2BAA2B,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACpH,IAAI,CAAC,aAAa,EAAE;YAChB,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAChF,MAAM,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACxC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACd,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAChC,OAAO;SACV;QAED,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,IAAI,CAAC,SAAS,GAAG,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;SAC9F;QACD,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,SAAmB,IAAI,EAAE,EAAE;IACtF,MAAM,yCAAyC,GAAG,IAAI,CAAC,aAAa,CAAC,+CAA+C,CAAC;IACrH,OAAO,KAAK,CAAC,UAAU,CAAC,GAAS,EAAE;QAC/B,MAAM,QAAQ,GAAG,eAAe,CAAC,yCAAyC,EAAE,SAAS,CAAC,CAAC;QACvF,MAAM,QAAQ,GAAG,EAAE,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACzD,MAAM,6BAA6B,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC3E,CAAC,CAAA,EAAE,IAAI,CAAC,CAAC;AACb,CAAC,CAAC"}
|
package/dist/vanilla/requests.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,29 +7,26 @@ 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
|
-
const oidc_1 = require("./oidc");
|
|
16
|
-
const parseTokens_1 = require("./parseTokens");
|
|
10
|
+
import { getFromCache, setCache } from './cache';
|
|
11
|
+
import { deriveChallengeAsync, generateRandom } from './crypto';
|
|
12
|
+
import { OidcAuthorizationServiceConfiguration } from './oidc';
|
|
13
|
+
import { parseOriginalTokens } from './parseTokens';
|
|
17
14
|
const oneHourSecond = 60 * 60;
|
|
18
|
-
const fetchFromIssuer = (openIdIssuerUrl, timeCacheSecond = oneHourSecond, storage = window.sessionStorage) => __awaiter(void 0, void 0, void 0, function* () {
|
|
15
|
+
export const fetchFromIssuer = (openIdIssuerUrl, timeCacheSecond = oneHourSecond, storage = window.sessionStorage) => __awaiter(void 0, void 0, void 0, function* () {
|
|
19
16
|
const fullUrl = `${openIdIssuerUrl}/.well-known/openid-configuration`;
|
|
20
17
|
const localStorageKey = `oidc.server:${openIdIssuerUrl}`;
|
|
21
|
-
const data =
|
|
18
|
+
const data = getFromCache(localStorageKey, storage, timeCacheSecond);
|
|
22
19
|
if (data) {
|
|
23
|
-
return new
|
|
20
|
+
return new OidcAuthorizationServiceConfiguration(data);
|
|
24
21
|
}
|
|
25
22
|
const response = yield fetch(fullUrl);
|
|
26
23
|
if (response.status !== 200) {
|
|
27
24
|
return null;
|
|
28
25
|
}
|
|
29
26
|
const result = yield response.json();
|
|
30
|
-
|
|
31
|
-
return new
|
|
27
|
+
setCache(localStorageKey, result, storage);
|
|
28
|
+
return new OidcAuthorizationServiceConfiguration(result);
|
|
32
29
|
});
|
|
33
|
-
exports.fetchFromIssuer = fetchFromIssuer;
|
|
34
30
|
const internalFetch = (url, headers, timeoutMs = 10000, numberRetry = 0) => __awaiter(void 0, void 0, void 0, function* () {
|
|
35
31
|
let response;
|
|
36
32
|
try {
|
|
@@ -55,11 +51,11 @@ const internalFetch = (url, headers, timeoutMs = 10000, numberRetry = 0) => __aw
|
|
|
55
51
|
}
|
|
56
52
|
return response;
|
|
57
53
|
});
|
|
58
|
-
|
|
54
|
+
export const TOKEN_TYPE = {
|
|
59
55
|
refresh_token: 'refresh_token',
|
|
60
56
|
access_token: 'access_token',
|
|
61
57
|
};
|
|
62
|
-
const performRevocationRequestAsync = (url, token, token_type =
|
|
58
|
+
export const performRevocationRequestAsync = (url, token, token_type = TOKEN_TYPE.refresh_token, client_id, timeoutMs = 10000) => __awaiter(void 0, void 0, void 0, function* () {
|
|
63
59
|
const details = {
|
|
64
60
|
token,
|
|
65
61
|
token_type_hint: token_type,
|
|
@@ -86,8 +82,7 @@ const performRevocationRequestAsync = (url, token, token_type = exports.TOKEN_TY
|
|
|
86
82
|
success: true,
|
|
87
83
|
};
|
|
88
84
|
});
|
|
89
|
-
|
|
90
|
-
const performTokenRequestAsync = (url, details, extras, oldTokens, tokenRenewMode, timeoutMs = 10000) => __awaiter(void 0, void 0, void 0, function* () {
|
|
85
|
+
export const performTokenRequestAsync = (url, details, extras, oldTokens, tokenRenewMode, timeoutMs = 10000) => __awaiter(void 0, void 0, void 0, function* () {
|
|
91
86
|
for (const [key, value] of Object.entries(extras)) {
|
|
92
87
|
if (details[key] === undefined) {
|
|
93
88
|
details[key] = value;
|
|
@@ -113,14 +108,13 @@ const performTokenRequestAsync = (url, details, extras, oldTokens, tokenRenewMod
|
|
|
113
108
|
const tokens = yield response.json();
|
|
114
109
|
return {
|
|
115
110
|
success: true,
|
|
116
|
-
data:
|
|
111
|
+
data: parseOriginalTokens(tokens, oldTokens, tokenRenewMode),
|
|
117
112
|
};
|
|
118
113
|
});
|
|
119
|
-
|
|
120
|
-
const performAuthorizationRequestAsync = (storage) => (url, extras) => __awaiter(void 0, void 0, void 0, function* () {
|
|
114
|
+
export const performAuthorizationRequestAsync = (storage) => (url, extras) => __awaiter(void 0, void 0, void 0, function* () {
|
|
121
115
|
extras = extras ? Object.assign({}, extras) : {};
|
|
122
|
-
const codeVerifier =
|
|
123
|
-
const codeChallenge = yield
|
|
116
|
+
const codeVerifier = generateRandom(128);
|
|
117
|
+
const codeChallenge = yield deriveChallengeAsync(codeVerifier);
|
|
124
118
|
yield storage.setCodeVerifierAsync(codeVerifier);
|
|
125
119
|
yield storage.setStateAsync(extras.state);
|
|
126
120
|
extras.code_challenge = codeChallenge;
|
|
@@ -139,8 +133,7 @@ const performAuthorizationRequestAsync = (storage) => (url, extras) => __awaiter
|
|
|
139
133
|
}
|
|
140
134
|
window.location.href = `${url}${queryString}`;
|
|
141
135
|
});
|
|
142
|
-
|
|
143
|
-
const performFirstTokenRequestAsync = (storage) => (url, extras, tokenRenewMode, timeoutMs = 10000) => __awaiter(void 0, void 0, void 0, function* () {
|
|
136
|
+
export const performFirstTokenRequestAsync = (storage) => (url, extras, tokenRenewMode, timeoutMs = 10000) => __awaiter(void 0, void 0, void 0, function* () {
|
|
144
137
|
extras = extras ? Object.assign({}, extras) : {};
|
|
145
138
|
extras.code_verifier = yield storage.getCodeVerifierAsync();
|
|
146
139
|
const formBody = [];
|
|
@@ -166,9 +159,8 @@ const performFirstTokenRequestAsync = (storage) => (url, extras, tokenRenewMode,
|
|
|
166
159
|
success: true,
|
|
167
160
|
data: {
|
|
168
161
|
state: extras.state,
|
|
169
|
-
tokens:
|
|
162
|
+
tokens: parseOriginalTokens(tokens, null, tokenRenewMode),
|
|
170
163
|
},
|
|
171
164
|
};
|
|
172
165
|
});
|
|
173
|
-
exports.performFirstTokenRequestAsync = performFirstTokenRequestAsync;
|
|
174
166
|
//# sourceMappingURL=requests.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requests.js","sourceRoot":"","sources":["../../src/oidc/vanilla/requests.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"requests.js","sourceRoot":"","sources":["../../src/oidc/vanilla/requests.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getParseQueryStringFromLocation = exports.getPath = exports.getLocation = void 0;
|
|
4
|
-
const getLocation = (href) => {
|
|
1
|
+
export const getLocation = (href) => {
|
|
5
2
|
const match = href.match(
|
|
6
3
|
// eslint-disable-next-line no-useless-escape
|
|
7
4
|
/^([a-z][\w-]+\:)\/\/(([^:\/?#]*)(?:\:([0-9]+))?)([\/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/);
|
|
@@ -31,9 +28,8 @@ const getLocation = (href) => {
|
|
|
31
28
|
hash,
|
|
32
29
|
});
|
|
33
30
|
};
|
|
34
|
-
|
|
35
|
-
const
|
|
36
|
-
const location = (0, exports.getLocation)(href);
|
|
31
|
+
export const getPath = (href) => {
|
|
32
|
+
const location = getLocation(href);
|
|
37
33
|
let { path } = location;
|
|
38
34
|
if (path.endsWith('/')) {
|
|
39
35
|
path = path.slice(0, -1);
|
|
@@ -47,13 +43,11 @@ const getPath = (href) => {
|
|
|
47
43
|
}
|
|
48
44
|
return path;
|
|
49
45
|
};
|
|
50
|
-
|
|
51
|
-
const
|
|
52
|
-
const location = (0, exports.getLocation)(href);
|
|
46
|
+
export const getParseQueryStringFromLocation = (href) => {
|
|
47
|
+
const location = getLocation(href);
|
|
53
48
|
const { search } = location;
|
|
54
49
|
return parseQueryString(search);
|
|
55
50
|
};
|
|
56
|
-
exports.getParseQueryStringFromLocation = getParseQueryStringFromLocation;
|
|
57
51
|
const parseQueryString = (queryString) => {
|
|
58
52
|
const params = {};
|
|
59
53
|
let temp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-utils.js","sourceRoot":"","sources":["../../src/oidc/vanilla/route-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"route-utils.js","sourceRoot":"","sources":["../../src/oidc/vanilla/route-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,21 +7,16 @@ 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
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.defaultSilentLoginAsync = exports._silentLoginAsync = void 0;
|
|
16
|
-
const events_1 = require("./events");
|
|
17
|
-
const renewTokens_1 = require("./renewTokens");
|
|
18
|
-
const timer_1 = __importDefault(require("./timer"));
|
|
10
|
+
import { eventNames } from './events';
|
|
11
|
+
import { autoRenewTokens } from './renewTokens';
|
|
12
|
+
import timer from './timer';
|
|
19
13
|
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
20
|
-
const _silentLoginAsync = (configurationName, configuration, publishEvent) => (extras = null, state = null, scope = null) => {
|
|
14
|
+
export const _silentLoginAsync = (configurationName, configuration, publishEvent) => (extras = null, state = null, scope = null) => {
|
|
21
15
|
if (!configuration.silent_redirect_uri || !configuration.silent_login_uri) {
|
|
22
16
|
return Promise.resolve(null);
|
|
23
17
|
}
|
|
24
18
|
try {
|
|
25
|
-
publishEvent(
|
|
19
|
+
publishEvent(eventNames.silentLoginAsync_begin, {});
|
|
26
20
|
let queries = '';
|
|
27
21
|
if (state) {
|
|
28
22
|
if (extras == null) {
|
|
@@ -68,14 +62,14 @@ const _silentLoginAsync = (configurationName, configuration, publishEvent) => (e
|
|
|
68
62
|
if (!isResolved) {
|
|
69
63
|
if (data.startsWith(key)) {
|
|
70
64
|
const result = JSON.parse(e.data.replace(key, ''));
|
|
71
|
-
publishEvent(
|
|
65
|
+
publishEvent(eventNames.silentLoginAsync_end, {});
|
|
72
66
|
iframe.remove();
|
|
73
67
|
isResolved = true;
|
|
74
68
|
resolve(result);
|
|
75
69
|
}
|
|
76
70
|
else if (data.startsWith(key_error)) {
|
|
77
71
|
const result = JSON.parse(e.data.replace(key_error, ''));
|
|
78
|
-
publishEvent(
|
|
72
|
+
publishEvent(eventNames.silentLoginAsync_error, result);
|
|
79
73
|
iframe.remove();
|
|
80
74
|
isResolved = true;
|
|
81
75
|
reject(new Error('oidc_' + result.error));
|
|
@@ -87,7 +81,7 @@ const _silentLoginAsync = (configurationName, configuration, publishEvent) => (e
|
|
|
87
81
|
const silentSigninTimeout = configuration.silent_login_timeout;
|
|
88
82
|
setTimeout(() => {
|
|
89
83
|
if (!isResolved) {
|
|
90
|
-
publishEvent(
|
|
84
|
+
publishEvent(eventNames.silentLoginAsync_error, { reason: 'timeout' });
|
|
91
85
|
iframe.remove();
|
|
92
86
|
isResolved = true;
|
|
93
87
|
reject(new Error('timeout'));
|
|
@@ -96,26 +90,25 @@ const _silentLoginAsync = (configurationName, configuration, publishEvent) => (e
|
|
|
96
90
|
}
|
|
97
91
|
catch (e) {
|
|
98
92
|
iframe.remove();
|
|
99
|
-
publishEvent(
|
|
93
|
+
publishEvent(eventNames.silentLoginAsync_error, e);
|
|
100
94
|
reject(e);
|
|
101
95
|
}
|
|
102
96
|
});
|
|
103
97
|
}
|
|
104
98
|
catch (e) {
|
|
105
|
-
publishEvent(
|
|
99
|
+
publishEvent(eventNames.silentLoginAsync_error, e);
|
|
106
100
|
throw e;
|
|
107
101
|
}
|
|
108
102
|
};
|
|
109
|
-
exports._silentLoginAsync = _silentLoginAsync;
|
|
110
103
|
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
111
|
-
const defaultSilentLoginAsync = (window, configurationName, configuration, publishEvent, oidc) => (extras = null, scope = undefined) => {
|
|
104
|
+
export const defaultSilentLoginAsync = (window, configurationName, configuration, publishEvent, oidc) => (extras = null, scope = undefined) => {
|
|
112
105
|
extras = Object.assign({}, extras);
|
|
113
106
|
const silentLoginAsync = (extras, state, scope) => {
|
|
114
|
-
return
|
|
107
|
+
return _silentLoginAsync(configurationName, configuration, publishEvent.bind(oidc))(extras, state, scope);
|
|
115
108
|
};
|
|
116
109
|
const loginLocalAsync = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
117
110
|
if (oidc.timeoutId) {
|
|
118
|
-
|
|
111
|
+
timer.clearTimeout(oidc.timeoutId);
|
|
119
112
|
}
|
|
120
113
|
let state;
|
|
121
114
|
if (extras && 'state' in extras) {
|
|
@@ -127,9 +120,9 @@ const defaultSilentLoginAsync = (window, configurationName, configuration, publi
|
|
|
127
120
|
const silentResult = yield silentLoginAsync(Object.assign(Object.assign({}, extraFinal), { prompt: 'none' }), state, scope);
|
|
128
121
|
if (silentResult) {
|
|
129
122
|
oidc.tokens = silentResult.tokens;
|
|
130
|
-
publishEvent(
|
|
123
|
+
publishEvent(eventNames.token_aquired, {});
|
|
131
124
|
// @ts-ignore
|
|
132
|
-
oidc.timeoutId =
|
|
125
|
+
oidc.timeoutId = autoRenewTokens(oidc, oidc.tokens.refreshToken, oidc.tokens.expiresAt, extras);
|
|
133
126
|
return {};
|
|
134
127
|
}
|
|
135
128
|
}
|
|
@@ -139,6 +132,5 @@ const defaultSilentLoginAsync = (window, configurationName, configuration, publi
|
|
|
139
132
|
});
|
|
140
133
|
return loginLocalAsync();
|
|
141
134
|
};
|
|
142
|
-
|
|
143
|
-
exports.default = exports.defaultSilentLoginAsync;
|
|
135
|
+
export default defaultSilentLoginAsync;
|
|
144
136
|
//# sourceMappingURL=silentLogin.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"silentLogin.js","sourceRoot":"","sources":["../../src/oidc/vanilla/silentLogin.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"silentLogin.js","sourceRoot":"","sources":["../../src/oidc/vanilla/silentLogin.ts"],"names":[],"mappings":"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"}
|
package/dist/vanilla/timer.js
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
1
|
const timer = (function () {
|
|
4
2
|
const workerPort = (function () {
|
|
5
3
|
let worker;
|
|
@@ -139,5 +137,5 @@ const timer = (function () {
|
|
|
139
137
|
clearInterval: clearIntervalWorker,
|
|
140
138
|
};
|
|
141
139
|
}());
|
|
142
|
-
|
|
140
|
+
export default timer;
|
|
143
141
|
//# sourceMappingURL=timer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timer.js","sourceRoot":"","sources":["../../src/oidc/vanilla/timer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"timer.js","sourceRoot":"","sources":["../../src/oidc/vanilla/timer.ts"],"names":[],"mappings":"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"}
|
package/dist/vanilla/types.js
CHANGED
package/dist/vanilla/user.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,11 +7,9 @@ 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
|
-
const
|
|
14
|
-
const parseTokens_1 = require("./parseTokens");
|
|
15
|
-
const userInfoAsync = (oidc) => __awaiter(void 0, void 0, void 0, function* () {
|
|
10
|
+
import { sleepAsync } from './initWorker';
|
|
11
|
+
import { isTokensValid } from './parseTokens';
|
|
12
|
+
export const userInfoAsync = (oidc) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16
13
|
if (oidc.userInfo != null) {
|
|
17
14
|
return oidc.userInfo;
|
|
18
15
|
}
|
|
@@ -24,8 +21,8 @@ const userInfoAsync = (oidc) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
24
21
|
return null;
|
|
25
22
|
}
|
|
26
23
|
// We wait the synchronisation before making a request
|
|
27
|
-
while (oidc.tokens && !
|
|
28
|
-
yield
|
|
24
|
+
while (oidc.tokens && !isTokensValid(oidc.tokens)) {
|
|
25
|
+
yield sleepAsync(200);
|
|
29
26
|
}
|
|
30
27
|
const oidcServerConfiguration = yield oidc.initAsync(oidc.configuration.authority, oidc.configuration.authority_configuration);
|
|
31
28
|
const url = oidcServerConfiguration.userInfoEndpoint;
|
|
@@ -44,5 +41,4 @@ const userInfoAsync = (oidc) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
44
41
|
oidc.userInfo = userInfo;
|
|
45
42
|
return userInfo;
|
|
46
43
|
});
|
|
47
|
-
exports.userInfoAsync = userInfoAsync;
|
|
48
44
|
//# sourceMappingURL=user.js.map
|
package/dist/vanilla/user.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/oidc/vanilla/user.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/oidc/vanilla/user.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,MAAM,CAAC,MAAM,aAAa,GAAG,CAAO,IAAI,EAAE,EAAE;IACxC,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,EAAE;QACvB,OAAO,IAAI,CAAC,QAAQ,CAAC;KACxB;IACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;QACd,OAAO,IAAI,CAAC;KACf;IACD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;IAC5C,IAAI,CAAC,WAAW,EAAE;QACd,OAAO,IAAI,CAAC;KACf;IAED,sDAAsD;IACtD,OAAO,IAAI,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QAC/C,MAAM,UAAU,CAAC,GAAG,CAAC,CAAC;KACzB;IAED,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAC;IAC/H,MAAM,GAAG,GAAG,uBAAuB,CAAC,gBAAgB,CAAC;IACrD,MAAM,aAAa,GAAG,CAAO,WAAW,EAAE,EAAE;QACxC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YACzB,OAAO,EAAE;gBACL,aAAa,EAAE,UAAU,WAAW,EAAE;aACzC;SACJ,CAAC,CAAC;QAEH,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE;YACpB,OAAO,IAAI,CAAC;SACf;QAED,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC;IACtB,CAAC,CAAA,CAAC;IACF,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,WAAW,CAAC,CAAC;IAClD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IACzB,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAA,CAAC"}
|