oidc-spa 6.15.1 → 7.0.0
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/README.md +12 -13
- package/core/Oidc.d.ts +24 -12
- package/core/createOidc.d.ts +15 -30
- package/core/createOidc.js +131 -123
- package/core/createOidc.js.map +1 -1
- package/core/handleOidcCallback.js +2 -29
- package/core/handleOidcCallback.js.map +1 -1
- package/core/loginOrGoToAuthServer.d.ts +1 -2
- package/core/loginOrGoToAuthServer.js +10 -10
- package/core/loginOrGoToAuthServer.js.map +1 -1
- package/core/loginSilent.d.ts +1 -1
- package/core/loginSilent.js +4 -4
- package/core/loginSilent.js.map +1 -1
- package/core/oidcClientTsUserToTokens.d.ts +1 -2
- package/core/oidcClientTsUserToTokens.js +93 -58
- package/core/oidcClientTsUserToTokens.js.map +1 -1
- package/mock/oidc.d.ts +1 -1
- package/mock/oidc.js +29 -19
- package/mock/oidc.js.map +1 -1
- package/package.json +1 -5
- package/react/react.d.ts +1 -7
- package/react/react.js +8 -59
- package/react/react.js.map +1 -1
- package/src/core/Oidc.ts +27 -14
- package/src/core/createOidc.ts +121 -119
- package/src/core/handleOidcCallback.ts +2 -55
- package/src/core/loginOrGoToAuthServer.ts +10 -11
- package/src/core/loginSilent.ts +4 -4
- package/src/core/oidcClientTsUserToTokens.ts +129 -82
- package/src/mock/oidc.ts +16 -6
- package/src/react/react.tsx +11 -72
- package/src/tools/readExpirationTimeInJwt.ts +4 -5
- package/tools/readExpirationTimeInJwt.js +4 -4
- package/tools/readExpirationTimeInJwt.js.map +1 -1
- package/vendor/frontend/oidc-client-ts-and-jwt-decode.js +1 -1
- package/core/debug966975.d.ts +0 -7
- package/core/debug966975.js +0 -88
- package/core/debug966975.js.map +0 -1
- package/src/core/debug966975.ts +0 -85
|
@@ -53,52 +53,42 @@ var StateData_1 = require("./StateData");
|
|
|
53
53
|
var tsafe_1 = require("../vendor/frontend/tsafe");
|
|
54
54
|
var initialLocationHref_1 = require("./initialLocationHref");
|
|
55
55
|
var trustedFetch_1 = require("./trustedFetch");
|
|
56
|
-
var debug966975_1 = require("./debug966975");
|
|
57
56
|
(0, trustedFetch_1.captureFetch)();
|
|
58
57
|
var globalContext = {
|
|
59
58
|
previousCall: (0, tsafe_1.id)(undefined)
|
|
60
59
|
};
|
|
61
|
-
debug966975_1.debug966975.log("=================== Evaluating the handleOidcCallback file, isInIframe: ".concat(window.self !== window.top ? "true" : "false", ", location.href: ").concat(initialLocationHref_1.initialLocationHref));
|
|
62
60
|
function handleOidcCallback() {
|
|
63
61
|
if (globalContext.previousCall !== undefined) {
|
|
64
|
-
debug966975_1.debug966975.log("handleOidcCallback() call, it has been called previously ".concat(JSON.stringify(globalContext.previousCall)));
|
|
65
62
|
return globalContext.previousCall;
|
|
66
63
|
}
|
|
67
64
|
return (globalContext.previousCall = handleOidcCallback_nonMemoized());
|
|
68
65
|
}
|
|
69
66
|
function handleOidcCallback_nonMemoized() {
|
|
70
67
|
var e_1, _a;
|
|
71
|
-
debug966975_1.debug966975.log("In handleOidcCallback_nonMemoized()");
|
|
72
68
|
var location_urlObj = new URL(initialLocationHref_1.initialLocationHref);
|
|
73
69
|
var stateQueryParamValue = (function () {
|
|
74
70
|
var stateQueryParamValue = location_urlObj.searchParams.get("state");
|
|
75
71
|
if (stateQueryParamValue === null) {
|
|
76
|
-
debug966975_1.debug966975.log("No state in url");
|
|
77
72
|
return undefined;
|
|
78
73
|
}
|
|
79
74
|
if (!(0, StateData_1.getIsStatQueryParamValue)({ maybeStateQueryParamValue: stateQueryParamValue })) {
|
|
80
|
-
debug966975_1.debug966975.log("State query param value ".concat(stateQueryParamValue, " is malformed"));
|
|
81
75
|
return undefined;
|
|
82
76
|
}
|
|
83
77
|
if (location_urlObj.searchParams.get("client_id") !== null &&
|
|
84
78
|
location_urlObj.searchParams.get("response_type") !== null &&
|
|
85
79
|
location_urlObj.searchParams.get("redirect_uri") !== null) {
|
|
86
|
-
debug966975_1.debug966975.log("NOTE: We are probably in a Keycloakify theme and oidc-spa was loaded by mistake.");
|
|
87
80
|
// NOTE: We are probably in a Keycloakify theme and oidc-spa was loaded by mistake.
|
|
88
81
|
return undefined;
|
|
89
82
|
}
|
|
90
83
|
return stateQueryParamValue;
|
|
91
84
|
})();
|
|
92
|
-
debug966975_1.debug966975.log("state query param value ".concat(stateQueryParamValue !== null && stateQueryParamValue !== void 0 ? stateQueryParamValue : "undefined"));
|
|
93
85
|
if (stateQueryParamValue === undefined) {
|
|
94
86
|
var backForwardTracker = readBackForwardTracker();
|
|
95
|
-
debug966975_1.debug966975.log("backForwardTracker: ".concat(JSON.stringify(backForwardTracker)));
|
|
96
87
|
if (backForwardTracker !== undefined) {
|
|
97
88
|
writeBackForwardTracker({
|
|
98
89
|
backForwardTracker: __assign(__assign({}, backForwardTracker), { hasExitedCallback: true })
|
|
99
90
|
});
|
|
100
91
|
}
|
|
101
|
-
debug966975_1.debug966975.log("returning isHandled false");
|
|
102
92
|
return { isHandled: false };
|
|
103
93
|
}
|
|
104
94
|
var isHandled = true;
|
|
@@ -107,7 +97,6 @@ function handleOidcCallback_nonMemoized() {
|
|
|
107
97
|
console.error = function () { };
|
|
108
98
|
console.debug = function () { };
|
|
109
99
|
var stateData = (0, StateData_1.getStateData)({ stateQueryParamValue: stateQueryParamValue });
|
|
110
|
-
debug966975_1.debug966975.log("stateData: ".concat(JSON.stringify(stateData)));
|
|
111
100
|
if (stateData === undefined ||
|
|
112
101
|
(stateData.context === "redirect" && stateData.hasBeenProcessedByCallback)) {
|
|
113
102
|
var historyMethod_1 = (function () {
|
|
@@ -125,7 +114,6 @@ function handleOidcCallback_nonMemoized() {
|
|
|
125
114
|
return "back";
|
|
126
115
|
}
|
|
127
116
|
})();
|
|
128
|
-
debug966975_1.debug966975.log("historyMethod: ".concat(historyMethod_1));
|
|
129
117
|
writeBackForwardTracker({
|
|
130
118
|
backForwardTracker: {
|
|
131
119
|
previousHistoryMethod: historyMethod_1,
|
|
@@ -133,7 +121,6 @@ function handleOidcCallback_nonMemoized() {
|
|
|
133
121
|
}
|
|
134
122
|
});
|
|
135
123
|
setTimeout(function () {
|
|
136
|
-
debug966975_1.debug966975.log("(callback 0) Calling window.history.".concat(historyMethod_1, "()"));
|
|
137
124
|
reloadOnBfCacheNavigation();
|
|
138
125
|
window.history[historyMethod_1]();
|
|
139
126
|
// NOTE: This is a "better than nothing" approach.
|
|
@@ -145,7 +132,6 @@ function handleOidcCallback_nonMemoized() {
|
|
|
145
132
|
window.location.href = "".concat(protocol, "//").concat(host).concat(pathname).concat(hash);
|
|
146
133
|
}, 350);
|
|
147
134
|
}, 0);
|
|
148
|
-
debug966975_1.debug966975.log("returning isHandled: ".concat(isHandled ? "true" : "false"));
|
|
149
135
|
return { isHandled: isHandled };
|
|
150
136
|
}
|
|
151
137
|
var authResponse = { state: "" };
|
|
@@ -163,11 +149,9 @@ function handleOidcCallback_nonMemoized() {
|
|
|
163
149
|
finally { if (e_1) throw e_1.error; }
|
|
164
150
|
}
|
|
165
151
|
(0, tsafe_1.assert)(authResponse.state !== "", "063965");
|
|
166
|
-
debug966975_1.debug966975.log("authResponse: ".concat(JSON.stringify(authResponse)));
|
|
167
152
|
switch (stateData.context) {
|
|
168
153
|
case "iframe":
|
|
169
154
|
setTimeout(function () {
|
|
170
|
-
debug966975_1.debug966975.log("(callback 0) posting message to parent");
|
|
171
155
|
parent.postMessage(authResponse, location.origin);
|
|
172
156
|
}, 0);
|
|
173
157
|
break;
|
|
@@ -185,12 +169,10 @@ function handleOidcCallback_nonMemoized() {
|
|
|
185
169
|
}
|
|
186
170
|
return stateData.redirectUrl;
|
|
187
171
|
})();
|
|
188
|
-
debug966975_1.debug966975.log("(callback 0) location.href = \"".concat(href, "\";"));
|
|
189
172
|
location.href = href;
|
|
190
173
|
}, 0);
|
|
191
174
|
break;
|
|
192
175
|
}
|
|
193
|
-
debug966975_1.debug966975.log("Returning isHandled: ".concat(isHandled ? "true" : "false"));
|
|
194
176
|
return { isHandled: isHandled };
|
|
195
177
|
}
|
|
196
178
|
var _a = (function () {
|
|
@@ -215,22 +197,15 @@ var _a = (function () {
|
|
|
215
197
|
function retrieveRedirectAuthResponseAndStateData(params) {
|
|
216
198
|
var e_2, _a;
|
|
217
199
|
var configId = params.configId;
|
|
218
|
-
debug966975_1.debug966975.log(">>> In retrieveRedirectAuthResponseAndStateData(".concat(JSON.stringify({ configId: configId }), ")"));
|
|
219
200
|
var authResponses = readRedirectAuthResponses();
|
|
220
|
-
debug966975_1.debug966975.log("authResponses: ".concat(JSON.stringify(authResponses)));
|
|
221
201
|
var authResponseAndStateData = undefined;
|
|
222
202
|
try {
|
|
223
203
|
for (var _b = __values(__spreadArray([], __read(authResponses), false)), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
224
204
|
var authResponse = _c.value;
|
|
225
|
-
debug966975_1.debug966975.log("authResponse: ".concat(JSON.stringify(authResponse)));
|
|
226
205
|
var stateData = (0, StateData_1.getStateData)({ stateQueryParamValue: authResponse.state });
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
(0, tsafe_1.assert)(stateData !== undefined, "966975");
|
|
230
|
-
}
|
|
231
|
-
catch (_d) {
|
|
206
|
+
if (stateData === undefined) {
|
|
207
|
+
// NOTE: We do not understand how this can happen but it can.
|
|
232
208
|
authResponses.splice(authResponses.indexOf(authResponse), 1);
|
|
233
|
-
debug966975_1.debug966975.report();
|
|
234
209
|
continue;
|
|
235
210
|
}
|
|
236
211
|
(0, tsafe_1.assert)(stateData.context === "redirect", "474728");
|
|
@@ -249,10 +224,8 @@ function retrieveRedirectAuthResponseAndStateData(params) {
|
|
|
249
224
|
finally { if (e_2) throw e_2.error; }
|
|
250
225
|
}
|
|
251
226
|
if (authResponseAndStateData !== undefined) {
|
|
252
|
-
debug966975_1.debug966975.log("writeRedirectAuthResponses(".concat(JSON.stringify({ authResponses: authResponses }), ")"));
|
|
253
227
|
writeRedirectAuthResponses({ authResponses: authResponses });
|
|
254
228
|
}
|
|
255
|
-
debug966975_1.debug966975.log("Returning ".concat(JSON.stringify({ authResponseAndStateData: authResponseAndStateData }), " <<<<<<<<<"));
|
|
256
229
|
return authResponseAndStateData;
|
|
257
230
|
}
|
|
258
231
|
function reloadOnBfCacheNavigation() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleOidcCallback.js","sourceRoot":"","sources":["../src/core/handleOidcCallback.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"handleOidcCallback.js","sourceRoot":"","sources":["../src/core/handleOidcCallback.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,8 +22,7 @@ export declare function getPrSafelyRestoredFromBfCacheAfterLoginBackNavigation()
|
|
|
22
22
|
export declare function createLoginOrGoToAuthServer(params: {
|
|
23
23
|
configId: string;
|
|
24
24
|
oidcClientTsUserManager: OidcClientTsUserManager;
|
|
25
|
-
transformUrlBeforeRedirect: ((
|
|
26
|
-
transformUrlBeforeRedirect_next: ((params: {
|
|
25
|
+
transformUrlBeforeRedirect: ((params: {
|
|
27
26
|
authorizationUrl: string;
|
|
28
27
|
isSilent: boolean;
|
|
29
28
|
}) => string) | undefined;
|
|
@@ -104,16 +104,16 @@ function getPrSafelyRestoredFromBfCacheAfterLoginBackNavigation() {
|
|
|
104
104
|
return dOut.pr;
|
|
105
105
|
}
|
|
106
106
|
function createLoginOrGoToAuthServer(params) {
|
|
107
|
-
var configId = params.configId, oidcClientTsUserManager = params.oidcClientTsUserManager, transformUrlBeforeRedirect = params.transformUrlBeforeRedirect,
|
|
107
|
+
var configId = params.configId, oidcClientTsUserManager = params.oidcClientTsUserManager, transformUrlBeforeRedirect = params.transformUrlBeforeRedirect, getExtraQueryParams = params.getExtraQueryParams, getExtraTokenParams = params.getExtraTokenParams, homeUrl = params.homeUrl, evtIsUserLoggedIn = params.evtIsUserLoggedIn, log = params.log;
|
|
108
108
|
var LOCAL_STORAGE_KEY_TO_CLEAR_WHEN_USER_LOGGED_IN = "oidc-spa.login-redirect-initiated:".concat(configId);
|
|
109
109
|
var lastPublicUrl = undefined;
|
|
110
110
|
function loginOrGoToAuthServer(params) {
|
|
111
111
|
return __awaiter(this, void 0, void 0, function () {
|
|
112
|
-
var redirectUrl_params, extraQueryParams_local,
|
|
112
|
+
var redirectUrl_params, extraQueryParams_local, transformUrlBeforeRedirect_local, rest, dVisible_1, onVisible_1, callback_1, redirectUrl, stateData, isSilent, transformUrl_oidcClientTs, redirectMethod;
|
|
113
113
|
return __generator(this, function (_a) {
|
|
114
114
|
switch (_a.label) {
|
|
115
115
|
case 0:
|
|
116
|
-
redirectUrl_params = params.redirectUrl, extraQueryParams_local = params.extraQueryParams_local,
|
|
116
|
+
redirectUrl_params = params.redirectUrl, extraQueryParams_local = params.extraQueryParams_local, transformUrlBeforeRedirect_local = params.transformUrlBeforeRedirect_local, rest = __rest(params, ["redirectUrl", "extraQueryParams_local", "transformUrlBeforeRedirect_local"]);
|
|
117
117
|
log === null || log === void 0 ? void 0 : log("Calling loginOrGoToAuthServer ".concat(JSON.stringify(params, null, 2)));
|
|
118
118
|
if (rest.action !== "login") {
|
|
119
119
|
return [3 /*break*/, 3];
|
|
@@ -124,6 +124,7 @@ function createLoginOrGoToAuthServer(params) {
|
|
|
124
124
|
}
|
|
125
125
|
globalContext.evtHasLoginBeenCalled.current = true;
|
|
126
126
|
if (!(document.visibilityState !== "visible")) return [3 /*break*/, 2];
|
|
127
|
+
rest.interaction === "ensure no interaction";
|
|
127
128
|
dVisible_1 = new Deferred_1.Deferred();
|
|
128
129
|
onVisible_1 = function () {
|
|
129
130
|
if (document.visibilityState !== "visible") {
|
|
@@ -200,22 +201,21 @@ function createLoginOrGoToAuthServer(params) {
|
|
|
200
201
|
transformUrl_oidcClientTs = function (url) {
|
|
201
202
|
[
|
|
202
203
|
[
|
|
203
|
-
|
|
204
|
-
|
|
204
|
+
getExtraQueryParams,
|
|
205
|
+
transformUrlBeforeRedirect === undefined
|
|
205
206
|
? undefined
|
|
206
207
|
: function (url) {
|
|
207
|
-
return
|
|
208
|
+
return transformUrlBeforeRedirect({
|
|
208
209
|
isSilent: isSilent,
|
|
209
210
|
authorizationUrl: url
|
|
210
211
|
});
|
|
211
212
|
}
|
|
212
213
|
],
|
|
213
|
-
[
|
|
214
|
-
|
|
215
|
-
].forEach(function (_a, i) {
|
|
214
|
+
[extraQueryParams_local, transformUrlBeforeRedirect_local]
|
|
215
|
+
].forEach(function (_a, i, arr) {
|
|
216
216
|
var e_1, _b, e_2, _c;
|
|
217
217
|
var _d = __read(_a, 2), extraQueryParamsMaybeGetter = _d[0], transformUrlBeforeRedirect = _d[1];
|
|
218
|
-
var url_before = i !==
|
|
218
|
+
var url_before = i !== arr.length - 1 ? undefined : url;
|
|
219
219
|
add_extra_query_params: {
|
|
220
220
|
if (extraQueryParamsMaybeGetter === undefined) {
|
|
221
221
|
break add_extra_query_params;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loginOrGoToAuthServer.js","sourceRoot":"","sources":["../src/core/loginOrGoToAuthServer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqCA,wHAWC;AAED,
|
|
1
|
+
{"version":3,"file":"loginOrGoToAuthServer.js","sourceRoot":"","sources":["../src/core/loginOrGoToAuthServer.ts"],"names":[],"mappings":"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"}
|
package/core/loginSilent.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ export declare function loginSilent(params: {
|
|
|
15
15
|
oidcClientTsUserManager: OidcClientTsUserManager;
|
|
16
16
|
stateQueryParamValue_instance: string;
|
|
17
17
|
configId: string;
|
|
18
|
-
|
|
18
|
+
transformUrlBeforeRedirect: ((params: {
|
|
19
19
|
authorizationUrl: string;
|
|
20
20
|
isSilent: true;
|
|
21
21
|
}) => string) | undefined;
|
package/core/loginSilent.js
CHANGED
|
@@ -73,10 +73,10 @@ var AuthResponse_1 = require("./AuthResponse");
|
|
|
73
73
|
var urlSearchParams_1 = require("../tools/urlSearchParams");
|
|
74
74
|
function loginSilent(params) {
|
|
75
75
|
return __awaiter(this, void 0, void 0, function () {
|
|
76
|
-
var oidcClientTsUserManager, stateQueryParamValue_instance, configId,
|
|
76
|
+
var oidcClientTsUserManager, stateQueryParamValue_instance, configId, transformUrlBeforeRedirect, getExtraQueryParams, getExtraTokenParams, autoLogin, dResult, timeoutDelayMs, timeout, listener, transformUrl_oidcClientTs;
|
|
77
77
|
var _this = this;
|
|
78
78
|
return __generator(this, function (_a) {
|
|
79
|
-
oidcClientTsUserManager = params.oidcClientTsUserManager, stateQueryParamValue_instance = params.stateQueryParamValue_instance, configId = params.configId,
|
|
79
|
+
oidcClientTsUserManager = params.oidcClientTsUserManager, stateQueryParamValue_instance = params.stateQueryParamValue_instance, configId = params.configId, transformUrlBeforeRedirect = params.transformUrlBeforeRedirect, getExtraQueryParams = params.getExtraQueryParams, getExtraTokenParams = params.getExtraTokenParams, autoLogin = params.autoLogin;
|
|
80
80
|
dResult = new Deferred_1.Deferred();
|
|
81
81
|
timeoutDelayMs = (function () {
|
|
82
82
|
if (autoLogin) {
|
|
@@ -148,10 +148,10 @@ function loginSilent(params) {
|
|
|
148
148
|
}
|
|
149
149
|
}
|
|
150
150
|
apply_transform_url: {
|
|
151
|
-
if (
|
|
151
|
+
if (transformUrlBeforeRedirect === undefined) {
|
|
152
152
|
break apply_transform_url;
|
|
153
153
|
}
|
|
154
|
-
url =
|
|
154
|
+
url = transformUrlBeforeRedirect({ authorizationUrl: url, isSilent: true });
|
|
155
155
|
}
|
|
156
156
|
return url;
|
|
157
157
|
};
|
package/core/loginSilent.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loginSilent.js","sourceRoot":"","sources":["../src/core/loginSilent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwBA,kCAqKC;AA5LD,8CAA6C;AAC7C,kDAAmE;AACnE,yCAA4E;AAC5E,gEAA+D;AAC/D,wCAA0C;AAE1C,+CAAsE;AACtE,4DAAkE;AAgBlE,SAAsB,WAAW,CAAC,MAejC;;;;;YAEO,uBAAuB,GAOvB,MAAM,wBAPiB,EACvB,6BAA6B,GAM7B,MAAM,8BANuB,EAC7B,QAAQ,GAKR,MAAM,SALE,EACR
|
|
1
|
+
{"version":3,"file":"loginSilent.js","sourceRoot":"","sources":["../src/core/loginSilent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwBA,kCAqKC;AA5LD,8CAA6C;AAC7C,kDAAmE;AACnE,yCAA4E;AAC5E,gEAA+D;AAC/D,wCAA0C;AAE1C,+CAAsE;AACtE,4DAAkE;AAgBlE,SAAsB,WAAW,CAAC,MAejC;;;;;YAEO,uBAAuB,GAOvB,MAAM,wBAPiB,EACvB,6BAA6B,GAM7B,MAAM,8BANuB,EAC7B,QAAQ,GAKR,MAAM,SALE,EACR,0BAA0B,GAI1B,MAAM,2BAJoB,EAC1B,mBAAmB,GAGnB,MAAM,oBAHa,EACnB,mBAAmB,GAEnB,MAAM,oBAFa,EACnB,SAAS,GACT,MAAM,UADG,CACF;YAEL,OAAO,GAAG,IAAI,mBAAQ,EAAuB,CAAC;YAE9C,cAAc,GAAW,CAAC;gBAC5B,IAAI,SAAS,EAAE,CAAC;oBACZ,OAAO,KAAM,CAAC;gBAClB,CAAC;gBAED,IAAM,cAAc,GAAG,IAAA,qCAAiB,GAAE,CAAC;gBAC3C,IAAM,KAAK,GAAG,IAAA,gBAAQ,GAAE,CAAC;gBAEzB,6DAA6D;gBAC7D,IAAM,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,IAAK,CAAC,CAAC,CAAC,IAAK,CAAC;gBAE5C,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;oBAC/B,OAAO,aAAa,CAAC;gBACzB,CAAC;gBAEO,IAAA,QAAQ,GAAU,cAAc,SAAxB,EAAE,GAAG,GAAK,cAAc,IAAnB,CAAoB;gBAEzC,oDAAoD;gBACpD,8CAA8C;gBAC9C,IAAM,YAAY,GAAG,GAAG,GAAG,GAAG,GAAG,aAAa,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;gBAEhE,OAAO,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;YACjD,CAAC,CAAC,EAAE,CAAC;YAEC,OAAO,GAAG,UAAU,CAAC;;oBACvB,OAAO,CAAC,OAAO,CAAC;wBACZ,OAAO,EAAE,SAAS;wBAClB,KAAK,EAAE,SAAS;qBACnB,CAAC,CAAC;;;iBACN,EAAE,cAAc,CAAC,CAAC;YAEb,QAAQ,GAAG,UAAC,KAAmB;gBACjC,IAAI,CAAC,IAAA,gCAAiB,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;oBACjC,OAAO;gBACX,CAAC;gBAED,IAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC;gBAEhC,IAAM,SAAS,GAAG,IAAA,wBAAY,EAAC,EAAE,oBAAoB,EAAE,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;gBAE7E,IAAA,cAAM,EAAC,SAAS,KAAK,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAC1C,IAAA,cAAM,EAAC,SAAS,CAAC,OAAO,KAAK,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBAEjD,IAAI,SAAS,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAClC,OAAO;gBACX,CAAC;gBAED,YAAY,CAAC,OAAO,CAAC,CAAC;gBAEtB,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAEhD,OAAO,CAAC,OAAO,CAAC;oBACZ,OAAO,EAAE,+BAA+B;oBACxC,YAAY,cAAA;iBACf,CAAC,CAAC;YACP,CAAC,CAAC;YAEF,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;YAE9C,yBAAyB,GAAG,UAAC,GAAW;;gBAC1C,sBAAsB,EAAE,CAAC;oBACrB,IAAI,mBAAmB,KAAK,SAAS,EAAE,CAAC;wBACpC,MAAM,sBAAsB,CAAC;oBACjC,CAAC;oBAED,IAAM,gBAAgB,GAAG,mBAAmB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAA,EAAE,CAAC,CAAC;;wBAEtE,KAA4B,IAAA,KAAA,SAAA,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAA,gBAAA,4BAAE,CAAC;4BAApD,IAAA,KAAA,mBAAa,EAAZ,MAAI,QAAA,EAAE,KAAK,QAAA;4BACnB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gCACtB,SAAS;4BACb,CAAC;4BACD,GAAG,GAAG,IAAA,wCAAsB,EAAC,EAAE,GAAG,KAAA,EAAE,IAAI,QAAA,EAAE,KAAK,OAAA,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC;wBACjF,CAAC;;;;;;;;;gBACL,CAAC;gBAED,mBAAmB,EAAE,CAAC;oBAClB,IAAI,0BAA0B,KAAK,SAAS,EAAE,CAAC;wBAC3C,MAAM,mBAAmB,CAAC;oBAC9B,CAAC;oBACD,GAAG,GAAG,0BAA0B,CAAC,EAAE,gBAAgB,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;gBAChF,CAAC;gBAED,OAAO,GAAG,CAAC;YACf,CAAC,CAAC;YAEF,uBAAuB;iBAClB,YAAY,CAAC;gBACV,KAAK,EAAE,IAAA,UAAE,EAAmB;oBACxB,OAAO,EAAE,QAAQ;oBACjB,QAAQ,UAAA;iBACX,CAAC;gBACF,6BAA6B,EAAE,cAAc,GAAG,IAAI;gBACpD,gBAAgB,EACZ,mBAAmB,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,mBAAmB,EAAE,CAAC;gBACtF,YAAY,EAAE,yBAAyB;aAC1C,CAAC;iBACD,IAAI,CACD,UAAA,gBAAgB;gBACZ,IAAA,cAAM,EAAC,gBAAgB,KAAK,IAAI,EAAE,kDAAkD,CAAC,CAAC;gBAEtF,YAAY,CAAC,OAAO,CAAC,CAAC;gBAEtB,OAAO,CAAC,OAAO,CAAC;oBACZ,OAAO,EAAE,qCAAqC;oBAC9C,gBAAgB,kBAAA;iBACnB,CAAC,CAAC;YACP,CAAC,EACD,UAAC,KAAY;gBACT,IAAI,KAAK,CAAC,OAAO,KAAK,iBAAiB,EAAE,CAAC;oBACtC,+DAA+D;oBAC/D,mCAAmC;oBACnC,mEAAmE;oBACnE,0CAA0C;oBAC1C,yEAAyE;oBAEzE,YAAY,CAAC,OAAO,CAAC,CAAC;oBAEtB,OAAO,CAAC,OAAO,CAAC;wBACZ,OAAO,EAAE,SAAS;wBAClB,KAAK,EAAE,sCAAsC;qBAChD,CAAC,CAAC;oBAEH,OAAO;gBACX,CAAC;gBAED,yEAAyE;gBACzE,qEAAqE;YACzE,CAAC,CACJ,CAAC;YAEN,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,UAAA,MAAM;gBAClB,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;oBAC/B,IAAA,2BAAe,EAAC,EAAE,oBAAoB,EAAE,6BAA6B,EAAE,CAAC,CAAC;gBAC7E,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,sBAAO,OAAO,CAAC,EAAE,EAAC;;;CACrB"}
|
|
@@ -3,10 +3,9 @@ import type { Oidc } from "./Oidc";
|
|
|
3
3
|
export declare function oidcClientTsUserToTokens<DecodedIdToken extends Record<string, unknown>>(params: {
|
|
4
4
|
oidcClientTsUser: OidcClientTsUser;
|
|
5
5
|
decodedIdTokenSchema?: {
|
|
6
|
-
parse: (
|
|
6
|
+
parse: (decodedIdToken_original: Oidc.Tokens.DecodedIdToken_base) => DecodedIdToken;
|
|
7
7
|
};
|
|
8
8
|
__unsafe_useIdTokenAsAccessToken: boolean;
|
|
9
9
|
decodedIdToken_previous: DecodedIdToken | undefined;
|
|
10
10
|
log: typeof console.log | undefined;
|
|
11
11
|
}): Oidc.Tokens<DecodedIdToken>;
|
|
12
|
-
export declare function getMsBeforeExpiration(tokens: Oidc.Tokens): number;
|
|
@@ -12,7 +12,6 @@ var __assign = (this && this.__assign) || function () {
|
|
|
12
12
|
};
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.oidcClientTsUserToTokens = oidcClientTsUserToTokens;
|
|
15
|
-
exports.getMsBeforeExpiration = getMsBeforeExpiration;
|
|
16
15
|
var tsafe_1 = require("../vendor/frontend/tsafe");
|
|
17
16
|
var readExpirationTimeInJwt_1 = require("../tools/readExpirationTimeInJwt");
|
|
18
17
|
var decodeJwt_1 = require("../tools/decodeJwt");
|
|
@@ -20,50 +19,21 @@ function oidcClientTsUserToTokens(params) {
|
|
|
20
19
|
var oidcClientTsUser = params.oidcClientTsUser, decodedIdTokenSchema = params.decodedIdTokenSchema, __unsafe_useIdTokenAsAccessToken = params.__unsafe_useIdTokenAsAccessToken, decodedIdToken_previous = params.decodedIdToken_previous, log = params.log;
|
|
21
20
|
var isFirstInit = decodedIdToken_previous === undefined;
|
|
22
21
|
var accessToken = oidcClientTsUser.access_token;
|
|
23
|
-
var accessTokenExpirationTime = (function () {
|
|
24
|
-
read_from_token_response: {
|
|
25
|
-
var expires_at = oidcClientTsUser.expires_at;
|
|
26
|
-
if (expires_at === undefined) {
|
|
27
|
-
break read_from_token_response;
|
|
28
|
-
}
|
|
29
|
-
return expires_at * 1000;
|
|
30
|
-
}
|
|
31
|
-
read_from_jwt: {
|
|
32
|
-
var expirationTime = (0, readExpirationTimeInJwt_1.readExpirationTimeInJwt)(accessToken);
|
|
33
|
-
if (expirationTime === undefined) {
|
|
34
|
-
break read_from_jwt;
|
|
35
|
-
}
|
|
36
|
-
return expirationTime;
|
|
37
|
-
}
|
|
38
|
-
(0, tsafe_1.assert)(false, "Failed to get access token expiration time");
|
|
39
|
-
})();
|
|
40
22
|
var refreshToken = oidcClientTsUser.refresh_token;
|
|
41
|
-
var refreshTokenExpirationTime = (function () {
|
|
42
|
-
if (refreshToken === undefined) {
|
|
43
|
-
return undefined;
|
|
44
|
-
}
|
|
45
|
-
read_from_jwt: {
|
|
46
|
-
var expirationTime = (0, readExpirationTimeInJwt_1.readExpirationTimeInJwt)(refreshToken);
|
|
47
|
-
if (expirationTime === undefined) {
|
|
48
|
-
break read_from_jwt;
|
|
49
|
-
}
|
|
50
|
-
return expirationTime;
|
|
51
|
-
}
|
|
52
|
-
return undefined;
|
|
53
|
-
})();
|
|
54
23
|
var idToken = oidcClientTsUser.id_token;
|
|
55
24
|
(0, tsafe_1.assert)(idToken !== undefined, "No id token provided by the oidc server");
|
|
25
|
+
var decodedIdToken_original = (0, decodeJwt_1.decodeJwt)(idToken);
|
|
26
|
+
if (isFirstInit) {
|
|
27
|
+
log === null || log === void 0 ? void 0 : log([
|
|
28
|
+
"Decoded ID token",
|
|
29
|
+
decodedIdTokenSchema === undefined ? "" : " before `decodedIdTokenSchema.parse()`\n",
|
|
30
|
+
JSON.stringify(decodedIdToken_original, null, 2)
|
|
31
|
+
].join(""));
|
|
32
|
+
}
|
|
56
33
|
var decodedIdToken = (function () {
|
|
57
|
-
var decodedIdToken
|
|
58
|
-
if (isFirstInit) {
|
|
59
|
-
log === null || log === void 0 ? void 0 : log([
|
|
60
|
-
"Decoded ID token",
|
|
61
|
-
decodedIdTokenSchema === undefined ? "" : " before `decodedIdTokenSchema.parse()`\n",
|
|
62
|
-
JSON.stringify(decodedIdToken, null, 2)
|
|
63
|
-
].join(""));
|
|
64
|
-
}
|
|
34
|
+
var decodedIdToken;
|
|
65
35
|
if (decodedIdTokenSchema !== undefined) {
|
|
66
|
-
decodedIdToken = decodedIdTokenSchema.parse(
|
|
36
|
+
decodedIdToken = decodedIdTokenSchema.parse(decodedIdToken_original);
|
|
67
37
|
if (isFirstInit) {
|
|
68
38
|
log === null || log === void 0 ? void 0 : log([
|
|
69
39
|
"Decoded ID token after `decodedIdTokenSchema.parse()`\n",
|
|
@@ -71,12 +41,40 @@ function oidcClientTsUserToTokens(params) {
|
|
|
71
41
|
].join(""));
|
|
72
42
|
}
|
|
73
43
|
}
|
|
44
|
+
else {
|
|
45
|
+
// @ts-expect-error
|
|
46
|
+
decodedIdToken = decodedIdToken_original;
|
|
47
|
+
}
|
|
74
48
|
if (decodedIdToken_previous !== undefined &&
|
|
75
49
|
JSON.stringify(decodedIdToken) === JSON.stringify(decodedIdToken_previous)) {
|
|
50
|
+
// NOTE: For stable ref, prevent re-render for component that would memoize
|
|
76
51
|
return decodedIdToken_previous;
|
|
77
52
|
}
|
|
78
53
|
return decodedIdToken;
|
|
79
54
|
})();
|
|
55
|
+
var issuedAtTime = (function () {
|
|
56
|
+
// NOTE: The id_token is always a JWT as per the protocol.
|
|
57
|
+
// We don't use Date.now() due to network latency.
|
|
58
|
+
var id_token_iat = (function () {
|
|
59
|
+
var iat;
|
|
60
|
+
try {
|
|
61
|
+
var iat_claimValue = decodedIdToken_original.iat;
|
|
62
|
+
(0, tsafe_1.assert)(iat_claimValue === undefined || typeof iat_claimValue === "number");
|
|
63
|
+
iat = iat_claimValue;
|
|
64
|
+
}
|
|
65
|
+
catch (_a) {
|
|
66
|
+
iat = undefined;
|
|
67
|
+
}
|
|
68
|
+
if (iat === undefined) {
|
|
69
|
+
return undefined;
|
|
70
|
+
}
|
|
71
|
+
return iat;
|
|
72
|
+
})();
|
|
73
|
+
if (id_token_iat === undefined) {
|
|
74
|
+
return Date.now();
|
|
75
|
+
}
|
|
76
|
+
return id_token_iat * 1000;
|
|
77
|
+
})();
|
|
80
78
|
var tokens_common = __assign(__assign({}, (__unsafe_useIdTokenAsAccessToken
|
|
81
79
|
? {
|
|
82
80
|
accessToken: idToken,
|
|
@@ -86,10 +84,63 @@ function oidcClientTsUserToTokens(params) {
|
|
|
86
84
|
return expirationTime;
|
|
87
85
|
})()
|
|
88
86
|
}
|
|
89
|
-
: {
|
|
87
|
+
: {
|
|
88
|
+
accessToken: accessToken,
|
|
89
|
+
accessTokenExpirationTime: (function () {
|
|
90
|
+
read_from_jwt: {
|
|
91
|
+
var expirationTime = (0, readExpirationTimeInJwt_1.readExpirationTimeInJwt)(accessToken);
|
|
92
|
+
if (expirationTime === undefined) {
|
|
93
|
+
break read_from_jwt;
|
|
94
|
+
}
|
|
95
|
+
return expirationTime;
|
|
96
|
+
}
|
|
97
|
+
read_from_token_response_expires_at: {
|
|
98
|
+
var expires_at = oidcClientTsUser.__oidc_spa_tokenResponse.expires_at;
|
|
99
|
+
if (expires_at === undefined) {
|
|
100
|
+
break read_from_token_response_expires_at;
|
|
101
|
+
}
|
|
102
|
+
(0, tsafe_1.assert)(typeof expires_at === "number", "2033392");
|
|
103
|
+
return expires_at * 1000;
|
|
104
|
+
}
|
|
105
|
+
read_from_token_response_expires_in: {
|
|
106
|
+
var expires_in = oidcClientTsUser.__oidc_spa_tokenResponse.expires_in;
|
|
107
|
+
if (expires_in === undefined) {
|
|
108
|
+
break read_from_token_response_expires_in;
|
|
109
|
+
}
|
|
110
|
+
(0, tsafe_1.assert)(typeof expires_in === "number", "203333425");
|
|
111
|
+
return issuedAtTime + expires_in * 1000;
|
|
112
|
+
}
|
|
113
|
+
(0, tsafe_1.assert)(false, "Failed to get access token expiration time");
|
|
114
|
+
})()
|
|
115
|
+
})), { idToken: idToken, decodedIdToken: decodedIdToken, decodedIdToken_original: decodedIdToken_original, issuedAtTime: issuedAtTime });
|
|
90
116
|
var tokens = refreshToken === undefined
|
|
91
117
|
? (0, tsafe_1.id)(__assign(__assign({}, tokens_common), { hasRefreshToken: false }))
|
|
92
|
-
: (0, tsafe_1.id)(__assign(__assign({}, tokens_common), { hasRefreshToken: true, refreshToken: refreshToken, refreshTokenExpirationTime:
|
|
118
|
+
: (0, tsafe_1.id)(__assign(__assign({}, tokens_common), { hasRefreshToken: true, refreshToken: refreshToken, refreshTokenExpirationTime: (function () {
|
|
119
|
+
read_from_token_response_expires_at: {
|
|
120
|
+
var refresh_expires_at = oidcClientTsUser.__oidc_spa_tokenResponse.refresh_expires_at;
|
|
121
|
+
if (refresh_expires_at === undefined) {
|
|
122
|
+
break read_from_token_response_expires_at;
|
|
123
|
+
}
|
|
124
|
+
(0, tsafe_1.assert)(typeof refresh_expires_at === "number", "2033392");
|
|
125
|
+
return refresh_expires_at * 1000;
|
|
126
|
+
}
|
|
127
|
+
read_from_token_response_expires_in: {
|
|
128
|
+
var refresh_expires_in = oidcClientTsUser.__oidc_spa_tokenResponse.refresh_expires_in;
|
|
129
|
+
if (refresh_expires_in === undefined) {
|
|
130
|
+
break read_from_token_response_expires_in;
|
|
131
|
+
}
|
|
132
|
+
(0, tsafe_1.assert)(typeof refresh_expires_in === "number", "2033425330");
|
|
133
|
+
return issuedAtTime + refresh_expires_in * 1000;
|
|
134
|
+
}
|
|
135
|
+
read_from_jwt: {
|
|
136
|
+
var expirationTime = (0, readExpirationTimeInJwt_1.readExpirationTimeInJwt)(refreshToken);
|
|
137
|
+
if (expirationTime === undefined) {
|
|
138
|
+
break read_from_jwt;
|
|
139
|
+
}
|
|
140
|
+
return expirationTime;
|
|
141
|
+
}
|
|
142
|
+
return undefined;
|
|
143
|
+
})() }));
|
|
93
144
|
if (isFirstInit &&
|
|
94
145
|
tokens.hasRefreshToken &&
|
|
95
146
|
tokens.refreshTokenExpirationTime !== undefined &&
|
|
@@ -101,20 +152,4 @@ function oidcClientTsUserToTokens(params) {
|
|
|
101
152
|
}
|
|
102
153
|
return tokens;
|
|
103
154
|
}
|
|
104
|
-
function getMsBeforeExpiration(tokens) {
|
|
105
|
-
var _a;
|
|
106
|
-
// NOTE: In general the access token is supposed to have a shorter
|
|
107
|
-
// lifespan than the refresh token but we don't want to make any
|
|
108
|
-
// assumption here.
|
|
109
|
-
var tokenExpirationTime = Math.min(tokens.accessTokenExpirationTime, (_a = tokens.refreshTokenExpirationTime) !== null && _a !== void 0 ? _a : Number.POSITIVE_INFINITY);
|
|
110
|
-
var msBeforeExpiration = Math.min(tokenExpirationTime - Date.now(),
|
|
111
|
-
// NOTE: We want to make sure we do not overflow the setTimeout
|
|
112
|
-
// that must be a 32 bit unsigned integer.
|
|
113
|
-
// This can happen if the tokenExpirationTime is more than 24.8 days in the future.
|
|
114
|
-
Math.pow(2, 31) - 1);
|
|
115
|
-
if (msBeforeExpiration < 0) {
|
|
116
|
-
return 0;
|
|
117
|
-
}
|
|
118
|
-
return msBeforeExpiration;
|
|
119
|
-
}
|
|
120
155
|
//# sourceMappingURL=oidcClientTsUserToTokens.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidcClientTsUserToTokens.js","sourceRoot":"","sources":["../src/core/oidcClientTsUserToTokens.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAMA,
|
|
1
|
+
{"version":3,"file":"oidcClientTsUserToTokens.js","sourceRoot":"","sources":["../src/core/oidcClientTsUserToTokens.ts"],"names":[],"mappings":"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"}
|
package/mock/oidc.d.ts
CHANGED
|
@@ -16,4 +16,4 @@ export type ParamsOfCreateMockOidc<DecodedIdToken extends Record<string, unknown
|
|
|
16
16
|
} : {
|
|
17
17
|
isUserInitiallyLoggedIn: boolean;
|
|
18
18
|
});
|
|
19
|
-
export declare function createMockOidc<DecodedIdToken extends Record<string, unknown> =
|
|
19
|
+
export declare function createMockOidc<DecodedIdToken extends Record<string, unknown> = Oidc.Tokens.DecodedIdToken_base, AutoLogin extends boolean = false>(params: ParamsOfCreateMockOidc<DecodedIdToken, AutoLogin>): Promise<AutoLogin extends true ? Oidc.LoggedIn<DecodedIdToken> : Oidc<DecodedIdToken>>;
|