oidc-spa 10.2.9 → 10.2.10
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/core/createOidc.js +1 -1
- package/core/earlyInit.js +92 -7
- package/core/earlyInit.js.map +1 -1
- package/esm/core/createOidc.mjs +1 -1
- package/esm/core/earlyInit.mjs +94 -9
- package/esm/core/earlyInit.mjs.map +1 -1
- package/package.json +1 -1
- package/src/core/earlyInit.ts +120 -14
package/core/createOidc.js
CHANGED
|
@@ -76,7 +76,7 @@ const StateDataCookie_1 = require("./StateDataCookie");
|
|
|
76
76
|
const loadWebcryptoLinerShim_1 = require("../tools/loadWebcryptoLinerShim");
|
|
77
77
|
const lazySessionStorage_2 = require("../tools/lazySessionStorage");
|
|
78
78
|
// NOTE: Replaced at build time
|
|
79
|
-
const VERSION = "10.2.
|
|
79
|
+
const VERSION = "10.2.10";
|
|
80
80
|
const globalContext = {
|
|
81
81
|
prOidcByConfigId: new Map(),
|
|
82
82
|
hasLogoutBeenCalled: (0, id_1.id)(false),
|
package/core/earlyInit.js
CHANGED
|
@@ -8,6 +8,7 @@ const isBrowser_1 = require("../tools/isBrowser");
|
|
|
8
8
|
const Evt_1 = require("../tools/Evt");
|
|
9
9
|
const earlyInit_rootRelativeOriginalLocationHref_1 = require("./earlyInit_rootRelativeOriginalLocationHref");
|
|
10
10
|
const earlyInit_prModuleCreateOidc_1 = require("./earlyInit_prModuleCreateOidc");
|
|
11
|
+
const toFullyQualifiedUrl_1 = require("../tools/toFullyQualifiedUrl");
|
|
11
12
|
const IFRAME_MESSAGE_PREFIX = "oidc-spa:cross-window-messaging:";
|
|
12
13
|
let shouldLoadApp = undefined;
|
|
13
14
|
function oidcEarlyInit(params) {
|
|
@@ -22,6 +23,9 @@ function oidcEarlyInit_nonMemoized(params) {
|
|
|
22
23
|
if (!isBrowser_1.isBrowser) {
|
|
23
24
|
return { shouldLoadApp: true };
|
|
24
25
|
}
|
|
26
|
+
if (BASE_URL !== undefined) {
|
|
27
|
+
(0, earlyInit_BASE_URL_1.setBASE_URL_earlyInit)({ BASE_URL });
|
|
28
|
+
}
|
|
25
29
|
const { shouldLoadApp } = handleOidcCallback();
|
|
26
30
|
let exports_earlyInit;
|
|
27
31
|
if (shouldLoadApp) {
|
|
@@ -63,9 +67,6 @@ function oidcEarlyInit_nonMemoized(params) {
|
|
|
63
67
|
passive: false
|
|
64
68
|
});
|
|
65
69
|
}
|
|
66
|
-
if (BASE_URL !== undefined) {
|
|
67
|
-
(0, earlyInit_BASE_URL_1.setBASE_URL_earlyInit)({ BASE_URL });
|
|
68
|
-
}
|
|
69
70
|
{
|
|
70
71
|
const { enableBrowserRuntimeFreeze, enableDPoP, enableTokenSubstitution } = securityDefenses;
|
|
71
72
|
enableDPoP?.();
|
|
@@ -138,9 +139,6 @@ function handleOidcCallback() {
|
|
|
138
139
|
});
|
|
139
140
|
return { shouldLoadApp: true };
|
|
140
141
|
}
|
|
141
|
-
(0, earlyInit_rootRelativeOriginalLocationHref_1.setGetRootRelativeOriginalLocationHref_earlyInit)({
|
|
142
|
-
rootRelativeOriginalLocationHref: location_urlObj.pathname
|
|
143
|
-
});
|
|
144
142
|
const { authResponse } = (() => {
|
|
145
143
|
const authResponse = { state: "" };
|
|
146
144
|
const searchParams = (() => {
|
|
@@ -160,8 +158,64 @@ function handleOidcCallback() {
|
|
|
160
158
|
return { authResponse };
|
|
161
159
|
})();
|
|
162
160
|
const stateData = (0, StateData_1.getStateData)({ stateUrlParamValue: authResponse.state });
|
|
161
|
+
const getRootRelativeRedirectUrl_strippedFromAuthResponse = () => {
|
|
162
|
+
const authResponseParamNames = new Set([
|
|
163
|
+
"state",
|
|
164
|
+
"session_state",
|
|
165
|
+
"code",
|
|
166
|
+
"iss",
|
|
167
|
+
"error",
|
|
168
|
+
"error_description",
|
|
169
|
+
"error_uri"
|
|
170
|
+
]);
|
|
171
|
+
const rootRelativeRedirectUrl = location_urlObj.href.slice(location_urlObj.origin.length);
|
|
172
|
+
const { prefix, delimiter, serializedParams, suffix } = (() => {
|
|
173
|
+
switch (locationHrefAssessment.responseMode) {
|
|
174
|
+
case "query": {
|
|
175
|
+
const queryStartIndex = rootRelativeRedirectUrl.indexOf("?");
|
|
176
|
+
(0, assert_1.assert)(queryStartIndex !== -1);
|
|
177
|
+
const fragmentStartIndex = rootRelativeRedirectUrl.indexOf("#", queryStartIndex);
|
|
178
|
+
return {
|
|
179
|
+
prefix: rootRelativeRedirectUrl.slice(0, queryStartIndex),
|
|
180
|
+
delimiter: "?",
|
|
181
|
+
serializedParams: rootRelativeRedirectUrl.slice(queryStartIndex + 1, fragmentStartIndex === -1 ? undefined : fragmentStartIndex),
|
|
182
|
+
suffix: fragmentStartIndex === -1
|
|
183
|
+
? ""
|
|
184
|
+
: rootRelativeRedirectUrl.slice(fragmentStartIndex)
|
|
185
|
+
};
|
|
186
|
+
}
|
|
187
|
+
case "fragment": {
|
|
188
|
+
const fragmentStartIndex = rootRelativeRedirectUrl.indexOf("#");
|
|
189
|
+
(0, assert_1.assert)(fragmentStartIndex !== -1);
|
|
190
|
+
return {
|
|
191
|
+
prefix: rootRelativeRedirectUrl.slice(0, fragmentStartIndex),
|
|
192
|
+
delimiter: "#",
|
|
193
|
+
serializedParams: rootRelativeRedirectUrl.slice(fragmentStartIndex + 1),
|
|
194
|
+
suffix: ""
|
|
195
|
+
};
|
|
196
|
+
}
|
|
197
|
+
default:
|
|
198
|
+
(0, assert_1.assert)(false);
|
|
199
|
+
}
|
|
200
|
+
})();
|
|
201
|
+
const remainingSerializedParams = serializedParams.split("&").filter(serializedParam => {
|
|
202
|
+
const paramName = new URLSearchParams(serializedParam).keys().next().value;
|
|
203
|
+
return paramName === undefined || !authResponseParamNames.has(paramName);
|
|
204
|
+
});
|
|
205
|
+
return [
|
|
206
|
+
prefix,
|
|
207
|
+
remainingSerializedParams.some(serializedParam => serializedParam !== "")
|
|
208
|
+
? `${delimiter}${remainingSerializedParams.join("&")}`
|
|
209
|
+
: "",
|
|
210
|
+
suffix
|
|
211
|
+
].join("");
|
|
212
|
+
};
|
|
163
213
|
if (stateData === undefined) {
|
|
164
|
-
|
|
214
|
+
const rootRelativeRedirectUrl = getRootRelativeRedirectUrl_strippedFromAuthResponse();
|
|
215
|
+
(0, earlyInit_rootRelativeOriginalLocationHref_1.setGetRootRelativeOriginalLocationHref_earlyInit)({
|
|
216
|
+
rootRelativeOriginalLocationHref: rootRelativeRedirectUrl
|
|
217
|
+
});
|
|
218
|
+
history.replaceState({}, "", rootRelativeRedirectUrl);
|
|
165
219
|
return { shouldLoadApp: true };
|
|
166
220
|
}
|
|
167
221
|
switch (stateData.context) {
|
|
@@ -177,6 +231,34 @@ function handleOidcCallback() {
|
|
|
177
231
|
parent.postMessage(`${IFRAME_MESSAGE_PREFIX}${JSON.stringify(authResponse)}`, location.origin);
|
|
178
232
|
return { shouldLoadApp: false };
|
|
179
233
|
case "redirect": {
|
|
234
|
+
// See: https://github.com/keycloakify/keycloak-account-ui/issues/10
|
|
235
|
+
abort_case: {
|
|
236
|
+
const BASE_URL = (0, earlyInit_BASE_URL_1.getBASE_URL_earlyInit)();
|
|
237
|
+
if (BASE_URL === undefined) {
|
|
238
|
+
break abort_case;
|
|
239
|
+
}
|
|
240
|
+
let BASE_URL_fullyQualified;
|
|
241
|
+
try {
|
|
242
|
+
BASE_URL_fullyQualified = (0, toFullyQualifiedUrl_1.toFullyQualifiedUrl)({
|
|
243
|
+
urlish: BASE_URL,
|
|
244
|
+
doAssertNoQueryParams: true,
|
|
245
|
+
doOutputWithTrailingSlash: true
|
|
246
|
+
});
|
|
247
|
+
}
|
|
248
|
+
catch {
|
|
249
|
+
break abort_case;
|
|
250
|
+
}
|
|
251
|
+
// NOTE: This should ALWAYS be true in normal circumstances.
|
|
252
|
+
if (new URL(BASE_URL_fullyQualified).pathname === location_urlObj.pathname) {
|
|
253
|
+
break abort_case;
|
|
254
|
+
}
|
|
255
|
+
const rootRelativeRedirectUrl = getRootRelativeRedirectUrl_strippedFromAuthResponse();
|
|
256
|
+
(0, earlyInit_rootRelativeOriginalLocationHref_1.setGetRootRelativeOriginalLocationHref_earlyInit)({
|
|
257
|
+
rootRelativeOriginalLocationHref: rootRelativeRedirectUrl
|
|
258
|
+
});
|
|
259
|
+
history.replaceState({}, "", rootRelativeRedirectUrl);
|
|
260
|
+
return { shouldLoadApp: true };
|
|
261
|
+
}
|
|
180
262
|
redirectAuthResponse = authResponse;
|
|
181
263
|
const rootRelativeRedirectUrl = (() => {
|
|
182
264
|
if (stateData.action === "login" && authResponse.error === "consent_required") {
|
|
@@ -184,6 +266,9 @@ function handleOidcCallback() {
|
|
|
184
266
|
}
|
|
185
267
|
return stateData.rootRelativeRedirectUrl;
|
|
186
268
|
})();
|
|
269
|
+
(0, earlyInit_rootRelativeOriginalLocationHref_1.setGetRootRelativeOriginalLocationHref_earlyInit)({
|
|
270
|
+
rootRelativeOriginalLocationHref: rootRelativeRedirectUrl
|
|
271
|
+
});
|
|
187
272
|
history.replaceState({}, "", rootRelativeRedirectUrl);
|
|
188
273
|
return { shouldLoadApp: true };
|
|
189
274
|
}
|
package/core/earlyInit.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"earlyInit.js","sourceRoot":"","sources":["../src/core/earlyInit.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"earlyInit.js","sourceRoot":"","sources":["../src/core/earlyInit.ts"],"names":[],"mappings":"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"}
|
package/esm/core/createOidc.mjs
CHANGED
|
@@ -36,7 +36,7 @@ import { setStateDataCookieIfEnabled, clearStateDataCookie, getIsStateDataCookie
|
|
|
36
36
|
import { loadWebcryptoLinerShim, hasLoadWebcryptoLinerShimBeenCalled } from "../tools/loadWebcryptoLinerShim.mjs";
|
|
37
37
|
import { SESSION_STORAGE_GLOBAL_PREFIX } from "../tools/lazySessionStorage.mjs";
|
|
38
38
|
// NOTE: Replaced at build time
|
|
39
|
-
const VERSION = "10.2.
|
|
39
|
+
const VERSION = "10.2.10";
|
|
40
40
|
const globalContext = {
|
|
41
41
|
prOidcByConfigId: new Map(),
|
|
42
42
|
hasLogoutBeenCalled: id(false),
|
package/esm/core/earlyInit.mjs
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { getStateData, getIsStatQueryParamValue } from "./StateData.mjs";
|
|
2
2
|
import { assert } from "../tools/tsafe/assert.mjs";
|
|
3
|
-
import { setBASE_URL_earlyInit } from "./earlyInit_BASE_URL.mjs";
|
|
3
|
+
import { setBASE_URL_earlyInit, getBASE_URL_earlyInit } from "./earlyInit_BASE_URL.mjs";
|
|
4
4
|
import { isBrowser } from "../tools/isBrowser.mjs";
|
|
5
5
|
import { createEvt } from "../tools/Evt.mjs";
|
|
6
|
-
import { setGetRootRelativeOriginalLocationHref_earlyInit
|
|
6
|
+
import { setGetRootRelativeOriginalLocationHref_earlyInit } from "./earlyInit_rootRelativeOriginalLocationHref.mjs";
|
|
7
7
|
import { prModuleCreateOidc } from "./earlyInit_prModuleCreateOidc.mjs";
|
|
8
|
+
import { toFullyQualifiedUrl } from "../tools/toFullyQualifiedUrl.mjs";
|
|
8
9
|
const IFRAME_MESSAGE_PREFIX = "oidc-spa:cross-window-messaging:";
|
|
9
10
|
let shouldLoadApp = undefined;
|
|
10
11
|
export function oidcEarlyInit(params) {
|
|
@@ -19,6 +20,9 @@ function oidcEarlyInit_nonMemoized(params) {
|
|
|
19
20
|
if (!isBrowser) {
|
|
20
21
|
return { shouldLoadApp: true };
|
|
21
22
|
}
|
|
23
|
+
if (BASE_URL !== undefined) {
|
|
24
|
+
setBASE_URL_earlyInit({ BASE_URL });
|
|
25
|
+
}
|
|
22
26
|
const { shouldLoadApp } = handleOidcCallback();
|
|
23
27
|
let exports_earlyInit;
|
|
24
28
|
if (shouldLoadApp) {
|
|
@@ -60,9 +64,6 @@ function oidcEarlyInit_nonMemoized(params) {
|
|
|
60
64
|
passive: false
|
|
61
65
|
});
|
|
62
66
|
}
|
|
63
|
-
if (BASE_URL !== undefined) {
|
|
64
|
-
setBASE_URL_earlyInit({ BASE_URL });
|
|
65
|
-
}
|
|
66
67
|
{
|
|
67
68
|
const { enableBrowserRuntimeFreeze, enableDPoP, enableTokenSubstitution } = securityDefenses;
|
|
68
69
|
enableDPoP?.();
|
|
@@ -135,9 +136,6 @@ function handleOidcCallback() {
|
|
|
135
136
|
});
|
|
136
137
|
return { shouldLoadApp: true };
|
|
137
138
|
}
|
|
138
|
-
setGetRootRelativeOriginalLocationHref_earlyInit({
|
|
139
|
-
rootRelativeOriginalLocationHref: location_urlObj.pathname
|
|
140
|
-
});
|
|
141
139
|
const { authResponse } = (() => {
|
|
142
140
|
const authResponse = { state: "" };
|
|
143
141
|
const searchParams = (() => {
|
|
@@ -157,8 +155,64 @@ function handleOidcCallback() {
|
|
|
157
155
|
return { authResponse };
|
|
158
156
|
})();
|
|
159
157
|
const stateData = getStateData({ stateUrlParamValue: authResponse.state });
|
|
158
|
+
const getRootRelativeRedirectUrl_strippedFromAuthResponse = () => {
|
|
159
|
+
const authResponseParamNames = new Set([
|
|
160
|
+
"state",
|
|
161
|
+
"session_state",
|
|
162
|
+
"code",
|
|
163
|
+
"iss",
|
|
164
|
+
"error",
|
|
165
|
+
"error_description",
|
|
166
|
+
"error_uri"
|
|
167
|
+
]);
|
|
168
|
+
const rootRelativeRedirectUrl = location_urlObj.href.slice(location_urlObj.origin.length);
|
|
169
|
+
const { prefix, delimiter, serializedParams, suffix } = (() => {
|
|
170
|
+
switch (locationHrefAssessment.responseMode) {
|
|
171
|
+
case "query": {
|
|
172
|
+
const queryStartIndex = rootRelativeRedirectUrl.indexOf("?");
|
|
173
|
+
assert(queryStartIndex !== -1);
|
|
174
|
+
const fragmentStartIndex = rootRelativeRedirectUrl.indexOf("#", queryStartIndex);
|
|
175
|
+
return {
|
|
176
|
+
prefix: rootRelativeRedirectUrl.slice(0, queryStartIndex),
|
|
177
|
+
delimiter: "?",
|
|
178
|
+
serializedParams: rootRelativeRedirectUrl.slice(queryStartIndex + 1, fragmentStartIndex === -1 ? undefined : fragmentStartIndex),
|
|
179
|
+
suffix: fragmentStartIndex === -1
|
|
180
|
+
? ""
|
|
181
|
+
: rootRelativeRedirectUrl.slice(fragmentStartIndex)
|
|
182
|
+
};
|
|
183
|
+
}
|
|
184
|
+
case "fragment": {
|
|
185
|
+
const fragmentStartIndex = rootRelativeRedirectUrl.indexOf("#");
|
|
186
|
+
assert(fragmentStartIndex !== -1);
|
|
187
|
+
return {
|
|
188
|
+
prefix: rootRelativeRedirectUrl.slice(0, fragmentStartIndex),
|
|
189
|
+
delimiter: "#",
|
|
190
|
+
serializedParams: rootRelativeRedirectUrl.slice(fragmentStartIndex + 1),
|
|
191
|
+
suffix: ""
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
default:
|
|
195
|
+
assert(false);
|
|
196
|
+
}
|
|
197
|
+
})();
|
|
198
|
+
const remainingSerializedParams = serializedParams.split("&").filter(serializedParam => {
|
|
199
|
+
const paramName = new URLSearchParams(serializedParam).keys().next().value;
|
|
200
|
+
return paramName === undefined || !authResponseParamNames.has(paramName);
|
|
201
|
+
});
|
|
202
|
+
return [
|
|
203
|
+
prefix,
|
|
204
|
+
remainingSerializedParams.some(serializedParam => serializedParam !== "")
|
|
205
|
+
? `${delimiter}${remainingSerializedParams.join("&")}`
|
|
206
|
+
: "",
|
|
207
|
+
suffix
|
|
208
|
+
].join("");
|
|
209
|
+
};
|
|
160
210
|
if (stateData === undefined) {
|
|
161
|
-
|
|
211
|
+
const rootRelativeRedirectUrl = getRootRelativeRedirectUrl_strippedFromAuthResponse();
|
|
212
|
+
setGetRootRelativeOriginalLocationHref_earlyInit({
|
|
213
|
+
rootRelativeOriginalLocationHref: rootRelativeRedirectUrl
|
|
214
|
+
});
|
|
215
|
+
history.replaceState({}, "", rootRelativeRedirectUrl);
|
|
162
216
|
return { shouldLoadApp: true };
|
|
163
217
|
}
|
|
164
218
|
switch (stateData.context) {
|
|
@@ -174,6 +228,34 @@ function handleOidcCallback() {
|
|
|
174
228
|
parent.postMessage(`${IFRAME_MESSAGE_PREFIX}${JSON.stringify(authResponse)}`, location.origin);
|
|
175
229
|
return { shouldLoadApp: false };
|
|
176
230
|
case "redirect": {
|
|
231
|
+
// See: https://github.com/keycloakify/keycloak-account-ui/issues/10
|
|
232
|
+
abort_case: {
|
|
233
|
+
const BASE_URL = getBASE_URL_earlyInit();
|
|
234
|
+
if (BASE_URL === undefined) {
|
|
235
|
+
break abort_case;
|
|
236
|
+
}
|
|
237
|
+
let BASE_URL_fullyQualified;
|
|
238
|
+
try {
|
|
239
|
+
BASE_URL_fullyQualified = toFullyQualifiedUrl({
|
|
240
|
+
urlish: BASE_URL,
|
|
241
|
+
doAssertNoQueryParams: true,
|
|
242
|
+
doOutputWithTrailingSlash: true
|
|
243
|
+
});
|
|
244
|
+
}
|
|
245
|
+
catch {
|
|
246
|
+
break abort_case;
|
|
247
|
+
}
|
|
248
|
+
// NOTE: This should ALWAYS be true in normal circumstances.
|
|
249
|
+
if (new URL(BASE_URL_fullyQualified).pathname === location_urlObj.pathname) {
|
|
250
|
+
break abort_case;
|
|
251
|
+
}
|
|
252
|
+
const rootRelativeRedirectUrl = getRootRelativeRedirectUrl_strippedFromAuthResponse();
|
|
253
|
+
setGetRootRelativeOriginalLocationHref_earlyInit({
|
|
254
|
+
rootRelativeOriginalLocationHref: rootRelativeRedirectUrl
|
|
255
|
+
});
|
|
256
|
+
history.replaceState({}, "", rootRelativeRedirectUrl);
|
|
257
|
+
return { shouldLoadApp: true };
|
|
258
|
+
}
|
|
177
259
|
redirectAuthResponse = authResponse;
|
|
178
260
|
const rootRelativeRedirectUrl = (() => {
|
|
179
261
|
if (stateData.action === "login" && authResponse.error === "consent_required") {
|
|
@@ -181,6 +263,9 @@ function handleOidcCallback() {
|
|
|
181
263
|
}
|
|
182
264
|
return stateData.rootRelativeRedirectUrl;
|
|
183
265
|
})();
|
|
266
|
+
setGetRootRelativeOriginalLocationHref_earlyInit({
|
|
267
|
+
rootRelativeOriginalLocationHref: rootRelativeRedirectUrl
|
|
268
|
+
});
|
|
184
269
|
history.replaceState({}, "", rootRelativeRedirectUrl);
|
|
185
270
|
return { shouldLoadApp: true };
|
|
186
271
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"earlyInit.mjs","sourceRoot":"","sources":["../../src/core/earlyInit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,MAAM,EAAe,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"earlyInit.mjs","sourceRoot":"","sources":["../../src/core/earlyInit.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/core/earlyInit.ts
CHANGED
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
import { getStateData, getIsStatQueryParamValue } from "./StateData";
|
|
2
2
|
import { assert, type Equals } from "../tools/tsafe/assert";
|
|
3
3
|
import type { AuthResponse } from "./AuthResponse";
|
|
4
|
-
import { setBASE_URL_earlyInit } from "./earlyInit_BASE_URL";
|
|
4
|
+
import { setBASE_URL_earlyInit, getBASE_URL_earlyInit } from "./earlyInit_BASE_URL";
|
|
5
5
|
import { isBrowser } from "../tools/isBrowser";
|
|
6
6
|
import { createEvt, type Evt } from "../tools/Evt";
|
|
7
|
-
import {
|
|
8
|
-
setGetRootRelativeOriginalLocationHref_earlyInit,
|
|
9
|
-
getRootRelativeOriginalLocationHref_earlyInit
|
|
10
|
-
} from "./earlyInit_rootRelativeOriginalLocationHref";
|
|
7
|
+
import { setGetRootRelativeOriginalLocationHref_earlyInit } from "./earlyInit_rootRelativeOriginalLocationHref";
|
|
11
8
|
import { prModuleCreateOidc } from "./earlyInit_prModuleCreateOidc";
|
|
9
|
+
import { toFullyQualifiedUrl } from "../tools/toFullyQualifiedUrl";
|
|
12
10
|
|
|
13
11
|
const IFRAME_MESSAGE_PREFIX = "oidc-spa:cross-window-messaging:";
|
|
14
12
|
|
|
@@ -79,6 +77,10 @@ function oidcEarlyInit_nonMemoized(params: ParamsOfEarlyInit | undefined) {
|
|
|
79
77
|
return { shouldLoadApp: true };
|
|
80
78
|
}
|
|
81
79
|
|
|
80
|
+
if (BASE_URL !== undefined) {
|
|
81
|
+
setBASE_URL_earlyInit({ BASE_URL });
|
|
82
|
+
}
|
|
83
|
+
|
|
82
84
|
const { shouldLoadApp } = handleOidcCallback();
|
|
83
85
|
|
|
84
86
|
let exports_earlyInit: import("./createOidc").Exports_earlyInit;
|
|
@@ -149,10 +151,6 @@ function oidcEarlyInit_nonMemoized(params: ParamsOfEarlyInit | undefined) {
|
|
|
149
151
|
);
|
|
150
152
|
}
|
|
151
153
|
|
|
152
|
-
if (BASE_URL !== undefined) {
|
|
153
|
-
setBASE_URL_earlyInit({ BASE_URL });
|
|
154
|
-
}
|
|
155
|
-
|
|
156
154
|
{
|
|
157
155
|
const { enableBrowserRuntimeFreeze, enableDPoP, enableTokenSubstitution } = securityDefenses;
|
|
158
156
|
|
|
@@ -248,10 +246,6 @@ function handleOidcCallback(): {
|
|
|
248
246
|
return { shouldLoadApp: true };
|
|
249
247
|
}
|
|
250
248
|
|
|
251
|
-
setGetRootRelativeOriginalLocationHref_earlyInit({
|
|
252
|
-
rootRelativeOriginalLocationHref: location_urlObj.pathname
|
|
253
|
-
});
|
|
254
|
-
|
|
255
249
|
const { authResponse } = (() => {
|
|
256
250
|
const authResponse: AuthResponse = { state: "" };
|
|
257
251
|
|
|
@@ -277,8 +271,80 @@ function handleOidcCallback(): {
|
|
|
277
271
|
|
|
278
272
|
const stateData = getStateData({ stateUrlParamValue: authResponse.state });
|
|
279
273
|
|
|
274
|
+
const getRootRelativeRedirectUrl_strippedFromAuthResponse = () => {
|
|
275
|
+
const authResponseParamNames = new Set([
|
|
276
|
+
"state",
|
|
277
|
+
"session_state",
|
|
278
|
+
"code",
|
|
279
|
+
"iss",
|
|
280
|
+
"error",
|
|
281
|
+
"error_description",
|
|
282
|
+
"error_uri"
|
|
283
|
+
]);
|
|
284
|
+
|
|
285
|
+
const rootRelativeRedirectUrl = location_urlObj.href.slice(location_urlObj.origin.length);
|
|
286
|
+
|
|
287
|
+
const { prefix, delimiter, serializedParams, suffix } = (() => {
|
|
288
|
+
switch (locationHrefAssessment.responseMode) {
|
|
289
|
+
case "query": {
|
|
290
|
+
const queryStartIndex = rootRelativeRedirectUrl.indexOf("?");
|
|
291
|
+
assert(queryStartIndex !== -1);
|
|
292
|
+
|
|
293
|
+
const fragmentStartIndex = rootRelativeRedirectUrl.indexOf("#", queryStartIndex);
|
|
294
|
+
|
|
295
|
+
return {
|
|
296
|
+
prefix: rootRelativeRedirectUrl.slice(0, queryStartIndex),
|
|
297
|
+
delimiter: "?",
|
|
298
|
+
serializedParams: rootRelativeRedirectUrl.slice(
|
|
299
|
+
queryStartIndex + 1,
|
|
300
|
+
fragmentStartIndex === -1 ? undefined : fragmentStartIndex
|
|
301
|
+
),
|
|
302
|
+
suffix:
|
|
303
|
+
fragmentStartIndex === -1
|
|
304
|
+
? ""
|
|
305
|
+
: rootRelativeRedirectUrl.slice(fragmentStartIndex)
|
|
306
|
+
};
|
|
307
|
+
}
|
|
308
|
+
case "fragment": {
|
|
309
|
+
const fragmentStartIndex = rootRelativeRedirectUrl.indexOf("#");
|
|
310
|
+
assert(fragmentStartIndex !== -1);
|
|
311
|
+
|
|
312
|
+
return {
|
|
313
|
+
prefix: rootRelativeRedirectUrl.slice(0, fragmentStartIndex),
|
|
314
|
+
delimiter: "#",
|
|
315
|
+
serializedParams: rootRelativeRedirectUrl.slice(fragmentStartIndex + 1),
|
|
316
|
+
suffix: ""
|
|
317
|
+
};
|
|
318
|
+
}
|
|
319
|
+
default:
|
|
320
|
+
assert<Equals<typeof locationHrefAssessment, never>>(false);
|
|
321
|
+
}
|
|
322
|
+
})();
|
|
323
|
+
|
|
324
|
+
const remainingSerializedParams = serializedParams.split("&").filter(serializedParam => {
|
|
325
|
+
const paramName = new URLSearchParams(serializedParam).keys().next().value;
|
|
326
|
+
|
|
327
|
+
return paramName === undefined || !authResponseParamNames.has(paramName);
|
|
328
|
+
});
|
|
329
|
+
|
|
330
|
+
return [
|
|
331
|
+
prefix,
|
|
332
|
+
remainingSerializedParams.some(serializedParam => serializedParam !== "")
|
|
333
|
+
? `${delimiter}${remainingSerializedParams.join("&")}`
|
|
334
|
+
: "",
|
|
335
|
+
suffix
|
|
336
|
+
].join("");
|
|
337
|
+
};
|
|
338
|
+
|
|
280
339
|
if (stateData === undefined) {
|
|
281
|
-
|
|
340
|
+
const rootRelativeRedirectUrl = getRootRelativeRedirectUrl_strippedFromAuthResponse();
|
|
341
|
+
|
|
342
|
+
setGetRootRelativeOriginalLocationHref_earlyInit({
|
|
343
|
+
rootRelativeOriginalLocationHref: rootRelativeRedirectUrl
|
|
344
|
+
});
|
|
345
|
+
|
|
346
|
+
history.replaceState({}, "", rootRelativeRedirectUrl);
|
|
347
|
+
|
|
282
348
|
return { shouldLoadApp: true };
|
|
283
349
|
}
|
|
284
350
|
|
|
@@ -299,6 +365,42 @@ function handleOidcCallback(): {
|
|
|
299
365
|
);
|
|
300
366
|
return { shouldLoadApp: false };
|
|
301
367
|
case "redirect": {
|
|
368
|
+
// See: https://github.com/keycloakify/keycloak-account-ui/issues/10
|
|
369
|
+
abort_case: {
|
|
370
|
+
const BASE_URL = getBASE_URL_earlyInit();
|
|
371
|
+
|
|
372
|
+
if (BASE_URL === undefined) {
|
|
373
|
+
break abort_case;
|
|
374
|
+
}
|
|
375
|
+
|
|
376
|
+
let BASE_URL_fullyQualified: string;
|
|
377
|
+
|
|
378
|
+
try {
|
|
379
|
+
BASE_URL_fullyQualified = toFullyQualifiedUrl({
|
|
380
|
+
urlish: BASE_URL,
|
|
381
|
+
doAssertNoQueryParams: true,
|
|
382
|
+
doOutputWithTrailingSlash: true
|
|
383
|
+
});
|
|
384
|
+
} catch {
|
|
385
|
+
break abort_case;
|
|
386
|
+
}
|
|
387
|
+
|
|
388
|
+
// NOTE: This should ALWAYS be true in normal circumstances.
|
|
389
|
+
if (new URL(BASE_URL_fullyQualified).pathname === location_urlObj.pathname) {
|
|
390
|
+
break abort_case;
|
|
391
|
+
}
|
|
392
|
+
|
|
393
|
+
const rootRelativeRedirectUrl = getRootRelativeRedirectUrl_strippedFromAuthResponse();
|
|
394
|
+
|
|
395
|
+
setGetRootRelativeOriginalLocationHref_earlyInit({
|
|
396
|
+
rootRelativeOriginalLocationHref: rootRelativeRedirectUrl
|
|
397
|
+
});
|
|
398
|
+
|
|
399
|
+
history.replaceState({}, "", rootRelativeRedirectUrl);
|
|
400
|
+
|
|
401
|
+
return { shouldLoadApp: true };
|
|
402
|
+
}
|
|
403
|
+
|
|
302
404
|
redirectAuthResponse = authResponse;
|
|
303
405
|
const rootRelativeRedirectUrl = (() => {
|
|
304
406
|
if (stateData.action === "login" && authResponse.error === "consent_required") {
|
|
@@ -307,6 +409,10 @@ function handleOidcCallback(): {
|
|
|
307
409
|
return stateData.rootRelativeRedirectUrl;
|
|
308
410
|
})();
|
|
309
411
|
|
|
412
|
+
setGetRootRelativeOriginalLocationHref_earlyInit({
|
|
413
|
+
rootRelativeOriginalLocationHref: rootRelativeRedirectUrl
|
|
414
|
+
});
|
|
415
|
+
|
|
310
416
|
history.replaceState({}, "", rootRelativeRedirectUrl);
|
|
311
417
|
return { shouldLoadApp: true };
|
|
312
418
|
}
|