oidc-spa 6.1.13 → 6.1.15

package/oidc/loginSilent.js

@@ -68,7 +68,6 @@ exports.loginSilent = loginSilent;
 var Deferred_1 = require("../tools/Deferred");
 var tsafe_1 = require("../vendor/frontend/tsafe");
 var StateData_1 = require("./StateData");
-var urlQueryParams_1 = require("../tools/urlQueryParams");
 var getDownlinkAndRtt_1 = require("../tools/getDownlinkAndRtt");
 var isDev_1 = require("../tools/isDev");
 function getIsAuthResponse(data) {
@@ -76,15 +75,11 @@ function getIsAuthResponse(data) {
 }
 function authResponseToUrl(authResponse) {
     var e_1, _a;
-    var authResponseUrl = "https://dummy.com";
+    var authResponseUrl = new URL("https://dummy.com");
     try {
         for (var _b = __values(Object.entries(authResponse)), _c = _b.next(); !_c.done; _c = _b.next()) {
             var _d = __read(_c.value, 2), name_1 = _d[0], value = _d[1];
-            authResponseUrl = (0, urlQueryParams_1.addQueryParamToUrl)({
-                url: authResponseUrl,
-                name: name_1,
-                value: value
-            }).newUrl;
+            authResponseUrl.searchParams.set(name_1, value);
         }
     }
     catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -94,7 +89,7 @@ function authResponseToUrl(authResponse) {
         }
         finally { if (e_1) throw e_1.error; }
     }
-    return authResponseUrl;
+    return authResponseUrl.href;
 }
 function loginSilent(params) {
     return __awaiter(this, void 0, void 0, function () {
@@ -121,7 +116,7 @@ function loginSilent(params) {
             timeout = setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     dResult.resolve({
-                        isSuccess: false,
+                        outcome: "failure",
                         cause: "timeout"
                     });
                     return [2 /*return*/];
@@ -141,7 +136,7 @@ function loginSilent(params) {
                 clearTimeout(timeout);
                 window.removeEventListener("message", listener);
                 dResult.resolve({
-                    isSuccess: true,
+                    outcome: "success iframe",
                     authResponse: authResponse
                 });
             };
@@ -155,7 +150,14 @@ function loginSilent(params) {
                 silentRequestTimeoutInSeconds: timeoutDelayMs / 1000,
                 extraTokenParams: getExtraTokenParams === null || getExtraTokenParams === void 0 ? void 0 : getExtraTokenParams()
             })
-                .catch(function (error) {
+                .then(function (oidcClientTsUser) {
+                (0, tsafe_1.assert)(oidcClientTsUser !== null);
+                clearTimeout(timeout);
+                dResult.resolve({
+                    outcome: "refresh token used",
+                    oidcClientTsUser: oidcClientTsUser
+                });
+            }, function (error) {
                 if (error.message === "Failed to fetch") {
                     // NOTE: If we got an error here it means that the fetch to the
                     // well-known oidc endpoint failed.
@@ -164,7 +166,7 @@ function loginSilent(params) {
                     // It could be a CORS error on the well-known endpoint but it's unlikely.
                     clearTimeout(timeout);
                     dResult.resolve({
-                        isSuccess: false,
+                        outcome: "failure",
                         cause: "can't reach well-known oidc endpoint"
                     });
                     return;
@@ -173,7 +175,7 @@ function loginSilent(params) {
                 // error than timeout so we fail silently and let the timeout expire.
             });
             dResult.pr.then(function (result) {
-                if (!result.isSuccess) {
+                if (result.outcome === "failure") {
                     (0, StateData_1.clearStateStore)({ stateQueryParamValue: stateQueryParamValue_instance });
                 }
             });

package/oidc/loginSilent.js.map

@@ -1 +1 @@
-{"version":3,"file":"loginSilent.js","sourceRoot":"","sources":["../src/oidc/loginSilent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loginSilent.js","sourceRoot":"","sources":["../src/oidc/loginSilent.ts"],"names":[],"mappings":"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"}

package/oidc/oidcClientTsUserToTokens.js

@@ -25,8 +25,10 @@ function oidcClientTsUserToTokens(params) {
         (0, tsafe_1.assert)(false, "Failed to get access token expiration time");
     })();
     var refreshToken = oidcClientTsUser.refresh_token;
-    (0, tsafe_1.assert)(refreshToken !== undefined, "No refresh token provided by the oidc server");
     var refreshTokenExpirationTime = (function () {
+        if (refreshToken === undefined) {
+            return Number.POSITIVE_INFINITY;
+        }
         read_from_jwt: {
             var expirationTime = (0, readExpirationTimeInJwt_1.readExpirationTimeInJwt)(refreshToken);
             if (expirationTime === undefined) {
@@ -47,7 +49,7 @@ function oidcClientTsUserToTokens(params) {
     var tokens = {
         accessToken: accessToken,
         accessTokenExpirationTime: accessTokenExpirationTime,
-        refreshToken: refreshToken,
+        refreshToken: refreshToken !== null && refreshToken !== void 0 ? refreshToken : "",
         refreshTokenExpirationTime: refreshTokenExpirationTime,
         idToken: idToken,
         decodedIdToken: null

package/oidc/oidcClientTsUserToTokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"oidcClientTsUserToTokens.js","sourceRoot":"","sources":["../src/oidc/oidcClientTsUserToTokens.ts"],"names":[],"mappings":";;AAMA,4DAwGC;AA7GD,kDAAkD;AAClD,4EAA2E;AAC3E,gDAA+C;AAG/C,SAAgB,wBAAwB,CAAiD,MAIxF;IACW,IAAA,gBAAgB,GAAgC,MAAM,iBAAtC,EAAE,oBAAoB,GAAU,MAAM,qBAAhB,EAAE,GAAG,GAAK,MAAM,IAAX,CAAY;IAE/D,IAAM,WAAW,GAAG,gBAAgB,CAAC,YAAY,CAAC;IAElD,IAAM,yBAAyB,GAAG,CAAC;QAC/B,kBAAkB,EAAE,CAAC;YACT,IAAA,UAAU,GAAK,gBAAgB,WAArB,CAAsB;YAExC,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC3B,MAAM,kBAAkB,CAAC;YAC7B,CAAC;YAED,OAAO,UAAU,GAAG,IAAI,CAAC;QAC7B,CAAC;QAED,aAAa,EAAE,CAAC;YACZ,IAAM,cAAc,GAAG,IAAA,iDAAuB,EAAC,WAAW,CAAC,CAAC;YAE5D,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;gBAC/B,MAAM,aAAa,CAAC;YACxB,CAAC;YAED,OAAO,cAAc,CAAC;QAC1B,CAAC;QAED,IAAA,cAAM,EAAC,KAAK,EAAE,4CAA4C,CAAC,CAAC;IAChE,CAAC,CAAC,EAAE,CAAC;IAEL,IAAM,YAAY,GAAG,gBAAgB,CAAC,aAAa,CAAC;IAEpD,IAAA,cAAM,EAAC,YAAY,KAAK,SAAS,EAAE,8CAA8C,CAAC,CAAC;IAEnF,IAAM,0BAA0B,GAAG,CAAC;QAChC,aAAa,EAAE,CAAC;YACZ,IAAM,cAAc,GAAG,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;YAE7D,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;gBAC/B,MAAM,aAAa,CAAC;YACxB,CAAC;YAED,OAAO,cAAc,CAAC;QAC1B,CAAC;QAED,GAAG,aAAH,GAAG,uBAAH,GAAG,CACC;YACI,qEAAqE;YACrE,2FAA2F;YAC3F,sHAAsH;YACtH,8FAA8F;SACjG,CAAC,IAAI,CAAC,IAAI,CAAC,CACf,CAAC;QAEF,OAAO,MAAM,CAAC,iBAAiB,CAAC;IACpC,CAAC,CAAC,EAAE,CAAC;IAEL,IAAM,OAAO,GAAG,gBAAgB,CAAC,QAAQ,CAAC;IAE1C,IAAA,cAAM,EAAC,OAAO,KAAK,SAAS,EAAE,yCAAyC,CAAC,CAAC;IAEzE,IAAM,MAAM,GAAgC;QACxC,WAAW,aAAA;QACX,yBAAyB,2BAAA;QACzB,YAAY,cAAA;QACZ,0BAA0B,4BAAA;QAC1B,OAAO,SAAA;QACP,cAAc,EAAE,IAAW;KAC9B,CAAC;IAEF,IAAI,KAAK,GAKS,SAAS,CAAC;IAE5B,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,gBAAgB,EAAE;QAC5C,GAAG,EAAE;YACD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC;gBACxD,OAAO,KAAK,CAAC,cAAc,CAAC;YAChC,CAAC;YAED,IAAI,cAAc,GAAG,IAAA,qBAAS,EAAC,IAAI,CAAC,OAAO,CAAmB,CAAC;YAE/D,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;gBACrC,cAAc,GAAG,oBAAoB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAChE,CAAC;YAED,KAAK,GAAG;gBACJ,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,cAAc,gBAAA;aACjB,CAAC;YAEF,OAAO,cAAc,CAAC;QAC1B,CAAC;QACD,YAAY,EAAE,IAAI;QAClB,UAAU,EAAE,IAAI;KACnB,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAClB,CAAC"}
+{"version":3,"file":"oidcClientTsUserToTokens.js","sourceRoot":"","sources":["../src/oidc/oidcClientTsUserToTokens.ts"],"names":[],"mappings":"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"}

package/oidc/persistedLogoutState.d.ts

@@ -0,0 +1,9 @@
+export declare function persistLogoutState(params: {
+    configId: string;
+}): void;
+export declare function clearPersistedLogoutState(params: {
+    configId: string;
+}): void;
+export declare function getIsPersistedLogoutState(params: {
+    configId: string;
+}): boolean;

package/oidc/persistedLogoutState.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.persistLogoutState = persistLogoutState;
+exports.clearPersistedLogoutState = clearPersistedLogoutState;
+exports.getIsPersistedLogoutState = getIsPersistedLogoutState;
+function getKey(params) {
+    var configId = params.configId;
+    return "oidc-spa:is-logged-out:".concat(configId);
+}
+function persistLogoutState(params) {
+    var configId = params.configId;
+    var key = getKey({ configId: configId });
+    localStorage.setItem(key, "true");
+}
+function clearPersistedLogoutState(params) {
+    var configId = params.configId;
+    var key = getKey({ configId: configId });
+    localStorage.removeItem(key);
+}
+function getIsPersistedLogoutState(params) {
+    var configId = params.configId;
+    var key = getKey({ configId: configId });
+    return localStorage.getItem(key) === "true";
+}
+//# sourceMappingURL=persistedLogoutState.js.map

package/oidc/persistedLogoutState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"persistedLogoutState.js","sourceRoot":"","sources":["../src/oidc/persistedLogoutState.ts"],"names":[],"mappings":";;AAMA,gDAMC;AAED,8DAMC;AAED,8DAMC;AA5BD,SAAS,MAAM,CAAC,MAA4B;IAChC,IAAA,QAAQ,GAAK,MAAM,SAAX,CAAY;IAE5B,OAAO,iCAA0B,QAAQ,CAAE,CAAC;AAChD,CAAC;AAED,SAAgB,kBAAkB,CAAC,MAA4B;IACnD,IAAA,QAAQ,GAAK,MAAM,SAAX,CAAY;IAE5B,IAAM,GAAG,GAAG,MAAM,CAAC,EAAE,QAAQ,UAAA,EAAE,CAAC,CAAC;IAEjC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACtC,CAAC;AAED,SAAgB,yBAAyB,CAAC,MAA4B;IAC1D,IAAA,QAAQ,GAAK,MAAM,SAAX,CAAY;IAE5B,IAAM,GAAG,GAAG,MAAM,CAAC,EAAE,QAAQ,UAAA,EAAE,CAAC,CAAC;IAEjC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,SAAgB,yBAAyB,CAAC,MAA4B;IAC1D,IAAA,QAAQ,GAAK,MAAM,SAAX,CAAY;IAE5B,IAAM,GAAG,GAAG,MAAM,CAAC,EAAE,QAAQ,UAAA,EAAE,CAAC,CAAC;IAEjC,OAAO,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC;AAChD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oidc-spa",
-    "version": "6.1.13",
+    "version": "6.1.15",
     "description": "Openidconnect client for Single Page Applications",
     "repository": {
         "type": "git",
@@ -24,6 +24,7 @@
         "./oidc/Oidc": "./oidc/Oidc.js",
         "./oidc/oidcClientTsUserToTokens": "./oidc/oidcClientTsUserToTokens.js",
         "./oidc/OidcInitializationError": "./oidc/OidcInitializationError.js",
+        "./oidc/persistedLogoutState": "./oidc/persistedLogoutState.js",
         "./oidc/StateData": "./oidc/StateData.js",
         "./react/index": "./react/index.js",
         "./react/react": "./react/react.js",
@@ -46,7 +47,6 @@
         "./tools/subscribeToUserInteraction": "./tools/subscribeToUserInteraction.js",
         "./tools/toFullyQualifiedUrl": "./tools/toFullyQualifiedUrl.js",
         "./tools/toHumanReadableDuration": "./tools/toHumanReadableDuration.js",
-        "./tools/urlQueryParams": "./tools/urlQueryParams.js",
         "./tools/ValueOrAsyncGetter": "./tools/ValueOrAsyncGetter.js",
         "./tools/workerTimers": "./tools/workerTimers.js",
         "./vendor/backend/evt": "./vendor/backend/evt.js",
@@ -89,6 +89,7 @@
         "./src/oidc/loginSilent.ts",
         "./src/oidc/logoutPropagationToOtherTabs.ts",
         "./src/oidc/oidcClientTsUserToTokens.ts",
+        "./src/oidc/persistedLogoutState.ts",
         "./src/react/index.ts",
         "./src/react/react.tsx",
         "./src/tools/AwaitableEventEmitter.ts",
@@ -111,7 +112,6 @@
         "./src/tools/subscribeToUserInteraction.ts",
         "./src/tools/toFullyQualifiedUrl.ts",
         "./src/tools/toHumanReadableDuration.ts",
-        "./src/tools/urlQueryParams.ts",
         "./src/tools/workerTimers.ts",
         "./src/vendor/backend/evt.ts",
         "./src/vendor/backend/jsonwebtoken.ts",
@@ -167,6 +167,9 @@
         "./oidc/oidcClientTsUserToTokens.d.ts",
         "./oidc/oidcClientTsUserToTokens.js",
         "./oidc/oidcClientTsUserToTokens.js.map",
+        "./oidc/persistedLogoutState.d.ts",
+        "./oidc/persistedLogoutState.js",
+        "./oidc/persistedLogoutState.js.map",
         "./react/index.d.ts",
         "./react/index.js",
         "./react/index.js.map",
@@ -233,9 +236,6 @@
         "./tools/toHumanReadableDuration.d.ts",
         "./tools/toHumanReadableDuration.js",
         "./tools/toHumanReadableDuration.js.map",
-        "./tools/urlQueryParams.d.ts",
-        "./tools/urlQueryParams.js",
-        "./tools/urlQueryParams.js.map",
         "./tools/workerTimers.d.ts",
         "./tools/workerTimers.js",
         "./tools/workerTimers.js.map",

package/src/mock/oidc.ts

@@ -1,8 +1,6 @@
 import type { Oidc } from "../oidc";
-import { retrieveQueryParamFromUrl, addQueryParamToUrl } from "../tools/urlQueryParams";
 import { createObjectThatThrowsIfAccessed } from "../tools/createObjectThatThrowsIfAccessed";
 import { id } from "../vendor/frontend/tsafe";
-import { assert, type Equals } from "../vendor/frontend/tsafe";
 import { toFullyQualifiedUrl } from "../tools/toFullyQualifiedUrl";
 
 export type ParamsOfCreateMockOidc<
@@ -44,18 +42,19 @@ export async function createMockOidc<
     } = params;
 
     const isUserLoggedIn = (() => {
-        const result = retrieveQueryParamFromUrl({
-            url: window.location.href,
-            name: urlParamName
-        });
+        const newUrl = new URL(window.location.href);
+
+        const urlParamValue = newUrl.searchParams.get(urlParamName);
 
-        if (!result.wasPresent) {
+        if (urlParamValue === null) {
             return isUserInitiallyLoggedIn;
         }
 
-        window.history.replaceState({}, "", result.newUrl);
+        newUrl.searchParams.delete(urlParamName);
 
-        return result.value === "true";
+        window.history.replaceState({}, "", newUrl.href);
+
+        return urlParamValue === "true";
     })();
 
     const homeUrl = toFullyQualifiedUrl({
@@ -76,20 +75,20 @@ export async function createMockOidc<
     }): Promise<never> => {
         const { redirectUrl } = params;
 
-        const { newUrl } = addQueryParamToUrl({
-            url: (() => {
+        const newUrl = new URL(
+            (() => {
                 if (redirectUrl === undefined) {
                     return window.location.href;
                 }
                 return redirectUrl.startsWith("/")
                     ? `${window.location.origin}${redirectUrl}`
                     : redirectUrl;
-            })(),
-            name: urlParamName,
-            value: "true"
-        });
+            })()
+        );
 
-        window.location.href = newUrl;
+        newUrl.searchParams.set(urlParamName, "true");
+
+        window.location.href = newUrl.href;
 
         return new Promise<never>(() => {});
     };
@@ -139,8 +138,8 @@ export async function createMockOidc<
             unsubscribe: () => {}
         }),
         logout: params => {
-            const { newUrl } = addQueryParamToUrl({
-                url: (() => {
+            const newUrl = new URL(
+                (() => {
                     switch (params.redirectTo) {
                         case "current page":
                             return window.location.href;
@@ -152,13 +151,12 @@ export async function createMockOidc<
                                 doAssertNoQueryParams: false
                             });
                     }
-                    assert<Equals<typeof params, never>>(false);
-                })(),
-                name: urlParamName,
-                value: "false"
-            });
+                })()
+            );
+
+            newUrl.searchParams.set(urlParamName, "false");
 
-            window.location.href = newUrl;
+            window.location.href = newUrl.href;
 
             return new Promise<never>(() => {});
         },

package/src/oidc/createOidc.ts

@@ -4,9 +4,8 @@ import {
     type User as OidcClientTsUser,
     InMemoryWebStorage
 } from "../vendor/frontend/oidc-client-ts-and-jwt-decode";
-import { id, type Param0, assert, type Equals, typeGuard } from "../vendor/frontend/tsafe";
+import { id, type Param0, assert, is, type Equals, typeGuard } from "../vendor/frontend/tsafe";
 import { setTimeout, clearTimeout } from "../tools/workerTimers";
-import { addQueryParamToUrl, retrieveAllQueryParamFromUrl } from "../tools/urlQueryParams";
 import { Deferred } from "../tools/Deferred";
 import { decodeJwt } from "../tools/decodeJwt";
 import { createIsUserActive } from "../tools/createIsUserActive";
@@ -31,6 +30,11 @@ import { getConfigId } from "./configId";
 import { oidcClientTsUserToTokens } from "./oidcClientTsUserToTokens";
 import { loginSilent, authResponseToUrl } from "./loginSilent";
 import { handleOidcCallback, AUTH_RESPONSE_KEY } from "./handleOidcCallback";
+import {
+    clearPersistedLogoutState,
+    getIsPersistedLogoutState,
+    persistLogoutState
+} from "./persistedLogoutState";
 import type { Oidc } from "./Oidc";
 import { type AwaitableEventEmitter, createAwaitableEventEmitter } from "../tools/AwaitableEventEmitter";
 
@@ -421,14 +425,13 @@ export async function createOidc_nonMemoized<
                                         break add_extra_query_params;
                                     }
 
-                                    Object.entries(extraQueryParams).forEach(
-                                        ([name, value]) =>
-                                            (url = addQueryParamToUrl({
-                                                url,
-                                                name,
-                                                value
-                                            }).newUrl)
-                                    );
+                                    const url_obj = new URL_real(url);
+
+                                    for (const [name, value] of Object.entries(extraQueryParams)) {
+                                        url_obj.searchParams.set(name, value);
+                                    }
+
+                                    url = url_obj.href;
                                 }
 
                                 apply_transform_before_redirect: {
@@ -481,10 +484,7 @@ export async function createOidc_nonMemoized<
                     break read_query_params_added_by_transform_before_redirect;
                 }
 
-                const { values: queryParamsAddedByTransformBeforeRedirect } =
-                    retrieveAllQueryParamFromUrl({ url: url_afterTransform });
-
-                for (const [name, value] of Object.entries(queryParamsAddedByTransformBeforeRedirect)) {
+                for (const [name, value] of new URL(url_afterTransform).searchParams) {
                     extraQueryParams[name] = value;
                 }
             }
@@ -501,7 +501,8 @@ export async function createOidc_nonMemoized<
                 configId,
                 action: "login"
             }),
-            redirectMethod
+            redirectMethod,
+            prompt: getIsPersistedLogoutState({ configId }) ? "consent" : undefined
         });
         return new Promise<never>(() => {});
     };
@@ -610,6 +611,7 @@ export async function createOidc_nonMemoized<
                         }
 
                         sessionStorage.removeItem(BROWSER_SESSION_NOT_FIRST_INIT_KEY);
+                        clearPersistedLogoutState({ configId });
 
                         return {
                             oidcClientTsUser,
@@ -656,6 +658,11 @@ export async function createOidc_nonMemoized<
         restore_from_http_only_cookie: {
             log?.("Trying to restore the auth from the http only cookie (silent signin with iframe)");
 
+            if (getIsPersistedLogoutState({ configId })) {
+                log?.("Skipping silent signin with iframe, the user has logged out");
+                break restore_from_http_only_cookie;
+            }
+
             const result_loginSilent = await loginSilent({
                 oidcClientTsUserManager,
                 stateQueryParamValue_instance,
@@ -663,7 +670,9 @@ export async function createOidc_nonMemoized<
                 getExtraTokenParams
             });
 
-            if (!result_loginSilent.isSuccess) {
+            assert(result_loginSilent.outcome !== "refresh token used");
+
+            if (result_loginSilent.outcome === "failure") {
                 switch (result_loginSilent.cause) {
                     case "can't reach well-known oidc endpoint":
                         return createWellKnownOidcConfigurationEndpointUnreachableInitializationError({
@@ -680,6 +689,8 @@ export async function createOidc_nonMemoized<
                 assert<Equals<typeof result_loginSilent.cause, never>>(false);
             }
 
+            assert<Equals<typeof result_loginSilent.outcome, "success iframe">>();
+
             const { authResponse } = result_loginSilent;
 
             log?.("Silent signin auth response", authResponse);
@@ -913,31 +924,76 @@ export async function createOidc_nonMemoized<
 
             const sessionId = decodeJwt<{ sid?: string }>(oidc.getTokens().idToken).sid;
 
-            await oidcClientTsUserManager.signoutRedirect({
-                state: id<StateData>({
-                    configId,
-                    context: "redirect",
-                    redirectUrl: postLogoutRedirectUrl,
-                    hasBeenProcessedByCallback: false,
-                    action: "logout",
-                    sessionId
-                }),
-                redirectMethod: "assign"
-            });
+            try {
+                await oidcClientTsUserManager.signoutRedirect({
+                    state: id<StateData>({
+                        configId,
+                        context: "redirect",
+                        redirectUrl: postLogoutRedirectUrl,
+                        hasBeenProcessedByCallback: false,
+                        action: "logout",
+                        sessionId
+                    }),
+                    redirectMethod: "assign"
+                });
+            } catch (error) {
+                assert(is<Error>(error));
+
+                if (error.message !== "No end session endpoint") {
+                    throw error;
+                }
+
+                log?.("No end session endpoint, managing logging state locally");
+
+                persistLogoutState({ configId });
+                window.location.href = postLogoutRedirectUrl;
+            }
 
             return new Promise<never>(() => {});
         },
         renewTokens: async params => {
             const { extraTokenParams: extraTokenParams_local } = params ?? {};
 
-            const oidcClientTsUser = await oidcClientTsUserManager.signinSilent({
-                extraTokenParams: {
+            log?.("Renewing tokens");
+
+            const result_loginSilent = await loginSilent({
+                oidcClientTsUserManager,
+                stateQueryParamValue_instance,
+                configId,
+                getExtraTokenParams: () => ({
                     ...getExtraTokenParams?.(),
                     ...extraTokenParams_local
-                }
+                })
             });
 
-            assert(oidcClientTsUser !== null);
+            if (result_loginSilent.outcome === "failure") {
+                throw new Error(result_loginSilent.cause);
+            }
+
+            let oidcClientTsUser: OidcClientTsUser;
+
+            switch (result_loginSilent.outcome) {
+                case "refresh token used":
+                    {
+                        log?.("Refresh token used");
+                        oidcClientTsUser = result_loginSilent.oidcClientTsUser;
+                    }
+                    break;
+                case "success iframe":
+                    {
+                        const { authResponse } = result_loginSilent;
+
+                        log?.("Tokens refresh using iframe", authResponse);
+
+                        oidcClientTsUser = await oidcClientTsUserManager.signinRedirectCallback(
+                            authResponseToUrl(authResponse)
+                        );
+                    }
+                    break;
+                default:
+                    assert<Equals<typeof result_loginSilent, never>>(false);
+                    break;
+            }
 
             const decodedIdTokenPropertyDescriptor = Object.getOwnPropertyDescriptor(
                 currentTokens,
@@ -1080,7 +1136,12 @@ export async function createOidc_nonMemoized<
         })();
     }
 
-    {
+    auto_logout: {
+        if (currentTokens.refreshToken === "" && __unsafe_ssoSessionIdleSeconds === undefined) {
+            log?.("No refresh token, auto logout non applicable");
+            break auto_logout;
+        }
+
         const { startCountdown } = createStartCountdown({
             getCountdownEndTime: (() => {
                 const getCountdownEndTime = () =>

package/src/oidc/handleOidcCallback.ts

@@ -1,4 +1,3 @@
-import { retrieveQueryParamFromUrl } from "../tools/urlQueryParams";
 import { getStateData, markStateDataAsProcessedByCallback, getIsStatQueryParamValue } from "./StateData";
 
 declare global {
@@ -26,39 +25,29 @@ export function handleOidcCallback(): { isHandled: boolean } {
 export const AUTH_RESPONSE_KEY = "oidc-spa.authResponse";
 
 function handleOidcCallback_nonMemoized(): { isHandled: boolean } {
+    const locationUrl = new URL(window.location.href);
+
     const stateQueryParamValue = (() => {
-        const result = retrieveQueryParamFromUrl({
-            url: window.location.href,
-            name: "state"
-        });
+        const stateQueryParamValue = locationUrl.searchParams.get("state");
 
-        if (!result.wasPresent) {
+        if (stateQueryParamValue === null) {
             return undefined;
         }
 
-        if (!getIsStatQueryParamValue({ maybeStateQueryParamValue: result.value })) {
+        if (!getIsStatQueryParamValue({ maybeStateQueryParamValue: stateQueryParamValue })) {
             return undefined;
         }
 
         if (
-            retrieveQueryParamFromUrl({
-                url: window.location.href,
-                name: "client_id"
-            }).wasPresent &&
-            retrieveQueryParamFromUrl({
-                url: window.location.href,
-                name: "response_type"
-            }).wasPresent &&
-            retrieveQueryParamFromUrl({
-                url: window.location.href,
-                name: "redirect_uri"
-            }).wasPresent
+            locationUrl.searchParams.get("client_id") !== null &&
+            locationUrl.searchParams.get("response_type") !== null &&
+            locationUrl.searchParams.get("redirect_uri") !== null
         ) {
             // NOTE: We are probably in a Keycloakify theme and oidc-spa was loaded by mistake.
             return undefined;
         }
 
-        return result.value;
+        return stateQueryParamValue;
     })();
 
     if (stateQueryParamValue === undefined) {
@@ -124,7 +113,7 @@ function handleOidcCallback_nonMemoized(): { isHandled: boolean } {
 
     const authResponse: Record<string, string> = {};
 
-    for (const [key, value] of new URL(location.href).searchParams) {
+    for (const [key, value] of locationUrl.searchParams) {
         authResponse[key] = value;
     }