oidc-spa 6.9.14 → 6.10.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.
Files changed (20) hide show
  1. package/oidc/OidcInitializationError.d.ts +1 -1
  2. package/oidc/OidcInitializationError.js +29 -25
  3. package/oidc/OidcInitializationError.js.map +1 -1
  4. package/oidc/createOidc.d.ts +11 -0
  5. package/oidc/createOidc.js +54 -33
  6. package/oidc/createOidc.js.map +1 -1
  7. package/oidc/loginOrGoToAuthServer.d.ts +1 -1
  8. package/oidc/loginOrGoToAuthServer.js +2 -2
  9. package/oidc/loginOrGoToAuthServer.js.map +1 -1
  10. package/package.json +3 -3
  11. package/src/oidc/OidcInitializationError.ts +30 -27
  12. package/src/oidc/createOidc.ts +75 -33
  13. package/src/oidc/loginOrGoToAuthServer.ts +3 -3
  14. package/src/tools/parseKeycloakIssuerUri.ts +6 -1
  15. package/src/tools/toFullyQualifiedUrl.ts +1 -1
  16. package/tools/parseKeycloakIssuerUri.d.ts +1 -0
  17. package/tools/parseKeycloakIssuerUri.js +5 -1
  18. package/tools/parseKeycloakIssuerUri.js.map +1 -1
  19. package/tools/toFullyQualifiedUrl.js +1 -1
  20. package/tools/toFullyQualifiedUrl.js.map +1 -1
package/oidc/OidcInitializationError.d.ts CHANGED
@@ -9,7 +9,7 @@ export declare function createWellKnownOidcConfigurationEndpointUnreachableIniti
9
9
  issuerUri: string;
10
10
  }): Promise<OidcInitializationError>;
11
11
  export declare function createIframeTimeoutInitializationError(params: {
12
- homeAndCallbackUrl: string;
12
+ callbackUri: string;
13
13
  issuerUri: string;
14
14
  clientId: string;
15
15
  }): Promise<OidcInitializationError>;
package/oidc/OidcInitializationError.js CHANGED
@@ -184,14 +184,17 @@ function createWellKnownOidcConfigurationEndpointUnreachableInitializationError(
184
184
  }
