oidc-spa 7.2.0-rc.1 → 7.2.0-rc.2

package/{src/core/loginOrGoToAuthServer.ts → esm/core/loginOrGoToAuthServer.js}

@@ -1,115 +1,40 @@
-import type { UserManager as OidcClientTsUserManager } from "../vendor/frontend/oidc-client-ts";
 import { toFullyQualifiedUrl } from "../tools/toFullyQualifiedUrl";
-import { assert, type Equals, noUndefined } from "../vendor/frontend/tsafe";
-import type { StateData } from "./StateData";
-import type { NonPostableEvt } from "../tools/Evt";
+import { assert, noUndefined } from "../vendor/frontend/tsafe";
 import { createStatefulEvt } from "../tools/StatefulEvt";
 import { Deferred } from "../tools/Deferred";
 import { addOrUpdateSearchParam, getAllSearchParams } from "../tools/urlSearchParams";
-
 const globalContext = {
     evtHasLoginBeenCalled: createStatefulEvt(() => false)
 };
-
-type Params = Params.Login | Params.GoToAuthServer;
-
-namespace Params {
-    type Common = {
-        redirectUrl: string;
-        extraQueryParams_local: Record<string, string | undefined> | undefined;
-        transformUrlBeforeRedirect_local: ((url: string) => string) | undefined;
-    };
-
-    export type Login = Common & {
-        action: "login";
-        doNavigateBackToLastPublicUrlIfTheTheUserNavigateBack: boolean;
-        doForceReloadOnBfCache: boolean;
-        interaction:
-            | "ensure no interaction"
-            | "ensure interaction"
-            | "directly redirect if active session show login otherwise";
-    };
-
-    export type GoToAuthServer = Common & {
-        action: "go to auth server";
-    };
-}
-
 export function getPrSafelyRestoredFromBfCacheAfterLoginBackNavigation() {
-    const dOut = new Deferred<void>();
-
+    const dOut = new Deferred();
     const { unsubscribe } = globalContext.evtHasLoginBeenCalled.subscribe(hasLoginBeenCalled => {
         if (!hasLoginBeenCalled) {
             unsubscribe();
             dOut.resolve();
         }
     });
-
     return dOut.pr;
 }