185
185
  function createIframeTimeoutInitializationError(params) {
186
186
  return __awaiter(this, void 0, void 0, function () {
187
- var homeAndCallbackUrl, issuerUri, clientId, cspOrError, csp, hasFrameAncestorsNone;
187
+ var callbackUri, issuerUri, clientId, cspOrError, csp, hasFrameAncestorsNone;
188
188
  return __generator(this, function (_a) {
189
189
  switch (_a.label) {
190
190
  case 0:
191
- homeAndCallbackUrl = params.homeAndCallbackUrl, issuerUri = params.issuerUri, clientId = params.clientId;
192
- return [4 /*yield*/, fetch(homeAndCallbackUrl).then(function (response) {
191
+ callbackUri = params.callbackUri, issuerUri = params.issuerUri, clientId = params.clientId;
192
+ if (!/^https?:\/\//.test(callbackUri)) {
193
+ return [3 /*break*/, 2];
194
+ }
195
+ return [4 /*yield*/, fetch(callbackUri).then(function (response) {
193
196
  if (!response.ok) {
194
- return new Error("".concat(homeAndCallbackUrl, " responded with a ").concat(response.status, " status code."));
197
+ return new Error("".concat(callbackUri, " responded with a ").concat(response.status, " status code."));
195
198
  }
196
199
  return response.headers.get("Content-Security-Policy");
197
200
  }, function (error) { return error; })];
@@ -220,8 +223,7 @@ function createIframeTimeoutInitializationError(params) {
220
223
  return [2 /*return*/, new OidcInitializationError({
221
224
  isAuthServerLikelyDown: false,
222
225
  messageOrCause: [
223
- "The home of your application ".concat(homeAndCallbackUrl, ", which is also used as the OIDC callback URL,"),
224
- "is currently served by your web server with the HTTP header `Content-Security-Policy: frame-ancestors none`.\n",
226
+ "".concat(callbackUri, " is currently served by your web server with the HTTP header `Content-Security-Policy: frame-ancestors none`.\n"),
225
227
  "This header prevents the silent sign-in process from working.\n",
226
228
  "To fix this issue, you need to allow your application's homepage to be iframed during the silent login flow. ",
227
229
  "For example, replacing `frame-ancestors 'none'` with `frame-ancestors 'self'` ensures your app can be embedded in an iframe on the same domain.\n",
@@ -236,7 +238,7 @@ function createIframeTimeoutInitializationError(params) {
236
238
  "add_header Content-Security-Policy $add_content_security_policy;\n",
237
239
  "```\n",
238
240
  "This way, the homepage is only iframed when the `state` parameter is present, and remains protected in all other scenarios.\n",
239
- "The URL in question is: ".concat(homeAndCallbackUrl)
241
+ "The URL in question is: ".concat(callbackUri)
240
242
  ].join(" ")
241
243
  })];
242
244
  case 2:
@@ -253,22 +255,23 @@ function createIframeTimeoutInitializationError(params) {
253
255
  "- Either the client ID \"".concat(clientId, "\" does not exist, or\n"),
254
256
  "- You forgot to add the OIDC callback URL to the list of Valid Redirect URIs.\n",
255
257
  "Client ID: \"".concat(clientId, "\"\n"),
256
- "Callback URL to add to the list of Valid Redirect URIs: \"".concat(homeAndCallbackUrl, "\"\n\n")
258
+ "Callback URL to add to the list of Valid Redirect URIs: \"".concat(callbackUri, "\"\n\n")
257
259
  ], __read((function () {
258
- var issuerUriParsed = (0, parseKeycloakIssuerUri_1.parseKeycloakIssuerUri)(issuerUri);
259
- if (!issuerUriParsed) {
260
+ var kc = (0, parseKeycloakIssuerUri_1.parseKeycloakIssuerUri)(issuerUri);
261
+ if (!kc) {
260
262
  return [
261
- "Check the documentation of your OIDC server to learn how to configure the client properly."
263
+ "Check the documentation of your OIDC server to learn how to configure the public client (Authorization Code Flow + PKCE) properly."
262
264
  ];
263
265
  }
264
266
  return [
265
267
  "It seems you are using Keycloak. Follow these steps to resolve the issue:\n\n",
266
- "1. Go to the Keycloak admin console: ".concat(issuerUriParsed.adminConsoleUrl, "/console\n"),
268
+ "1. Go to the Keycloak admin console: ".concat(kc.adminConsoleUrl_master, "\n"),
267
269
  "2. Log in as an admin user.\n",
268
- "3. In the left menu, click on \"Clients\".\n",
269
- "4. Locate the client \"".concat(clientId, "\" in the list and click on it.\n"),
270
- "5. Find \"Valid Redirect URIs\" and add \"".concat(homeAndCallbackUrl, "\" to the list.\n"),
271
- "6. Save the changes.\n\n",
270
+ "3. In the top left corner select the realm \"".concat(kc.realm, "\".\n"),
271
+ "4. In the left menu, click on \"Clients\".\n",
272
+ "5. Locate the client \"".concat(clientId, "\" in the list and click on it.\n"),
273
+ "6. Find \"Valid Redirect URIs\" and add \"".concat(callbackUri, "\" to the list.\n"),
274
+ "7. Save the changes.\n\n",
272
275
  "For more information, refer to the documentation: https://docs.oidc-spa.dev/v/v6/providers-configuration/keycloak"
273
276
  ];
274
277
  })()), false).join(" ")
@@ -288,20 +291,21 @@ function createFailedToFetchTokenEndpointInitializationError(params) {
288
291
  "in the '".concat(clientId, "' client configuration of your OIDC server.\n"),
289
292
  "\n"
290
293
  ], __read((function () {
291
- var issuerUri_parsed = (0, parseKeycloakIssuerUri_1.parseKeycloakIssuerUri)(issuerUri);
292
- if (issuerUri_parsed === undefined) {
294
+ var kc = (0, parseKeycloakIssuerUri_1.parseKeycloakIssuerUri)(issuerUri);
295
+ if (kc === undefined) {
293
296
  return [
294
- "Checkout the documentation of the OIDC server you are using to see how to configure the client properly."
297
+ "Check the documentation of your OIDC server to learn how to configure the public client (Authorization Code Flow + PKCE) properly."
295
298
  ];
296
299
  }
297
300
  return [
298
301
  "Since it seems that you are using Keycloak, here are the steps to follow:\n",
299
- "- Go to the Keycloak admin console. ".concat(issuerUri_parsed.adminConsoleUrl, "\n"),
300
- "- Log in as an admin user.\n",
301
- "- In the left menu, click on \"Clients\".\n",
302
- "- Find '".concat(clientId, "' in the list of clients and click on it.\n"),
303
- "- Find 'Web Origins' and add '".concat(window.location.origin, "' to the list.\n"),
304
- "- Save the changes.\n\n",
302
+ "1. Go to the Keycloak admin console: ".concat(kc.adminConsoleUrl_master, "\n"),
303
+ "2. Log in as an admin user.\n",
304
+ "3. In the top left corner select the realm \"".concat(kc.realm, "\".\n"),
305
+ "4. In the left menu, click on \"Clients\".\n",
306
+ "5. Find '".concat(clientId, "' in the list of clients and click on it.\n"),
307
+ "6. Find 'Web Origins' and add '".concat(window.location.origin, "' to the list.\n"),
308
+ "7. Save the changes.\n\n",
305
309
  "More info: https://docs.oidc-spa.dev/v/v6/providers-configuration/keycloak"
306
310
  ];
307
311
  })()), false).join(" ")
package/oidc/OidcInitializationError.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OidcInitializationError.js","sourceRoot":"","sources":["../src/oidc/OidcInitializationError.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OidcInitializationError.js","sourceRoot":"","sources":["../src/oidc/OidcInitializationError.ts"],"names":[],"mappings":"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"}
package/oidc/createOidc.d.ts CHANGED
@@ -64,6 +64,17 @@ export type ParamsOfCreateOidc<DecodedIdToken extends Record<string, unknown> =
64
64
  * - Other: `BASE_URL: "/"` (Usually, or `/dashboard` if your app is not at the root of the domain)
65
65
  */
66
66
  homeUrl: string;
67
+ /**
68
+ * WARNING: If you are deploying on the web, you should not set this parameter.
69
+ * The callbackUrl is the homeURl.
70
+ *
71
+ * This is only useful for when you also shipping your app as a Desktop App with Electron.
72
+ * NOTE that even in this case, it's not automatic, you still need to handle the response
73
+ * in the electron node process.
74
+ *
75
+ * Example: __callbackUri: "myapp://oidc-callback/"
76
+ */
77
+ __callbackUri?: string;
67
78
  decodedIdTokenSchema?: {
68
79
  parse: (data: unknown) => DecodedIdToken;
69
80
  };
package/oidc/createOidc.js CHANGED
@@ -124,7 +124,7 @@ var initialLocationHref_1 = require("./initialLocationHref");
124
124
  var isNewBrowserSession_1 = require("./isNewBrowserSession");
125
125
  (0, handleOidcCallback_1.handleOidcCallback)();
126
126
  // NOTE: Replaced at build time
127
- var VERSION = "6.9.14";
127
+ var VERSION = "6.10.1";
128
128
  var globalContext = {
129
129
  prOidcByConfigId: new Map(),
130
130
  hasLogoutBeenCalled: (0, tsafe_1.id)(false),
@@ -216,12 +216,12 @@ function createOidc(params) {
216
216
  }
217
217
  function createOidc_nonMemoized(params, preProcessedParams) {
218
218
  return __awaiter(this, void 0, void 0, function () {
219
- var transformUrlBeforeRedirect_next, transformUrlBeforeRedirect, extraQueryParamsOrGetter, extraTokenParamsOrGetter, homeUrl_params, decodedIdTokenSchema, __unsafe_ssoSessionIdleSeconds, _a, idleSessionLifetimeInSeconds, _b, autoLogoutParams, _c, autoLogin, postLoginRedirectUrl_default, __unsafe_clientSecret, _d, __unsafe_useIdTokenAsAccessToken, issuerUri, clientId, scopes, configId, log, getExtraQueryParams, getExtraTokenParams, homeAndCallbackUrl, isHandled, stateQueryParamValue_instance, areThirdPartyCookiesAllowed, url1, url2, isUserStoreInMemoryOnly, oidcClientTsUserManager, evtIsUserLoggedIn, loginOrGoToAuthServer, getIsNewBrowserSession, completeLoginOrRefreshProcess, resultOfLoginProcess, oidc_common, oidc_notLoggedIn, prOtherTabLogin, currentTokens, autoLogoutCountdownTickCallbacks, onTokenChanges, _e, sessionId, subjectId, oidc_loggedIn, prOtherTabLogout, startCountdown_2, stopCountdown_1, evtIsUserActive;
219
+ var transformUrlBeforeRedirect_next, transformUrlBeforeRedirect, extraQueryParamsOrGetter, extraTokenParamsOrGetter, homeUrl_params, __callbackUri, decodedIdTokenSchema, __unsafe_ssoSessionIdleSeconds, _a, idleSessionLifetimeInSeconds, _b, autoLogoutParams, _c, autoLogin, postLoginRedirectUrl_default, __unsafe_clientSecret, _d, __unsafe_useIdTokenAsAccessToken, issuerUri, clientId, scopes, configId, log, getExtraQueryParams, getExtraTokenParams, homeUrl, callbackUri, isHandled, stateQueryParamValue_instance, isOidcServerThirdPartyRelativeToApp, url1, url2, isUserStoreInMemoryOnly, oidcClientTsUserManager, evtIsUserLoggedIn, loginOrGoToAuthServer, getIsNewBrowserSession, completeLoginOrRefreshProcess, resultOfLoginProcess, oidc_common, oidc_notLoggedIn, prOtherTabLogin, currentTokens, autoLogoutCountdownTickCallbacks, onTokenChanges, _e, sessionId, subjectId, oidc_loggedIn, prOtherTabLogout, startCountdown_2, stopCountdown_1, evtIsUserActive;
220
220
  var _this = this;
221
221
  return __generator(this, function (_f) {
222
222
  switch (_f.label) {
223
223
  case 0:
224
- transformUrlBeforeRedirect_next = params.transformUrlBeforeRedirect_next, transformUrlBeforeRedirect = params.transformUrlBeforeRedirect, extraQueryParamsOrGetter = params.extraQueryParams, extraTokenParamsOrGetter = params.extraTokenParams, homeUrl_params = params.homeUrl, decodedIdTokenSchema = params.decodedIdTokenSchema, __unsafe_ssoSessionIdleSeconds = params.__unsafe_ssoSessionIdleSeconds, _a = params.idleSessionLifetimeInSeconds, idleSessionLifetimeInSeconds = _a === void 0 ? __unsafe_ssoSessionIdleSeconds : _a, _b = params.autoLogoutParams, autoLogoutParams = _b === void 0 ? { redirectTo: "current page" } : _b, _c = params.autoLogin, autoLogin = _c === void 0 ? false : _c, postLoginRedirectUrl_default = params.postLoginRedirectUrl, __unsafe_clientSecret = params.__unsafe_clientSecret, _d = params.__unsafe_useIdTokenAsAccessToken, __unsafe_useIdTokenAsAccessToken = _d === void 0 ? false : _d;
224
+ transformUrlBeforeRedirect_next = params.transformUrlBeforeRedirect_next, transformUrlBeforeRedirect = params.transformUrlBeforeRedirect, extraQueryParamsOrGetter = params.extraQueryParams, extraTokenParamsOrGetter = params.extraTokenParams, homeUrl_params = params.homeUrl, __callbackUri = params.__callbackUri, decodedIdTokenSchema = params.decodedIdTokenSchema, __unsafe_ssoSessionIdleSeconds = params.__unsafe_ssoSessionIdleSeconds, _a = params.idleSessionLifetimeInSeconds, idleSessionLifetimeInSeconds = _a === void 0 ? __unsafe_ssoSessionIdleSeconds : _a, _b = params.autoLogoutParams, autoLogoutParams = _b === void 0 ? { redirectTo: "current page" } : _b, _c = params.autoLogin, autoLogin = _c === void 0 ? false : _c, postLoginRedirectUrl_default = params.postLoginRedirectUrl, __unsafe_clientSecret = params.__unsafe_clientSecret, _d = params.__unsafe_useIdTokenAsAccessToken, __unsafe_useIdTokenAsAccessToken = _d === void 0 ? false : _d;
225
225
  issuerUri = preProcessedParams.issuerUri, clientId = preProcessedParams.clientId, scopes = preProcessedParams.scopes, configId = preProcessedParams.configId, log = preProcessedParams.log;
226
226
  getExtraQueryParams = (function () {
227
227
  if (extraQueryParamsOrGetter === undefined) {
@@ -241,17 +241,23 @@ function createOidc_nonMemoized(params, preProcessedParams) {
241
241
  }
242
242
  return extraTokenParamsOrGetter;
243
243
  })();
244
- homeAndCallbackUrl = (0, toFullyQualifiedUrl_1.toFullyQualifiedUrl)({
244
+ homeUrl = (0, toFullyQualifiedUrl_1.toFullyQualifiedUrl)({
245
245
  urlish: homeUrl_params,
246
246
  doAssertNoQueryParams: true,
247
247
  doOutputWithTrailingSlash: true
248
248
  });
249
+ callbackUri = (0, toFullyQualifiedUrl_1.toFullyQualifiedUrl)({
250
+ urlish: __callbackUri !== null && __callbackUri !== void 0 ? __callbackUri : homeUrl,
251
+ doAssertNoQueryParams: true,
252
+ doOutputWithTrailingSlash: true
253
+ });
249
254
  log === null || log === void 0 ? void 0 : log("Calling createOidc v".concat(VERSION, " ").concat(JSON.stringify({
250
255
  issuerUri: issuerUri,
251
256
  clientId: clientId,
252
257
  scopes: scopes,
253
258
  configId: configId,
254
- homeAndCallbackUrl: homeAndCallbackUrl
259
+ homeUrl: homeUrl,
260
+ callbackUri: callbackUri
255
261
  }, null, 2)));
256
262
  isHandled = (0, handleOidcCallback_1.handleOidcCallback)().isHandled;
257
263
  if (!isHandled) return [3 /*break*/, 2];
@@ -264,34 +270,34 @@ function createOidc_nonMemoized(params, preProcessedParams) {
264
270
  {
265
271
  url1 = window.location.origin;
266
272
  url2 = issuerUri;
267
- areThirdPartyCookiesAllowed = (0, haveSharedParentDomain_1.getHaveSharedParentDomain)({
268
- url1: url1,
269
- url2: url2
270
- });
271
- if (areThirdPartyCookiesAllowed) {
272
- log === null || log === void 0 ? void 0 : log("".concat(url1, " and ").concat(url2, " have shared parent domain, third party cookies are allowed"));
273
- }
274
- else {
273
+ isOidcServerThirdPartyRelativeToApp =
274
+ (0, haveSharedParentDomain_1.getHaveSharedParentDomain)({
275
+ url1: url1,
276
+ url2: url2
277
+ }) === false;
278
+ if (isOidcServerThirdPartyRelativeToApp) {
275
279
  log === null || log === void 0 ? void 0 : log([
276
- "".concat(url1, " and ").concat(url2, " don't have shared parent domain, setting third party cookies"),
277
- "on the auth server domain might not work. Making sure that everything works smoothly regardless",
278
- "by allowing oidc-spa to store the auth state in the session storage for a limited period of time."
280
+ "".concat(url1, " and ").concat(url2, " don't have shared parent domain, silent signin in iframe (unless in chrome in dev mode) is not possible."),
281
+ "oidc-spa will have to fully reload the app to restore the auth state."
279
282
  ].join(" "));
280
283
  }
284
+ else {
285
+ log === null || log === void 0 ? void 0 : log("".concat(url1, " and ").concat(url2, " have shared parent domain silent signin in iframe is possible"));
286
+ }
281
287
  }
282
288
  oidcClientTsUserManager = new oidc_client_ts_and_jwt_decode_1.UserManager({
283
289
  stateQueryParamValue: stateQueryParamValue_instance,
284
290
  authority: issuerUri,
285
291
  client_id: clientId,
286
- redirect_uri: homeAndCallbackUrl,
287
- silent_redirect_uri: homeAndCallbackUrl,
288
- post_logout_redirect_uri: homeAndCallbackUrl,
292
+ redirect_uri: callbackUri,
293
+ silent_redirect_uri: callbackUri,
294
+ post_logout_redirect_uri: callbackUri,
289
295
  response_type: "code",
290
296
  scope: Array.from(new Set(__spreadArray(["openid"], __read(scopes), false))).join(" "),
291
297
  automaticSilentRenew: false,
292
298
  userStore: new oidc_client_ts_and_jwt_decode_1.WebStorageStateStore({
293
299
  store: (function () {
294
- if (areThirdPartyCookiesAllowed) {
300
+ if (!isOidcServerThirdPartyRelativeToApp) {
295
301
  isUserStoreInMemoryOnly = true;
296
302
  return new oidc_client_ts_and_jwt_decode_1.InMemoryWebStorage();
297
303
  }
@@ -321,7 +327,7 @@ function createOidc_nonMemoized(params, preProcessedParams) {
321
327
  transformUrlBeforeRedirect_next: transformUrlBeforeRedirect_next,
322
328
  getExtraQueryParams: getExtraQueryParams,
323
329
  getExtraTokenParams: getExtraTokenParams,
324
- homeAndCallbackUrl: homeAndCallbackUrl,
330
+ homeUrl: homeUrl,
325
331
  evtIsUserLoggedIn: evtIsUserLoggedIn,
326
332
  log: log
327
333
  }).loginOrGoToAuthServer;
@@ -472,7 +478,6 @@ function createOidc_nonMemoized(params, preProcessedParams) {
472
478
  backFromAuthServer: undefined
473
479
  }];
474
480
  case 22:
475
- log === null || log === void 0 ? void 0 : log("Trying to restore the auth from the http only cookie (silent signin with iframe)");
476
481
  persistedAuthState_2 = (0, persistedAuthState_1.getPersistedAuthState)({ configId: configId });
477
482
  if (persistedAuthState_2 === "explicitly logged out" && !autoLogin) {
478
483
  log === null || log === void 0 ? void 0 : log("Skipping silent signin with iframe, the user has logged out");
@@ -483,6 +488,18 @@ function createOidc_nonMemoized(params, preProcessedParams) {
483
488
  if (persistedAuthState_2 === "explicitly logged out") {
484
489
  return [3 /*break*/, 27];
485
490
  }
491
+ if (isOidcServerThirdPartyRelativeToApp) {
492
+ // NOTE: Electron
493
+ if (!/https?:\/\//.test(homeUrl)) {
494
+ log === null || log === void 0 ? void 0 : log("Skipping silent signin with iframe, custom protocol");
495
+ return [3 /*break*/, 27];
496
+ }
497
+ if (!homeUrl.startsWith("http://localhost")) {
498
+ log === null || log === void 0 ? void 0 : log("Skipping silent signin with iframe, third party cookies are are not allowed so we know this won't work");
499
+ return [3 /*break*/, 27];
500
+ }
501
+ }
502
+ log === null || log === void 0 ? void 0 : log("Trying to restore the auth from the http only cookie (silent signin with iframe)");
486
503
  return [4 /*yield*/, (0, loginSilent_1.loginSilent)({
487
504
  oidcClientTsUserManager: oidcClientTsUserManager,
488
505
  stateQueryParamValue_instance: stateQueryParamValue_instance,
@@ -502,7 +519,7 @@ function createOidc_nonMemoized(params, preProcessedParams) {
502
519
  })];
503
520
  case "timeout":
504
521
  return [2 /*return*/, (0, OidcInitializationError_1.createIframeTimeoutInitializationError)({
505
- homeAndCallbackUrl: homeAndCallbackUrl,
522
+ callbackUri: callbackUri,
506
523
  clientId: clientId,
507
524
  issuerUri: issuerUri
508
525
  })];
@@ -537,10 +554,12 @@ function createOidc_nonMemoized(params, preProcessedParams) {
537
554
  if (!(oidcClientTsUser === undefined)) return [3 /*break*/, 31];
538
555
  if (!(autoLogin ||
539
556
  (persistedAuthState_2 === "logged in" &&
540
- (authResponse_error === "interaction_required" ||
557
+ (authResponse_error === undefined ||
558
+ authResponse_error === "interaction_required" ||
541
559
  authResponse_error === "login_required" ||
542
560
  authResponse_error === "consent_required" ||
543
561
  authResponse_error === "account_selection_required")))) return [3 /*break*/, 30];
562
+ log === null || log === void 0 ? void 0 : log("Performing auto login with redirect");
544
563
  (0, persistedAuthState_1.persistAuthState)({ configId: configId, state: undefined });
545
564
  completeLoginOrRefreshProcess();
546
565
  if (autoLogin && persistedAuthState_2 !== "logged in") {
@@ -580,12 +599,14 @@ function createOidc_nonMemoized(params, preProcessedParams) {
580
599
  (0, tsafe_1.assert)(false);
581
600
  _e.label = 30;
582
601
  case 30:
583
- log === null || log === void 0 ? void 0 : log([
584
- "The auth server responded with: ".concat(authResponse_error, " "),
585
- "login_required" === authResponse_error
586
- ? "(login_required just means that there's no active session for the user)"
587
- : ""
588
- ].join(""));
602
+ if (authResponse_error !== undefined) {
603
+ log === null || log === void 0 ? void 0 : log([
604
+ "The auth server responded with: ".concat(authResponse_error, " "),
605
+ "login_required" === authResponse_error
606
+ ? "(login_required just means that there's no active session for the user)"
607
+ : ""
608
+ ].join(""));
609
+ }
589
610
  return [3 /*break*/, 32];
590
611
  case 31:
591
612
  log === null || log === void 0 ? void 0 : log("Successful silent signed in");
@@ -712,7 +733,7 @@ function createOidc_nonMemoized(params, preProcessedParams) {
712
733
  if ((0, persistedAuthState_1.getPersistedAuthState)({ configId: configId }) !== undefined) {
713
734
  (0, persistedAuthState_1.persistAuthState)({ configId: configId, state: undefined });
714
735
  }
715
- if (!areThirdPartyCookiesAllowed) {
736
+ if (isOidcServerThirdPartyRelativeToApp) {
716
737
  (0, persistedAuthState_1.persistAuthState)({
717
738
  configId: configId,
718
739
  state: {
@@ -754,7 +775,7 @@ function createOidc_nonMemoized(params, preProcessedParams) {
754
775
  case "current page":
755
776
  return window.location.href;
756
777
  case "home":
757
- return homeAndCallbackUrl;
778
+ return homeUrl;
758
779
  case "specific url":
759
780
  return (0, toFullyQualifiedUrl_1.toFullyQualifiedUrl)({
760
781
  urlish: params.url,
@@ -1014,7 +1035,7 @@ function createOidc_nonMemoized(params, preProcessedParams) {
1014
1035
  {
1015
1036
  prOtherTabLogout = (0, logoutPropagationToOtherTabs_1.getPrOtherTabLogout)({
1016
1037
  configId: configId,
1017
- homeUrl: homeAndCallbackUrl,
1038
+ homeUrl: homeUrl,
1018
1039
  sessionId: sessionId
1019
1040
  }).prOtherTabLogout;
1020
1041
  prOtherTabLogout.then(function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
package/oidc/createOidc.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"createOidc.js","sourceRoot":"","sources":["../src/oidc/createOidc.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"createOidc.js","sourceRoot":"","sources":["../src/oidc/createOidc.ts"],"names":[],"mappings":"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"}
package/oidc/loginOrGoToAuthServer.d.ts CHANGED
@@ -32,7 +32,7 @@ export declare function createLoginOrGoToAuthServer(params: {
32
32
  url: string;
33
33
  }) => Record<string, string | undefined>) | undefined;
34
34
  getExtraTokenParams: (() => Record<string, string | undefined>) | undefined;
35
- homeAndCallbackUrl: string;
35
+ homeUrl: string;
36
36
  evtIsUserLoggedIn: NonPostableEvt<boolean>;
37
37
  log: typeof console.log | undefined;
38
38
  }): {
package/oidc/loginOrGoToAuthServer.js CHANGED
@@ -68,7 +68,7 @@ function getPrSafelyRestoredFromBfCacheAfterLoginBackNavigation() {
68
68
  return dOut.pr;
69
69
  }
70
70
  function createLoginOrGoToAuthServer(params) {
71
- var configId = params.configId, oidcClientTsUserManager = params.oidcClientTsUserManager, transformUrlBeforeRedirect = params.transformUrlBeforeRedirect, transformUrlBeforeRedirect_next = params.transformUrlBeforeRedirect_next, getExtraQueryParams = params.getExtraQueryParams, getExtraTokenParams = params.getExtraTokenParams, homeAndCallbackUrl = params.homeAndCallbackUrl, evtIsUserLoggedIn = params.evtIsUserLoggedIn, log = params.log;
71
+ var configId = params.configId, oidcClientTsUserManager = params.oidcClientTsUserManager, transformUrlBeforeRedirect = params.transformUrlBeforeRedirect, transformUrlBeforeRedirect_next = params.transformUrlBeforeRedirect_next, getExtraQueryParams = params.getExtraQueryParams, getExtraTokenParams = params.getExtraTokenParams, homeUrl = params.homeUrl, evtIsUserLoggedIn = params.evtIsUserLoggedIn, log = params.log;
72
72
  var LOCAL_STORAGE_KEY_TO_CLEAR_WHEN_USER_LOGGED_IN = "oidc-spa.login-redirect-initiated:".concat(configId);
73
73
  var lastPublicUrl = undefined;
74
74
  function loginOrGoToAuthServer(params) {
@@ -134,7 +134,7 @@ function createLoginOrGoToAuthServer(params) {
134
134
  redirectUrl_consentRequiredCase: (function () {
135
135
  switch (rest.action) {
136
136
  case "login":
137
- return lastPublicUrl !== null && lastPublicUrl !== void 0 ? lastPublicUrl : homeAndCallbackUrl;
137
+ return lastPublicUrl !== null && lastPublicUrl !== void 0 ? lastPublicUrl : homeUrl;
138
138
  case "go to auth server":
139
139
  return redirectUrl;
140
140
  }
package/oidc/loginOrGoToAuthServer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"loginOrGoToAuthServer.js","sourceRoot":"","sources":["../src/oidc/loginOrGoToAuthServer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loginOrGoToAuthServer.js","sourceRoot":"","sources":["../src/oidc/loginOrGoToAuthServer.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oidc-spa",
3
- "version": "6.9.14",
3
+ "version": "6.10.1",
4
4
  "description": "Openidconnect client for Single Page Applications",
5
5
  "repository": {
6
6
  "type": "git",
@@ -325,7 +325,7 @@
325
325
  "@types/node": "^20.2.1",
326
326
  "@types/node-fetch": "2.6.11",
327
327
  "@types/node-jose": "1.1.13",
328
- "@types/react": "19.0.11",
328
+ "@types/react": "18.2.51",
329
329
  "babel-loader": "9.1.3",
330
330
  "evt": "^2.5.7",
331
331
  "husky": "^4.3.8",
@@ -338,7 +338,7 @@
338
338
  "patch-package": "^8.0.0",
339
339
  "prettier": "^2.8.8",
340
340
  "punycode": "^2.3.1",
341
- "react": "19.0.0",
341
+ "react": "18.2.0",
342
342
  "ts-node": "^10.9.1",
343
343
  "tsafe": "^1.8.5",
344
344
  "tsx": "^4.15.5",
package/src/oidc/OidcInitializationError.ts CHANGED
@@ -107,19 +107,21 @@ export async function createWellKnownOidcConfigurationEndpointUnreachableInitial
107
107
  }
108
108
 
109
109
  export async function createIframeTimeoutInitializationError(params: {
110
- homeAndCallbackUrl: string;
110
+ callbackUri: string;
111
111
  issuerUri: string;
112
112
  clientId: string;
113
113
  }): Promise<OidcInitializationError> {
114
- const { homeAndCallbackUrl, issuerUri, clientId } = params;
114
+ const { callbackUri, issuerUri, clientId } = params;
115
115
 
116
116
  frame_ancestors_none: {
117
- const cspOrError = await fetch(homeAndCallbackUrl).then(
117
+ if (!/^https?:\/\//.test(callbackUri)) {
118
+ break frame_ancestors_none;
119
+ }
120
+
121
+ const cspOrError = await fetch(callbackUri).then(
118
122
  response => {
119
123
  if (!response.ok) {
120
- return new Error(
121
- `${homeAndCallbackUrl} responded with a ${response.status} status code.`
122
- );
124
+ return new Error(`${callbackUri} responded with a ${response.status} status code.`);
123
125
  }
124
126
 
125
127
  return response.headers.get("Content-Security-Policy");
@@ -157,8 +159,7 @@ export async function createIframeTimeoutInitializationError(params: {
157
159
  return new OidcInitializationError({
158
160
  isAuthServerLikelyDown: false,
159
161
  messageOrCause: [
160
- `The home of your application ${homeAndCallbackUrl}, which is also used as the OIDC callback URL,`,
161
- "is currently served by your web server with the HTTP header `Content-Security-Policy: frame-ancestors none`.\n",
162
+ `${callbackUri} is currently served by your web server with the HTTP header \`Content-Security-Policy: frame-ancestors none\`.\n`,
162
163
  "This header prevents the silent sign-in process from working.\n",
163
164
  "To fix this issue, you need to allow your application's homepage to be iframed during the silent login flow. ",
164
165
  "For example, replacing `frame-ancestors 'none'` with `frame-ancestors 'self'` ensures your app can be embedded in an iframe on the same domain.\n",
@@ -173,7 +174,7 @@ export async function createIframeTimeoutInitializationError(params: {
173
174
  "add_header Content-Security-Policy $add_content_security_policy;\n",
174
175
  "```\n",
175
176
  "This way, the homepage is only iframed when the `state` parameter is present, and remains protected in all other scenarios.\n",
176
- `The URL in question is: ${homeAndCallbackUrl}`
177
+ `The URL in question is: ${callbackUri}`
177
178
  ].join(" ")
178
179
  });
179
180
  }
@@ -191,24 +192,25 @@ export async function createIframeTimeoutInitializationError(params: {
191
192
  `- Either the client ID "${clientId}" does not exist, or\n`,
192
193
  `- You forgot to add the OIDC callback URL to the list of Valid Redirect URIs.\n`,
193
194
  `Client ID: "${clientId}"\n`,
194
- `Callback URL to add to the list of Valid Redirect URIs: "${homeAndCallbackUrl}"\n\n`,
195
+ `Callback URL to add to the list of Valid Redirect URIs: "${callbackUri}"\n\n`,
195
196
  ...(() => {
196
- const issuerUriParsed = parseKeycloakIssuerUri(issuerUri);
197
+ const kc = parseKeycloakIssuerUri(issuerUri);
197
198
 
198
- if (!issuerUriParsed) {
199
+ if (!kc) {
199
200
  return [
200
- "Check the documentation of your OIDC server to learn how to configure the client properly."
201
+ "Check the documentation of your OIDC server to learn how to configure the public client (Authorization Code Flow + PKCE) properly."
201
202
  ];
202
203
  }
203
204
 
204
205
  return [
205
206
  `It seems you are using Keycloak. Follow these steps to resolve the issue:\n\n`,
206
- `1. Go to the Keycloak admin console: ${issuerUriParsed.adminConsoleUrl}/console\n`,
207
+ `1. Go to the Keycloak admin console: ${kc.adminConsoleUrl_master}\n`,
207
208
  `2. Log in as an admin user.\n`,
208
- `3. In the left menu, click on "Clients".\n`,
209
- `4. Locate the client "${clientId}" in the list and click on it.\n`,
210
- `5. Find "Valid Redirect URIs" and add "${homeAndCallbackUrl}" to the list.\n`,
211
- `6. Save the changes.\n\n`,
209
+ `3. In the top left corner select the realm "${kc.realm}".\n`,
210
+ `4. In the left menu, click on "Clients".\n`,
211
+ `5. Locate the client "${clientId}" in the list and click on it.\n`,
212
+ `6. Find "Valid Redirect URIs" and add "${callbackUri}" to the list.\n`,
213
+ `7. Save the changes.\n\n`,
212
214
  `For more information, refer to the documentation: https://docs.oidc-spa.dev/v/v6/providers-configuration/keycloak`
213
215
  ];
214
216
  })()
@@ -231,22 +233,23 @@ export function createFailedToFetchTokenEndpointInitializationError(params: {
231
233
  `in the '${clientId}' client configuration of your OIDC server.\n`,
232
234
  "\n",
233
235
  ...(() => {
234
- const issuerUri_parsed = parseKeycloakIssuerUri(issuerUri);
236
+ const kc = parseKeycloakIssuerUri(issuerUri);
235
237
 
236
- if (issuerUri_parsed === undefined) {
238
+ if (kc === undefined) {
237
239
  return [
238
- "Checkout the documentation of the OIDC server you are using to see how to configure the client properly."
240
+ "Check the documentation of your OIDC server to learn how to configure the public client (Authorization Code Flow + PKCE) properly."
239
241
  ];
240
242
  }
241
243
 
242
244
  return [
243
245
  `Since it seems that you are using Keycloak, here are the steps to follow:\n`,
244
- `- Go to the Keycloak admin console. ${issuerUri_parsed.adminConsoleUrl}\n`,
245
- `- Log in as an admin user.\n`,
246
- `- In the left menu, click on "Clients".\n`,
247
- `- Find '${clientId}' in the list of clients and click on it.\n`,
248
- `- Find 'Web Origins' and add '${window.location.origin}' to the list.\n`,
249
- `- Save the changes.\n\n`,
246
+ `1. Go to the Keycloak admin console: ${kc.adminConsoleUrl_master}\n`,
247
+ `2. Log in as an admin user.\n`,
248
+ `3. In the top left corner select the realm "${kc.realm}".\n`,
249
+ `4. In the left menu, click on "Clients".\n`,
250
+ `5. Find '${clientId}' in the list of clients and click on it.\n`,
251
+ `6. Find 'Web Origins' and add '${window.location.origin}' to the list.\n`,
252
+ `7. Save the changes.\n\n`,
250
253
  `More info: https://docs.oidc-spa.dev/v/v6/providers-configuration/keycloak`
251
254
  ];
252
255
  })()
package/src/oidc/createOidc.ts CHANGED
@@ -118,6 +118,18 @@ export type ParamsOfCreateOidc<
118
118
  */
119
119
  homeUrl: string;
120
120
 
121
+ /**
122
+ * WARNING: If you are deploying on the web, you should not set this parameter.
123
+ * The callbackUrl is the homeURl.
124
+ *
125
+ * This is only useful for when you also shipping your app as a Desktop App with Electron.
126
+ * NOTE that even in this case, it's not automatic, you still need to handle the response
127
+ * in the electron node process.
128
+ *
129
+ * Example: __callbackUri: "myapp://oidc-callback/"
130
+ */
131
+ __callbackUri?: string;
132
+
121
133
  decodedIdTokenSchema?: { parse: (data: unknown) => DecodedIdToken };
122
134
  /**
123
135
  * @deprecated: Use idleSessionLifetimeInSeconds instead
@@ -266,6 +278,7 @@ export async function createOidc_nonMemoized<
266
278
  extraQueryParams: extraQueryParamsOrGetter,
267
279
  extraTokenParams: extraTokenParamsOrGetter,
268
280
  homeUrl: homeUrl_params,
281
+ __callbackUri,
269
282
  decodedIdTokenSchema,
270
283
  __unsafe_ssoSessionIdleSeconds,
271
284
  idleSessionLifetimeInSeconds = __unsafe_ssoSessionIdleSeconds,
@@ -302,12 +315,18 @@ export async function createOidc_nonMemoized<
302
315
  return extraTokenParamsOrGetter;
303
316
  })();
304
317
 
305
- const homeAndCallbackUrl = toFullyQualifiedUrl({
318
+ const homeUrl = toFullyQualifiedUrl({
306
319
  urlish: homeUrl_params,
307
320
  doAssertNoQueryParams: true,
308
321
  doOutputWithTrailingSlash: true
309
322
  });
310
323
 
324
+ const callbackUri = toFullyQualifiedUrl({
325
+ urlish: __callbackUri ?? homeUrl,
326
+ doAssertNoQueryParams: true,
327
+ doOutputWithTrailingSlash: true
328
+ });
329
+
311
330
  log?.(
312
331
  `Calling createOidc v${VERSION} ${JSON.stringify(
313
332
  {
@@ -315,7 +334,8 @@ export async function createOidc_nonMemoized<
315
334
  clientId,
316
335
  scopes,
317
336
  configId,
318
- homeAndCallbackUrl
337
+ homeUrl,
338
+ callbackUri
319
339
  },
320
340
  null,
321
341
  2
@@ -332,26 +352,26 @@ export async function createOidc_nonMemoized<
332
352
 
333
353
  const stateQueryParamValue_instance = generateStateQueryParamValue();
334
354
 
335
- let areThirdPartyCookiesAllowed: boolean;
355
+ let isOidcServerThirdPartyRelativeToApp: boolean;
336
356
  {
337
357
  const url1 = window.location.origin;
338
358
  const url2 = issuerUri;
339
359
 
340
- areThirdPartyCookiesAllowed = getHaveSharedParentDomain({
341
- url1,
342
- url2
343
- });
360
+ isOidcServerThirdPartyRelativeToApp =
361
+ getHaveSharedParentDomain({
362
+ url1,
363
+ url2
364
+ }) === false;
344
365
 
345
- if (areThirdPartyCookiesAllowed) {
346
- log?.(`${url1} and ${url2} have shared parent domain, third party cookies are allowed`);
347
- } else {
366
+ if (isOidcServerThirdPartyRelativeToApp) {
348
367
  log?.(
349
368
  [
350
- `${url1} and ${url2} don't have shared parent domain, setting third party cookies`,
351
- `on the auth server domain might not work. Making sure that everything works smoothly regardless`,
352
- `by allowing oidc-spa to store the auth state in the session storage for a limited period of time.`
369
+ `${url1} and ${url2} don't have shared parent domain, silent signin in iframe (unless in chrome in dev mode) is not possible.`,
370
+ "oidc-spa will have to fully reload the app to restore the auth state."
353
371
  ].join(" ")
354
372
  );
373
+ } else {
374
+ log?.(`${url1} and ${url2} have shared parent domain silent signin in iframe is possible`);
355
375
  }
356
376
  }
357
377
 
@@ -361,15 +381,15 @@ export async function createOidc_nonMemoized<
361
381
  stateQueryParamValue: stateQueryParamValue_instance,
362
382
  authority: issuerUri,
363
383
  client_id: clientId,
364
- redirect_uri: homeAndCallbackUrl,
365
- silent_redirect_uri: homeAndCallbackUrl,
366
- post_logout_redirect_uri: homeAndCallbackUrl,
384
+ redirect_uri: callbackUri,
385
+ silent_redirect_uri: callbackUri,
386
+ post_logout_redirect_uri: callbackUri,
367
387
  response_type: "code",
368
388
  scope: Array.from(new Set(["openid", ...scopes])).join(" "),
369
389
  automaticSilentRenew: false,
370
390
  userStore: new WebStorageStateStore({
371
391
  store: (() => {
372
- if (areThirdPartyCookiesAllowed) {
392
+ if (!isOidcServerThirdPartyRelativeToApp) {
373
393
  isUserStoreInMemoryOnly = true;
374
394
  return new InMemoryWebStorage();
375
395
  }
@@ -406,7 +426,7 @@ export async function createOidc_nonMemoized<
406
426
  transformUrlBeforeRedirect_next,
407
427
  getExtraQueryParams,
408
428
  getExtraTokenParams,
409
- homeAndCallbackUrl,
429
+ homeUrl,
410
430
  evtIsUserLoggedIn,
411
431
  log
412
432
  });
@@ -576,8 +596,6 @@ export async function createOidc_nonMemoized<
576
596
  }
577
597
 
578
598
  silent_login_if_possible_and_auto_login: {
579
- log?.("Trying to restore the auth from the http only cookie (silent signin with iframe)");
580
-
581
599
  const persistedAuthState = getPersistedAuthState({ configId });
582
600
 
583
601
  if (persistedAuthState === "explicitly logged out" && !autoLogin) {
@@ -593,6 +611,25 @@ export async function createOidc_nonMemoized<
593
611
  break actual_silent_signin;
594
612
  }
595
613
 
614
+ if (isOidcServerThirdPartyRelativeToApp) {
615
+ // NOTE: Electron
616
+ if (!/https?:\/\//.test(homeUrl)) {
617
+ log?.("Skipping silent signin with iframe, custom protocol");
618
+ break actual_silent_signin;
619
+ }
620
+
621
+ if (!homeUrl.startsWith("http://localhost")) {
622
+ log?.(
623
+ "Skipping silent signin with iframe, third party cookies are are not allowed so we know this won't work"
624
+ );
625
+ break actual_silent_signin;
626
+ }
627
+ }
628
+
629
+ log?.(
630
+ "Trying to restore the auth from the http only cookie (silent signin with iframe)"
631
+ );
632
+
596
633
  const result_loginSilent = await loginSilent({
597
634
  oidcClientTsUserManager,
598
635
  stateQueryParamValue_instance,
@@ -614,7 +651,7 @@ export async function createOidc_nonMemoized<
614
651
  );
615
652
  case "timeout":
616
653
  return createIframeTimeoutInitializationError({
617
- homeAndCallbackUrl,
654
+ callbackUri,
618
655
  clientId,
619
656
  issuerUri
620
657
  });
@@ -655,11 +692,14 @@ export async function createOidc_nonMemoized<
655
692
  if (
656
693
  autoLogin ||
657
694
  (persistedAuthState === "logged in" &&
658
- (authResponse_error === "interaction_required" ||
695
+ (authResponse_error === undefined ||
696
+ authResponse_error === "interaction_required" ||
659
697
  authResponse_error === "login_required" ||
660
698
  authResponse_error === "consent_required" ||
661
699
  authResponse_error === "account_selection_required"))
662
700
  ) {
701
+ log?.("Performing auto login with redirect");
702
+
663
703
  persistAuthState({ configId, state: undefined });
664
704
 
665
705
  completeLoginOrRefreshProcess();
@@ -702,14 +742,16 @@ export async function createOidc_nonMemoized<
702
742
  assert(false);
703
743
  }
704
744
 
705
- log?.(
706
- [
707
- `The auth server responded with: ${authResponse_error} `,
708
- "login_required" === authResponse_error
709
- ? `(login_required just means that there's no active session for the user)`
710
- : ""
711
- ].join("")
712
- );
745
+ if (authResponse_error !== undefined) {
746
+ log?.(
747
+ [
748
+ `The auth server responded with: ${authResponse_error} `,
749
+ "login_required" === authResponse_error
750
+ ? `(login_required just means that there's no active session for the user)`
751
+ : ""
752
+ ].join("")
753
+ );
754
+ }
713
755
 
714
756
  break silent_login_if_possible_and_auto_login;
715
757
  }
@@ -863,7 +905,7 @@ export async function createOidc_nonMemoized<
863
905
  persistAuthState({ configId, state: undefined });
864
906
  }
865
907
 
866
- if (!areThirdPartyCookiesAllowed) {
908
+ if (isOidcServerThirdPartyRelativeToApp) {
867
909
  persistAuthState({
868
910
  configId,
869
911
  state: {
@@ -912,7 +954,7 @@ export async function createOidc_nonMemoized<
912
954
  case "current page":
913
955
  return window.location.href;
914
956
  case "home":
915
- return homeAndCallbackUrl;
957
+ return homeUrl;
916
958
  case "specific url":
917
959
  return toFullyQualifiedUrl({
918
960
  urlish: params.url,
@@ -1185,7 +1227,7 @@ export async function createOidc_nonMemoized<
1185
1227
  {
1186
1228
  const { prOtherTabLogout } = getPrOtherTabLogout({
1187
1229
  configId,
1188
- homeUrl: homeAndCallbackUrl,
1230
+ homeUrl,
1189
1231
  sessionId
1190
1232
  });
1191
1233
 
package/src/oidc/loginOrGoToAuthServer.ts CHANGED
@@ -62,7 +62,7 @@ export function createLoginOrGoToAuthServer(params: {
62
62
 
63
63
  getExtraTokenParams: (() => Record<string, string | undefined>) | undefined;
64
64
 
65
- homeAndCallbackUrl: string;
65
+ homeUrl: string;
66
66
  evtIsUserLoggedIn: NonPostableEvt<boolean>;
67
67
  log: typeof console.log | undefined;
68
68
  }) {
@@ -76,7 +76,7 @@ export function createLoginOrGoToAuthServer(params: {
76
76
 
77
77
  getExtraTokenParams,
78
78
 
79
- homeAndCallbackUrl,
79
+ homeUrl,
80
80
  evtIsUserLoggedIn,
81
81
  log
82
82
  } = params;
@@ -168,7 +168,7 @@ export function createLoginOrGoToAuthServer(params: {
168
168
  redirectUrl_consentRequiredCase: (() => {
169
169
  switch (rest.action) {
170
170
  case "login":
171
- return lastPublicUrl ?? homeAndCallbackUrl;
171
+ return lastPublicUrl ?? homeUrl;
172
172
  case "go to auth server":
173
173
  return redirectUrl;
174
174
  }
package/src/tools/parseKeycloakIssuerUri.ts CHANGED
@@ -23,6 +23,7 @@ export function parseKeycloakIssuerUri(issuerUri: string):
23
23
  /** If defined starts with / and end with no `/` */
24
24
  kcHttpRelativePath: string | undefined;
25
25
  adminConsoleUrl: string;
26
+ adminConsoleUrl_master: string;
26
27
  getAccountUrl: (params: {
27
28
  clientId: string;
28
29
  backToAppFromAccountUrl: string;
@@ -39,11 +40,15 @@ export function parseKeycloakIssuerUri(issuerUri: string):
39
40
 
40
41
  const [kcHttpRelativePath, realm] = split;
41
42
 
43
+ const getAdminConsoleUrl = (realm: string) =>
44
+ `${url.origin}${kcHttpRelativePath}/admin/${realm}/console`;
45
+
42
46
  return {
43
47
  origin: url.origin,
44
48
  realm,
45
49
  kcHttpRelativePath: kcHttpRelativePath === "" ? undefined : kcHttpRelativePath,
46
- adminConsoleUrl: `${url.origin}${kcHttpRelativePath}/admin/${realm}/console`,
50
+ adminConsoleUrl: getAdminConsoleUrl(realm),
51
+ adminConsoleUrl_master: getAdminConsoleUrl("master"),
47
52
  getAccountUrl: ({ clientId, backToAppFromAccountUrl, locale }) => {
48
53
  const accountUrlObj = new URL(`${url.origin}${kcHttpRelativePath}/realms/${realm}/account`);
49
54
  accountUrlObj.searchParams.set("referrer", clientId);
package/src/tools/toFullyQualifiedUrl.ts CHANGED
@@ -13,7 +13,7 @@ type Params = {
13
13
  export function toFullyQualifiedUrl(params: Params): string {
14
14
  let url: string;
15
15
 
16
- if (params.urlish.startsWith("http")) {
16
+ if (params.urlish.includes("://")) {
17
17
  url = params.urlish;
18
18
  } else {
19
19
  let path = params.urlish;
package/tools/parseKeycloakIssuerUri.d.ts CHANGED
@@ -19,6 +19,7 @@ export declare function parseKeycloakIssuerUri(issuerUri: string): undefined | {
19
19
  /** If defined starts with / and end with no `/` */
20
20
  kcHttpRelativePath: string | undefined;
21
21
  adminConsoleUrl: string;
22
+ adminConsoleUrl_master: string;
22
23
  getAccountUrl: (params: {
23
24
  clientId: string;
24
25
  backToAppFromAccountUrl: string;
package/tools/parseKeycloakIssuerUri.js CHANGED
@@ -40,11 +40,15 @@ function parseKeycloakIssuerUri(issuerUri) {
40
40
  return undefined;
41
41
  }
42
42
  var _a = __read(split, 2), kcHttpRelativePath = _a[0], realm = _a[1];
43
+ var getAdminConsoleUrl = function (realm) {
44
+ return "".concat(url.origin).concat(kcHttpRelativePath, "/admin/").concat(realm, "/console");
45
+ };
43
46
  return {
44
47
  origin: url.origin,
45
48
  realm: realm,
46
49
  kcHttpRelativePath: kcHttpRelativePath === "" ? undefined : kcHttpRelativePath,
47
- adminConsoleUrl: "".concat(url.origin).concat(kcHttpRelativePath, "/admin/").concat(realm, "/console"),
50
+ adminConsoleUrl: getAdminConsoleUrl(realm),
51
+ adminConsoleUrl_master: getAdminConsoleUrl("master"),
48
52
  getAccountUrl: function (_a) {
49
53
  var clientId = _a.clientId, backToAppFromAccountUrl = _a.backToAppFromAccountUrl, locale = _a.locale;
50
54
  var accountUrlObj = new URL("".concat(url.origin).concat(kcHttpRelativePath, "/realms/").concat(realm, "/account"));
package/tools/parseKeycloakIssuerUri.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"parseKeycloakIssuerUri.js","sourceRoot":"","sources":["../src/tools/parseKeycloakIssuerUri.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAiBA,wDA6CC;AA9DD,6DAA4D;AAE5D;;;;;;;;;;;;;;KAcK;AACL,SAAgB,sBAAsB,CAAC,SAAiB;IAcpD,IAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IAE/B,IAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAE7C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,SAAS,CAAC;IACrB,CAAC;IAEK,IAAA,KAAA,OAA8B,KAAK,IAAA,EAAlC,kBAAkB,QAAA,EAAE,KAAK,QAAS,CAAC;IAE1C,OAAO;QACH,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,KAAK,OAAA;QACL,kBAAkB,EAAE,kBAAkB,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,kBAAkB;QAC9E,eAAe,EAAE,UAAG,GAAG,CAAC,MAAM,SAAG,kBAAkB,oBAAU,KAAK,aAAU;QAC5E,aAAa,EAAE,UAAC,EAA6C;gBAA3C,QAAQ,cAAA,EAAE,uBAAuB,6BAAA,EAAE,MAAM,YAAA;YACvD,IAAM,aAAa,GAAG,IAAI,GAAG,CAAC,UAAG,GAAG,CAAC,MAAM,SAAG,kBAAkB,qBAAW,KAAK,aAAU,CAAC,CAAC;YAC5F,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YACrD,aAAa,CAAC,YAAY,CAAC,GAAG,CAC1B,cAAc,EACd,IAAA,yCAAmB,EAAC;gBAChB,MAAM,EAAE,uBAAuB;gBAC/B,qBAAqB,EAAE,KAAK;aAC/B,CAAC,CACL,CAAC;YACF,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACvB,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YACxD,CAAC;YACD,OAAO,aAAa,CAAC,IAAI,CAAC;QAC9B,CAAC;KACJ,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"parseKeycloakIssuerUri.js","sourceRoot":"","sources":["../src/tools/parseKeycloakIssuerUri.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAiBA,wDAkDC;AAnED,6DAA4D;AAE5D;;;;;;;;;;;;;;KAcK;AACL,SAAgB,sBAAsB,CAAC,SAAiB;IAepD,IAAM,GAAG,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;IAE/B,IAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAE7C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,SAAS,CAAC;IACrB,CAAC;IAEK,IAAA,KAAA,OAA8B,KAAK,IAAA,EAAlC,kBAAkB,QAAA,EAAE,KAAK,QAAS,CAAC;IAE1C,IAAM,kBAAkB,GAAG,UAAC,KAAa;QACrC,OAAA,UAAG,GAAG,CAAC,MAAM,SAAG,kBAAkB,oBAAU,KAAK,aAAU;IAA3D,CAA2D,CAAC;IAEhE,OAAO;QACH,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,KAAK,OAAA;QACL,kBAAkB,EAAE,kBAAkB,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,kBAAkB;QAC9E,eAAe,EAAE,kBAAkB,CAAC,KAAK,CAAC;QAC1C,sBAAsB,EAAE,kBAAkB,CAAC,QAAQ,CAAC;QACpD,aAAa,EAAE,UAAC,EAA6C;gBAA3C,QAAQ,cAAA,EAAE,uBAAuB,6BAAA,EAAE,MAAM,YAAA;YACvD,IAAM,aAAa,GAAG,IAAI,GAAG,CAAC,UAAG,GAAG,CAAC,MAAM,SAAG,kBAAkB,qBAAW,KAAK,aAAU,CAAC,CAAC;YAC5F,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YACrD,aAAa,CAAC,YAAY,CAAC,GAAG,CAC1B,cAAc,EACd,IAAA,yCAAmB,EAAC;gBAChB,MAAM,EAAE,uBAAuB;gBAC/B,qBAAqB,EAAE,KAAK;aAC/B,CAAC,CACL,CAAC;YACF,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACvB,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YACxD,CAAC;YACD,OAAO,aAAa,CAAC,IAAI,CAAC;QAC9B,CAAC;KACJ,CAAC;AACN,CAAC"}
package/tools/toFullyQualifiedUrl.js CHANGED
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.toFullyQualifiedUrl = toFullyQualifiedUrl;
4
4
  function toFullyQualifiedUrl(params) {
5
5
  var url;
6
- if (params.urlish.startsWith("http")) {
6
+ if (params.urlish.includes("://")) {
7
7
  url = params.urlish;
8
8
  }
9
9
  else {
package/tools/toFullyQualifiedUrl.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"toFullyQualifiedUrl.js","sourceRoot":"","sources":["../src/tools/toFullyQualifiedUrl.ts"],"names":[],"mappings":";;AAYA,kDA0CC;AA1CD,SAAgB,mBAAmB,CAAC,MAAc;IAC9C,IAAI,GAAW,CAAC;IAEhB,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACnC,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC;IACxB,CAAC;SAAM,CAAC;QACJ,IAAI,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC;QAEzB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,IAAI,GAAG,WAAI,IAAI,CAAE,CAAC;QACtB,CAAC;QAED,GAAG,GAAG,UAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAG,IAAI,CAAE,CAAC;IAC7C,CAAC;IAED,CAAC;QACG,IAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAE5B,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ;YAC7B,6EAA6E;aAC5E,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAE3B,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC;IACtB,CAAC;IAED,IAAI,MAAM,CAAC,qBAAqB,EAAE,CAAC;QAC/B,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,cAAO,MAAM,CAAC,MAAM,0CAAuC,CAAC,CAAC;QACjF,CAAC;QAED,IAAI,MAAM,CAAC,yBAAyB,EAAE,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrB,GAAG,GAAG,UAAG,GAAG,MAAG,CAAC;YACpB,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC3B,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC"}
1
+ {"version":3,"file":"toFullyQualifiedUrl.js","sourceRoot":"","sources":["../src/tools/toFullyQualifiedUrl.ts"],"names":[],"mappings":";;AAYA,kDA0CC;AA1CD,SAAgB,mBAAmB,CAAC,MAAc;IAC9C,IAAI,GAAW,CAAC;IAEhB,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAChC,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC;IACxB,CAAC;SAAM,CAAC;QACJ,IAAI,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC;QAEzB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,IAAI,GAAG,WAAI,IAAI,CAAE,CAAC;QACtB,CAAC;QAED,GAAG,GAAG,UAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,SAAG,IAAI,CAAE,CAAC;IAC7C,CAAC;IAED,CAAC;QACG,IAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAE5B,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ;YAC7B,6EAA6E;aAC5E,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAE3B,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC;IACtB,CAAC;IAED,IAAI,MAAM,CAAC,qBAAqB,EAAE,CAAC;QAC/B,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,cAAO,MAAM,CAAC,MAAM,0CAAuC,CAAC,CAAC;QACjF,CAAC;QAED,IAAI,MAAM,CAAC,yBAAyB,EAAE,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrB,GAAG,GAAG,UAAG,GAAG,MAAG,CAAC;YACpB,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC3B,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC"}