-
-export function createLoginOrGoToAuthServer(params: {
-    configId: string;
-    oidcClientTsUserManager: OidcClientTsUserManager;
-    transformUrlBeforeRedirect:
-        | ((params: { authorizationUrl: string; isSilent: boolean }) => string)
-        | undefined;
-
-    getExtraQueryParams:
-        | ((params: { isSilent: boolean; url: string }) => Record<string, string | undefined>)
-        | undefined;
-
-    getExtraTokenParams: (() => Record<string, string | undefined>) | undefined;
-
-    homeUrl: string;
-    evtIsUserLoggedIn: NonPostableEvt<boolean>;
-    log: typeof console.log | undefined;
-}) {
-    const {
-        configId,
-        oidcClientTsUserManager,
-
-        transformUrlBeforeRedirect,
-        getExtraQueryParams,
-
-        getExtraTokenParams,
-
-        homeUrl,
-        evtIsUserLoggedIn,
-        log
-    } = params;
-
+export function createLoginOrGoToAuthServer(params) {
+    const { configId, oidcClientTsUserManager, transformUrlBeforeRedirect, getExtraQueryParams, getExtraTokenParams, homeUrl, evtIsUserLoggedIn, log } = params;
     const LOCAL_STORAGE_KEY_TO_CLEAR_WHEN_USER_LOGGED_IN = `oidc-spa.login-redirect-initiated:${configId}`;
-
-    let lastPublicUrl: string | undefined = undefined;
-
-    async function loginOrGoToAuthServer(params: Params): Promise<never> {
-        const {
-            redirectUrl: redirectUrl_params,
-            extraQueryParams_local,
-            transformUrlBeforeRedirect_local,
-            ...rest
-        } = params;
-
+    let lastPublicUrl = undefined;
+    async function loginOrGoToAuthServer(params) {
+        const { redirectUrl: redirectUrl_params, extraQueryParams_local, transformUrlBeforeRedirect_local, ...rest } = params;
         log?.(`Calling loginOrGoToAuthServer ${JSON.stringify(params, null, 2)}`);
-
         login_specific_handling: {
             if (rest.action !== "login") {
                 break login_specific_handling;
             }
-
             if (globalContext.evtHasLoginBeenCalled.current) {
                 log?.("login() has already been called, ignoring the call");
-                return new Promise<never>(() => {});
+                return new Promise(() => { });
             }
-
             globalContext.evtHasLoginBeenCalled.current = true;
-
             if (document.visibilityState !== "visible") {
                 rest.interaction === "ensure no interaction";
-
-                const dVisible = new Deferred<void>();
-
+                const dVisible = new Deferred();
                 const onVisible = () => {
                     if (document.visibilityState !== "visible") {
                         return;
@@ -118,10 +43,8 @@ export function createLoginOrGoToAuthServer(params: {
                     dVisible.resolve();
                 };
                 document.addEventListener("visibilitychange", onVisible);
-
                 await dVisible.pr;
             }
-
             bf_cache_handling: {
                 if (rest.doForceReloadOnBfCache) {
                     window.removeEventListener("pageshow", () => {
@@ -129,51 +52,41 @@ export function createLoginOrGoToAuthServer(params: {
                     });
                     break bf_cache_handling;
                 }
-
                 localStorage.setItem(LOCAL_STORAGE_KEY_TO_CLEAR_WHEN_USER_LOGGED_IN, "true");
-
                 const callback = () => {
                     window.removeEventListener("pageshow", callback);
-
-                    log?.(
-                        "We came back from the login pages and the state of the app has been restored"
-                    );
-
+                    log?.("We came back from the login pages and the state of the app has been restored");
                     if (rest.doNavigateBackToLastPublicUrlIfTheTheUserNavigateBack) {
                         if (lastPublicUrl !== undefined) {
                             log?.(`Loading last public route: ${lastPublicUrl}`);
                             window.location.href = lastPublicUrl;
-                        } else {
+                        }
+                        else {
                             log?.("We don't know the last public route, navigating back in history");
                             window.history.back();
                         }
-                    } else {
+                    }
+                    else {
                         log?.("The current page doesn't require auth...");
-
-                        if (
-                            localStorage.getItem(LOCAL_STORAGE_KEY_TO_CLEAR_WHEN_USER_LOGGED_IN) === null
-                        ) {
+                        if (localStorage.getItem(LOCAL_STORAGE_KEY_TO_CLEAR_WHEN_USER_LOGGED_IN) === null) {
                             log?.("but the user is now authenticated, reloading the page");
                             location.reload();
-                        } else {
+                        }
+                        else {
                             log?.("and the user doesn't seem to be authenticated, avoiding a reload");
                             globalContext.evtHasLoginBeenCalled.current = false;
                         }
                     }
                 };
-
                 window.addEventListener("pageshow", callback);
             }
         }
-
         const redirectUrl = toFullyQualifiedUrl({
             urlish: redirectUrl_params,
             doAssertNoQueryParams: false
         });
-
         log?.(`redirectUrl: ${redirectUrl}`);
-
-        const stateData: StateData = {
+        const stateData = {
             context: "redirect",
             redirectUrl,
             extraQueryParams: {},
@@ -189,37 +102,28 @@ export function createLoginOrGoToAuthServer(params: {
                 }
             })()
         };
-
         const isSilent = rest.action === "login" && rest.interaction === "ensure no interaction";
-
-        const transformUrl_oidcClientTs = (url: string) => {
-            (
+        const transformUrl_oidcClientTs = (url) => {
+            [
                 [
-                    [
-                        getExtraQueryParams,
-                        transformUrlBeforeRedirect === undefined
-                            ? undefined
-                            : (url: string) =>
-                                  transformUrlBeforeRedirect({
-                                      isSilent,
-                                      authorizationUrl: url
-                                  })
-                    ],
-                    [extraQueryParams_local, transformUrlBeforeRedirect_local]
-                ] as const
-            ).forEach(([extraQueryParamsMaybeGetter, transformUrlBeforeRedirect], i, arr) => {
+                    getExtraQueryParams,
+                    transformUrlBeforeRedirect === undefined
+                        ? undefined
+                        : (url) => transformUrlBeforeRedirect({
+                            isSilent,
+                            authorizationUrl: url
+                        })
+                ],
+                [extraQueryParams_local, transformUrlBeforeRedirect_local]
+            ].forEach(([extraQueryParamsMaybeGetter, transformUrlBeforeRedirect], i, arr) => {
                 const url_before = i !== arr.length - 1 ? undefined : url;
-
                 add_extra_query_params: {
                     if (extraQueryParamsMaybeGetter === undefined) {
                         break add_extra_query_params;
                     }
-
-                    const extraQueryParams =
-                        typeof extraQueryParamsMaybeGetter === "function"
-                            ? extraQueryParamsMaybeGetter({ isSilent, url })
-                            : extraQueryParamsMaybeGetter;
-
+                    const extraQueryParams = typeof extraQueryParamsMaybeGetter === "function"
+                        ? extraQueryParamsMaybeGetter({ isSilent, url })
+                        : extraQueryParamsMaybeGetter;
                     for (const [name, value] of Object.entries(extraQueryParams)) {
                         if (value === undefined) {
                             continue;
@@ -232,37 +136,29 @@ export function createLoginOrGoToAuthServer(params: {
                         });
                     }
                 }
-
                 apply_transform_url: {
                     if (transformUrlBeforeRedirect === undefined) {
                         break apply_transform_url;
                     }
                     url = transformUrlBeforeRedirect(url);
                 }
-
                 update_state: {
                     if (url_before === undefined) {
                         break update_state;
                     }
-
                     const paramValueByName_current = getAllSearchParams(url);
                     const paramValueByName_before = getAllSearchParams(url_before);
-
                     for (const [name, value_current] of Object.entries(paramValueByName_current)) {
-                        const value_before: string | undefined = paramValueByName_before[name];
-
+                        const value_before = paramValueByName_before[name];
                         if (value_before === value_current) {
                             continue;
                         }
-
                         stateData.extraQueryParams[name] = value_current;
                     }
                 }
             });
-
             return url;
         };
-
         const redirectMethod = (() => {
             switch (rest.action) {
                 case "login":
@@ -273,43 +169,39 @@ export function createLoginOrGoToAuthServer(params: {
                     return "assign";
             }
         })();
-
         log?.(`redirectMethod: ${redirectMethod}`);
-
         return oidcClientTsUserManager
             .signinRedirect({
-                state: stateData,
-                redirectMethod,
-                prompt: (() => {
-                    switch (rest.action) {
-                        case "go to auth server":
-                            return undefined;
-                        case "login":
-                            switch (rest.interaction) {
-                                case "ensure no interaction":
-                                    return "none";
-                                case "ensure interaction":
-                                    return "login";
-                                case "directly redirect if active session show login otherwise":
-                                    return undefined;
-                            }
-                            assert<Equals<typeof rest.interaction, never>>;
-                    }
-                    assert<Equals<typeof rest, never>>;
-                })(),
-                transformUrl: transformUrl_oidcClientTs,
-                extraTokenParams:
-                    getExtraTokenParams === undefined ? undefined : noUndefined(getExtraTokenParams())
-            })
-            .then(() => new Promise<never>(() => {}));
+            state: stateData,
+            redirectMethod,
+            prompt: (() => {
+                switch (rest.action) {
+                    case "go to auth server":
+                        return undefined;
+                    case "login":
+                        switch (rest.interaction) {
+                            case "ensure no interaction":
+                                return "none";
+                            case "ensure interaction":
+                                return "login";
+                            case "directly redirect if active session show login otherwise":
+                                return undefined;
+                        }
+                        assert;
+                }
+                assert;
+            })(),
+            transformUrl: transformUrl_oidcClientTs,
+            extraTokenParams: getExtraTokenParams === undefined ? undefined : noUndefined(getExtraTokenParams())
+        })
+            .then(() => new Promise(() => { }));
     }
-
     const { unsubscribe } = evtIsUserLoggedIn.subscribe(isLoggedIn => {
         unsubscribe();
-
         if (isLoggedIn) {
             localStorage.removeItem(LOCAL_STORAGE_KEY_TO_CLEAR_WHEN_USER_LOGGED_IN);
-        } else {
+        }
+        else {
             const realPushState = history.pushState.bind(history);
             history.pushState = function pushState(...args) {
                 lastPublicUrl = window.location.href;
@@ -317,8 +209,8 @@ export function createLoginOrGoToAuthServer(params: {
             };
         }
     });
-
     return {
         loginOrGoToAuthServer
     };
 }
+//# sourceMappingURL=loginOrGoToAuthServer.js.map

package/esm/core/loginOrGoToAuthServer.js.map

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

package/esm/core/loginPropagationToOtherTabs.d.ts

@@ -0,0 +1,8 @@
+export declare function notifyOtherTabsOfLogin(params: {
+    configId: string;
+}): void;
+export declare function getPrOtherTabLogin(params: {
+    configId: string;
+}): {
+    prOtherTabLogin: Promise<void>;
+};

package/{src/core/loginPropagationToOtherTabs.ts → esm/core/loginPropagationToOtherTabs.js}

@@ -1,51 +1,33 @@
 import { assert, is } from "../vendor/frontend/tsafe";
 import { Deferred } from "../tools/Deferred";
-
 const globalContext = {
     appInstanceId: Math.random().toString(36).slice(2)
 };
-
-type Message = {
-    appInstanceId: string;
-    configId: string;
-};
-
-function getChannelName(params: { configId: string }) {
+function getChannelName(params) {
     const { configId } = params;
     return `oidc-spa:login-propagation:${configId}`;
 }
-
-export function notifyOtherTabsOfLogin(params: { configId: string }) {
+export function notifyOtherTabsOfLogin(params) {
     const { configId } = params;
-
-    const message: Message = {
+    const message = {
         configId,
         appInstanceId: globalContext.appInstanceId
     };
-
     new BroadcastChannel(getChannelName({ configId })).postMessage(message);
 }
-
-export function getPrOtherTabLogin(params: { configId: string }) {
+export function getPrOtherTabLogin(params) {
     const { configId } = params;
-
-    const dOtherTabLogin = new Deferred<void>();
-
+    const dOtherTabLogin = new Deferred();
     const channel = new BroadcastChannel(getChannelName({ configId }));
-
     channel.onmessage = ({ data: message }) => {
-        assert(is<Message>(message));
-
+        assert(is(message));
         if (message.appInstanceId === globalContext.appInstanceId) {
             return;
         }
-
         channel.close();
-
         dOtherTabLogin.resolve();
     };
-
     const prOtherTabLogin = dOtherTabLogin.pr;
-
     return { prOtherTabLogin };
 }
+//# sourceMappingURL=loginPropagationToOtherTabs.js.map

package/esm/core/loginPropagationToOtherTabs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"loginPropagationToOtherTabs.js","sourceRoot":"","sources":["../../../src/core/loginPropagationToOtherTabs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,aAAa,GAAG;IAClB,aAAa,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;CACrD,CAAC;AAOF,SAAS,cAAc,CAAC,MAA4B;IAChD,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAC5B,OAAO,8BAA8B,QAAQ,EAAE,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,MAA4B;IAC/D,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAE5B,MAAM,OAAO,GAAY;QACrB,QAAQ;QACR,aAAa,EAAE,aAAa,CAAC,aAAa;KAC7C,CAAC;IAEF,IAAI,gBAAgB,CAAC,cAAc,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAA4B;IAC3D,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAE5B,MAAM,cAAc,GAAG,IAAI,QAAQ,EAAQ,CAAC;IAE5C,MAAM,OAAO,GAAG,IAAI,gBAAgB,CAAC,cAAc,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAEnE,OAAO,CAAC,SAAS,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,MAAM,CAAC,EAAE,CAAU,OAAO,CAAC,CAAC,CAAC;QAE7B,IAAI,OAAO,CAAC,aAAa,KAAK,aAAa,CAAC,aAAa,EAAE,CAAC;YACxD,OAAO;QACX,CAAC;QAED,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,cAAc,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,cAAc,CAAC,EAAE,CAAC;IAE1C,OAAO,EAAE,eAAe,EAAE,CAAC;AAC/B,CAAC"}

package/esm/core/loginSilent.d.ts

@@ -0,0 +1,28 @@
+import type { UserManager as OidcClientTsUserManager, User as OidcClientTsUser } from "../vendor/frontend/oidc-client-ts";
+import { type AuthResponse } from "./AuthResponse";
+type ResultOfLoginSilent = {
+    outcome: "got auth response from iframe";
+    authResponse: AuthResponse;
+} | {
+    outcome: "failure";
+    cause: "timeout" | "can't reach well-known oidc endpoint";
+} | {
+    outcome: "token refreshed using refresh token";
+    oidcClientTsUser: OidcClientTsUser;
+};
+export declare function loginSilent(params: {
+    oidcClientTsUserManager: OidcClientTsUserManager;
+    stateUrlParamValue_instance: string;
+    configId: string;
+    transformUrlBeforeRedirect: ((params: {
+        authorizationUrl: string;
+        isSilent: true;
+    }) => string) | undefined;
+    getExtraQueryParams: ((params: {
+        isSilent: true;
+        url: string;
+    }) => Record<string, string | undefined>) | undefined;
+    getExtraTokenParams: (() => Record<string, string | undefined>) | undefined;
+    autoLogin: boolean;
+}): Promise<ResultOfLoginSilent>;
+export {};

package/esm/core/loginSilent.js

@@ -0,0 +1,125 @@
+import { Deferred } from "../tools/Deferred";
+import { id, assert, noUndefined } from "../vendor/frontend/tsafe";
+import { getStateData, clearStateStore } from "./StateData";
+import { getDownlinkAndRtt } from "../tools/getDownlinkAndRtt";
+import { getIsDev } from "../tools/isDev";
+import { addOrUpdateSearchParam } from "../tools/urlSearchParams";
+import { initIframeMessageProtection } from "./iframeMessageProtection";
+export async function loginSilent(params) {
+    const { oidcClientTsUserManager, stateUrlParamValue_instance, configId, transformUrlBeforeRedirect, getExtraQueryParams, getExtraTokenParams, autoLogin } = params;
+    const dResult = new Deferred();
+    const timeoutDelayMs = (() => {
+        if (autoLogin) {
+            return 25000;
+        }
+        const downlinkAndRtt = getDownlinkAndRtt();
+        const isDev = getIsDev();
+        // Base delay is the minimum delay we should wait in any case
+        const BASE_DELAY_MS = isDev ? 9000 : 7000;
+        if (downlinkAndRtt === undefined) {
+            return BASE_DELAY_MS;
+        }
+        const { downlink, rtt } = downlinkAndRtt;
+        // Calculate dynamic delay based on RTT and downlink
+        // Add 1 to downlink to avoid division by zero
+        const dynamicDelay = rtt * 2.5 + BASE_DELAY_MS / (downlink + 1);
+        return Math.max(BASE_DELAY_MS, dynamicDelay);
+    })();
+    const { decodeEncryptedAuth, getIsEncryptedAuthResponse, clearSessionStoragePublicKey } = await initIframeMessageProtection({
+        stateUrlParamValue: stateUrlParamValue_instance
+    });
+    const timer = setTimeout(async () => {
+        dResult.resolve({
+            outcome: "failure",
+            cause: "timeout"
+        });
+    }, timeoutDelayMs);
+    const listener = async (event) => {
+        if (event.origin !== window.location.origin) {
+            return;
+        }
+        if (!getIsEncryptedAuthResponse({
+            message: event.data
+        })) {
+            return;
+        }
+        const { authResponse } = await decodeEncryptedAuth({ encryptedAuthResponse: event.data });
+        const stateData = getStateData({ stateUrlParamValue: authResponse.state });
+        assert(stateData !== undefined, "765645");
+        assert(stateData.context === "iframe", "250711");
+        if (stateData.configId !== configId) {
+            return;
+        }
+        clearTimeout(timer);
+        window.removeEventListener("message", listener);
+        dResult.resolve({
+            outcome: "got auth response from iframe",
+            authResponse
+        });
+    };
+    window.addEventListener("message", listener, false);
+    const transformUrl_oidcClientTs = (url) => {
+        add_extra_query_params: {
+            if (getExtraQueryParams === undefined) {
+                break add_extra_query_params;
+            }
+            const extraQueryParams = getExtraQueryParams({ isSilent: true, url });
+            for (const [name, value] of Object.entries(extraQueryParams)) {
+                if (value === undefined) {
+                    continue;
+                }
+                url = addOrUpdateSearchParam({ url, name, value, encodeMethod: "www-form" });
+            }
+        }
+        apply_transform_url: {
+            if (transformUrlBeforeRedirect === undefined) {
+                break apply_transform_url;
+            }
+            url = transformUrlBeforeRedirect({ authorizationUrl: url, isSilent: true });
+        }
+        return url;
+    };
+    oidcClientTsUserManager
+        .signinSilent({
+        state: id({
+            context: "iframe",
+            configId
+        }),
+        silentRequestTimeoutInSeconds: timeoutDelayMs / 1000,
+        extraTokenParams: getExtraTokenParams === undefined ? undefined : noUndefined(getExtraTokenParams()),
+        transformUrl: transformUrl_oidcClientTs
+    })
+        .then(oidcClientTsUser => {
+        assert(oidcClientTsUser !== null, "oidcClientTsUser is not supposed to be null here");
+        clearTimeout(timer);
+        window.removeEventListener("message", listener);
+        dResult.resolve({
+            outcome: "token refreshed using refresh token",
+            oidcClientTsUser
+        });
+    }, (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.
+            // This usually means that the server is down or that the issuerUri
+            // is not pointing to a valid oidc server.
+            // It could be a CORS error on the well-known endpoint but it's unlikely.
+            clearTimeout(timer);
+            dResult.resolve({
+                outcome: "failure",
+                cause: "can't reach well-known oidc endpoint"
+            });
+            return;
+        }
+        // NOTE: Here, except error on our understanding there can't be any other
+        // error than timeout so we fail silently and let the timeout expire.
+    });
+    dResult.pr.then(result => {
+        clearSessionStoragePublicKey();
+        if (result.outcome === "failure") {
+            clearStateStore({ stateUrlParamValue: stateUrlParamValue_instance });
+        }
+    });
+    return dResult.pr;
+}
+//# sourceMappingURL=loginSilent.js.map

package/esm/core/loginSilent.js.map

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

package/esm/core/logoutPropagationToOtherTabs.d.ts

@@ -0,0 +1,10 @@
+export declare function notifyOtherTabsOfLogout(params: {
+    configId: string;
+    sessionId: string | undefined;
+}): void;
+export declare function getPrOtherTabLogout(params: {
+    sessionId: string | undefined;
+    configId: string;
+}): {
+    prOtherTabLogout: Promise<void>;
+};