oidc-spa 8.2.2 → 8.2.4

package/src/react/react.tsx

@@ -15,6 +15,7 @@ import { id } from "../tools/tsafe/id";
 import type { ValueOrAsyncGetter } from "../tools/ValueOrAsyncGetter";
 import { Deferred } from "../tools/Deferred";
 import { toFullyQualifiedUrl } from "../tools/toFullyQualifiedUrl";
+import { setDesiredPostLoginRedirectUrl } from "../core/desiredPostLoginRedirectUrl";
 
 export type OidcReact<DecodedIdToken extends Record<string, unknown>> =
     | OidcReact.NotLoggedIn
@@ -409,20 +410,48 @@ export function createReactOidc_dependencyInjection<
 
         const oidc = await getOidc();
 
+        const isUrlAlreadyReplaced =
+            window.location.href.replace(/\/$/, "") === redirectUrl.replace(/\/$/, "");
+
         if (!oidc.isUserLoggedIn) {
             if (cause === "preload") {
                 throw new Error(
                     "oidc-spa: User is not yet logged in. This is an expected error, nothing to be addressed."
                 );
             }
-            const doesCurrentHrefRequiresAuth =
-                location.href.replace(/\/$/, "") === redirectUrl.replace(/\/$/, "");
 
             await oidc.login({
                 redirectUrl,
-                doesCurrentHrefRequiresAuth
+                doesCurrentHrefRequiresAuth: isUrlAlreadyReplaced
             });
         }
+
+        define_temporary_postLoginRedirectUrl: {
+            if (isUrlAlreadyReplaced) {
+                break define_temporary_postLoginRedirectUrl;
+            }
+
+            setDesiredPostLoginRedirectUrl({ postLoginRedirectUrl: redirectUrl });
+
+            const history_pushState = history.pushState;
+            const history_replaceState = history.replaceState;
+
+            const onNavigated = () => {
+                history.pushState = history_pushState;
+                history.replaceState = history_replaceState;
+                setDesiredPostLoginRedirectUrl({ postLoginRedirectUrl: undefined });
+            };
+
+            history.pushState = function pushState(...args) {
+                onNavigated();
+                return history_pushState.call(history, ...args);
+            };
+
+            history.replaceState = function replaceState(...args) {
+                onNavigated();
+                return history_replaceState.call(history, ...args);
+            };
+        }
     }
 
     async function getOidc(): Promise<Oidc<DecodedIdToken>> {

package/src/react-spa/apiBuilder.ts

@@ -10,7 +10,7 @@ export type OidcSpaApiBuilder<
         | "withAutoLogin"
         | "withExpectedDecodedIdTokenShape"
         | "withAccessTokenValidation"
-        | "finalize" = never
+        | "createApi" = never
 > = Omit<
     {
         withAutoLogin: () => OidcSpaApiBuilder<true, DecodedIdToken, ExcludedMethod | "withAutoLogin">;
@@ -26,7 +26,7 @@ export type OidcSpaApiBuilder<
             ExcludedMethod | "withExpectedDecodedIdTokenShape"
         >;
 
-        finalize: () => OidcSpaApi<AutoLogin, DecodedIdToken>;
+        createApi: () => OidcSpaApi<AutoLogin, DecodedIdToken>;
     },
     ExcludedMethod
 >;
@@ -54,7 +54,7 @@ function createOidcSpaApiBuilder<
                 decodedIdTokenSchema,
                 decodedIdToken_mock: decodedIdToken_mock
             }),
-        finalize: () =>
+        createApi: () =>
             createOidcSpaApi<AutoLogin, DecodedIdToken>({
                 autoLogin: params.autoLogin,
                 decodedIdTokenSchema: params.decodedIdTokenSchema,

package/src/react-spa/createOidcSpaApi.tsx

@@ -10,6 +10,7 @@ import { createObjectThatThrowsIfAccessed } from "../tools/createObjectThatThrow
 import { createStatefulEvt } from "../tools/StatefulEvt";
 import { id } from "../tools/tsafe/id";
 import { toFullyQualifiedUrl } from "../tools/toFullyQualifiedUrl";
+import { setDesiredPostLoginRedirectUrl } from "../core/desiredPostLoginRedirectUrl";
 
 export function createOidcSpaApi<
     AutoLogin extends boolean,
@@ -225,6 +226,7 @@ export function createOidcSpaApi<
                 initializationError: oidcCore.initializationError,
                 issuerUri: oidcCore.params.issuerUri,
                 clientId: oidcCore.params.clientId,
+                validRedirectUri: oidcCore.params.validRedirectUri,
                 autoLogoutState: { shouldDisplayWarning: false },
                 login: params =>
                     oidcCore.login({
@@ -250,7 +252,8 @@ export function createOidcSpaApi<
                 return evtAutoLogoutState.current;
             },
             issuerUri: oidcCore.params.issuerUri,
-            clientId: oidcCore.params.clientId
+            clientId: oidcCore.params.clientId,
+            validRedirectUri: oidcCore.params.validRedirectUri
         });
     }
 
@@ -390,7 +393,7 @@ export function createOidcSpaApi<
                                 transformUrlBeforeRedirect: paramsOfBootstrap.transformUrlBeforeRedirect,
                                 extraQueryParams: paramsOfBootstrap.extraQueryParams,
                                 extraTokenParams: paramsOfBootstrap.extraTokenParams,
-                                noIframe: paramsOfBootstrap.noIframe,
+                                sessionRestorationMethod: paramsOfBootstrap.sessionRestorationMethod,
                                 debugLogs: paramsOfBootstrap.debugLogs,
                                 __unsafe_clientSecret: paramsOfBootstrap.__unsafe_clientSecret,
                                 __metadata: paramsOfBootstrap.__metadata,
@@ -440,25 +443,53 @@ export function createOidcSpaApi<
                 });
             }
 
-            return location.href;
+            return window.location.href;
         })();
 
         const oidc = await getOidc();
 
+        const isUrlAlreadyReplaced =
+            window.location.href.replace(/\/$/, "") === redirectUrl.replace(/\/$/, "");
+
         if (!oidc.isUserLoggedIn) {
             if (cause === "preload") {
                 throw new Error(
                     "oidc-spa: User is not yet logged in. This is an expected error, nothing to be addressed."
                 );
             }
-            const doesCurrentHrefRequiresAuth =
-                location.href.replace(/\/$/, "") === redirectUrl.replace(/\/$/, "");
 
             await oidc.login({
                 redirectUrl,
-                doesCurrentHrefRequiresAuth
+                doesCurrentHrefRequiresAuth: isUrlAlreadyReplaced
             });
         }
+
+        define_temporary_postLoginRedirectUrl: {
+            if (isUrlAlreadyReplaced) {
+                break define_temporary_postLoginRedirectUrl;
+            }
+
+            setDesiredPostLoginRedirectUrl({ postLoginRedirectUrl: redirectUrl });
+
+            const history_pushState = history.pushState;
+            const history_replaceState = history.replaceState;
+
+            const onNavigated = () => {
+                history.pushState = history_pushState;
+                history.replaceState = history_replaceState;
+                setDesiredPostLoginRedirectUrl({ postLoginRedirectUrl: undefined });
+            };
+
+            history.pushState = function pushState(...args) {
+                onNavigated();
+                return history_pushState.call(history, ...args);
+            };
+
+            history.replaceState = function replaceState(...args) {
+                onNavigated();
+                return history_replaceState.call(history, ...args);
+            };
+        }
     }
 
     function OidcInitializationErrorGate(props: {

package/src/react-spa/types.tsx

@@ -31,6 +31,7 @@ export namespace UseOidc {
         type Common = {
             issuerUri: string;
             clientId: string;
+            validRedirectUri: string;
         };
 
         export type NotLoggedIn = Common & {
@@ -213,11 +214,34 @@ export namespace ParamsOfBootstrap {
             | (() => Record<string, string | undefined>);
 
         /**
-         * Default: false
+         * Determines how session restoration is handled.
+         * Session restoration allows users to stay logged in between visits
+         * without needing to explicitly sign in each time.
          *
-         * See: https://docs.oidc-spa.dev/v/v8/resources/iframe-related-issues
+         * Options:
+         *
+         * - **"auto" (default)**:
+         *   Automatically selects the best method.
+         *   If the app’s domain shares a common parent domain with the authorization endpoint,
+         *   an iframe is used for silent session restoration.
+         *   Otherwise, a full-page redirect is used.
+         *
+         * - **"full page redirect"**:
+         *   Forces full-page reloads for session restoration.
+         *   Use this if your application is served with a restrictive CSP
+         *   (e.g., `Content-Security-Policy: frame-ancestors "none"`)
+         *   or `X-Frame-Options: DENY`, and you cannot modify those headers.
+         *   This mode provides a slightly less seamless UX and will lead oidc-spa to
+         *   store tokens in `localStorage` if multiple OIDC clients are used
+         *   (e.g., your app communicates with several APIs).
+         *
+         * - **"iframe"**:
+         *   Forces iframe-based session restoration.
+         *   In development, if you go in your browser setting and allow your auth server’s domain
+         *   to set third-party cookies this value will let you test your app
+         *   with the local dev server as it will behave in production.
          */
-        noIframe?: boolean;
+        sessionRestorationMethod?: "iframe" | "full page redirect" | "auto";
 
         debugLogs?: boolean;
 

package/src/tanstack-start/react/apiBuilder.ts

@@ -14,7 +14,7 @@ export type OidcSpaApiBuilder<
         | "withAutoLogin"
         | "withExpectedDecodedIdTokenShape"
         | "withAccessTokenValidation"
-        | "finalize" = never
+        | "createApi" = never
 > = Omit<
     {
         withAutoLogin: () => OidcSpaApiBuilder<
@@ -61,7 +61,7 @@ export type OidcSpaApiBuilder<
                 ExcludedMethod | "withAccessTokenValidation"
             >;
         };
-        finalize: () => OidcSpaApi<AutoLogin, DecodedIdToken, AccessTokenClaims>;
+        createApi: () => OidcSpaApi<AutoLogin, DecodedIdToken, AccessTokenClaims>;
     },
     ExcludedMethod
 >;
@@ -127,7 +127,7 @@ function createOidcSpaApiBuilder<
                     }
                 })()
             }),
-        finalize: () =>
+        createApi: () =>
             createOidcSpaApi<AutoLogin, DecodedIdToken, AccessTokenClaims>({
                 autoLogin: params.autoLogin,
                 decodedIdTokenSchema: params.decodedIdTokenSchema,

package/src/tanstack-start/react/createOidcSpaApi.tsx

@@ -30,6 +30,7 @@ import { createServerFn, createMiddleware } from "@tanstack/react-start";
 import { getRequest, setResponseHeader, setResponseStatus } from "@tanstack/react-start/server";
 import { toFullyQualifiedUrl } from "../../tools/toFullyQualifiedUrl";
 import { UnifiedClientRetryForSsrLoadersError } from "./rfcUnifiedClientRetryForSsrLoaders/UnifiedClientRetryForSsrLoadersError";
+import { setDesiredPostLoginRedirectUrl } from "../../core/desiredPostLoginRedirectUrl";
 
 export function createOidcSpaApi<
     AutoLogin extends boolean,
@@ -215,6 +216,7 @@ export function createOidcSpaApi<
                 initializationError: oidcCore.initializationError,
                 issuerUri: oidcCore.params.issuerUri,
                 clientId: oidcCore.params.clientId,
+                validRedirectUri: oidcCore.params.validRedirectUri,
                 autoLogoutState: { shouldDisplayWarning: false },
                 login: params =>
                     oidcCore.login({
@@ -240,7 +242,8 @@ export function createOidcSpaApi<
                 return evtAutoLogoutState.current;
             },
             issuerUri: oidcCore.params.issuerUri,
-            clientId: oidcCore.params.clientId
+            clientId: oidcCore.params.clientId,
+            validRedirectUri: oidcCore.params.validRedirectUri
         });
     }
 
@@ -662,7 +665,7 @@ export function createOidcSpaApi<
                                 transformUrlBeforeRedirect: paramsOfBootstrap.transformUrlBeforeRedirect,
                                 extraQueryParams: paramsOfBootstrap.extraQueryParams,
                                 extraTokenParams: paramsOfBootstrap.extraTokenParams,
-                                noIframe: paramsOfBootstrap.noIframe,
+                                sessionRestorationMethod: paramsOfBootstrap.sessionRestorationMethod,
                                 debugLogs: paramsOfBootstrap.debugLogs,
                                 __unsafe_clientSecret: paramsOfBootstrap.__unsafe_clientSecret,
                                 __metadata: paramsOfBootstrap.__metadata,
@@ -714,6 +717,9 @@ export function createOidcSpaApi<
 
         const oidc = await getOidc();
 
+        const isUrlAlreadyReplaced =
+            window.location.href.replace(/\/$/, "") === redirectUrl.replace(/\/$/, "");
+
         if (!oidc.isUserLoggedIn) {
             if (cause === "preload") {
                 throw new Error(
@@ -724,14 +730,39 @@ export function createOidcSpaApi<
                     ].join(" ")
                 );
             }
-            const doesCurrentHrefRequiresAuth =
-                location.href.replace(/\/$/, "") === redirectUrl.replace(/\/$/, "");
 
             await oidc.login({
                 redirectUrl,
-                doesCurrentHrefRequiresAuth
+                doesCurrentHrefRequiresAuth: isUrlAlreadyReplaced
             });
         }
+
+        define_temporary_postLoginRedirectUrl: {
+            if (isUrlAlreadyReplaced) {
+                break define_temporary_postLoginRedirectUrl;
+            }
+
+            setDesiredPostLoginRedirectUrl({ postLoginRedirectUrl: redirectUrl });
+
+            const history_pushState = history.pushState;
+            const history_replaceState = history.replaceState;
+
+            const onNavigated = () => {
+                history.pushState = history_pushState;
+                history.replaceState = history_replaceState;
+                setDesiredPostLoginRedirectUrl({ postLoginRedirectUrl: undefined });
+            };
+
+            history.pushState = function pushState(...args) {
+                onNavigated();
+                return history_pushState.call(history, ...args);
+            };
+
+            history.replaceState = function replaceState(...args) {
+                onNavigated();
+                return history_replaceState.call(history, ...args);
+            };
+        }
     }
 
     enforceLogin.__isOidcSpaEnforceLogin = true;

package/src/tanstack-start/react/types.tsx

@@ -45,6 +45,7 @@ export namespace CreateOidcComponent {
         type Common = {
             issuerUri: string;
             clientId: string;
+            validRedirectUri: string;
         };
 
         export type NotLoggedIn = Common & {
@@ -306,11 +307,34 @@ export namespace ParamsOfBootstrap {
             | (() => Record<string, string | undefined>);
 
         /**
-         * Default: false
+         * Determines how session restoration is handled.
+         * Session restoration allows users to stay logged in between visits
+         * without needing to explicitly sign in each time.
          *
-         * See: https://docs.oidc-spa.dev/v/v8/resources/iframe-related-issues
+         * Options:
+         *
+         * - **"auto" (default)**:
+         *   Automatically selects the best method.
+         *   If the app’s domain shares a common parent domain with the authorization endpoint,
+         *   an iframe is used for silent session restoration.
+         *   Otherwise, a full-page redirect is used.
+         *
+         * - **"full page redirect"**:
+         *   Forces full-page reloads for session restoration.
+         *   Use this if your application is served with a restrictive CSP
+         *   (e.g., `Content-Security-Policy: frame-ancestors "none"`)
+         *   or `X-Frame-Options: DENY`, and you cannot modify those headers.
+         *   This mode provides a slightly less seamless UX and will lead oidc-spa to
+         *   store tokens in `localStorage` if multiple OIDC clients are used
+         *   (e.g., your app communicates with several APIs).
+         *
+         * - **"iframe"**:
+         *   Forces iframe-based session restoration.
+         *   In development, if you go in your browser setting and allow your auth server’s domain
+         *   to set third-party cookies this value will let you test your app
+         *   with the local dev server as it will behave in production.
          */
-        noIframe?: boolean;
+        sessionRestorationMethod?: "iframe" | "full page redirect" | "auto";
 
         debugLogs?: boolean;
 

package/src/tools/lazySessionStorage.ts

@@ -1,7 +1,5 @@
 import { assert } from "../tools/tsafe/assert";
 
-const SESSION_STORAGE_PREFIX = "lazy-session-storage:";
-
 export type LazySessionStorage = {
     // `Storage` methods, we don't use the type directly because it has [name: string]: any;
     readonly length: number;
@@ -15,14 +13,20 @@ export type LazySessionStorage = {
     persistCurrentStateAndSubsequentChanges: () => void;
 };
 
-export function createLazySessionStorage(): LazySessionStorage {
+export function createLazySessionStorage(params: { storageId: string }): LazySessionStorage {
+    const { storageId } = params;
+
+    const sessionStoragePrefix = `lazy-session-storage:${storageId}:`;
+
+    const getSessionStorageKey = (key: string) => `${sessionStoragePrefix}${key}`;
+
     const entries: { key: string; value: string }[] = [];
 
     for (let i = 0; i < sessionStorage.length; i++) {
         const key = sessionStorage.key(i);
         assert(key !== null, "470498");
 
-        if (!key.startsWith(SESSION_STORAGE_PREFIX)) {
+        if (!key.startsWith(sessionStoragePrefix)) {
             continue;
         }
 
@@ -33,7 +37,7 @@ export function createLazySessionStorage(): LazySessionStorage {
         sessionStorage.removeItem(key);
 
         entries.push({
-            key: key.slice(SESSION_STORAGE_PREFIX.length),
+            key: key.slice(sessionStoragePrefix.length),
             value
         });
     }
@@ -74,7 +78,7 @@ export function createLazySessionStorage(): LazySessionStorage {
                 return;
             }
 
-            sessionStorage.removeItem(`${SESSION_STORAGE_PREFIX}${entry.key}`);
+            sessionStorage.removeItem(getSessionStorageKey(entry.key));
 
             const index = entries.indexOf(entry);
 
@@ -96,7 +100,7 @@ export function createLazySessionStorage(): LazySessionStorage {
         },
         setItem: (key, value) => {
             if (isPersistenceEnabled) {
-                sessionStorage.setItem(`${SESSION_STORAGE_PREFIX}${key}`, value);
+                sessionStorage.setItem(getSessionStorageKey(key), value);
             }
 
             update: {

package/src/tools/parseKeycloakIssuerUri.ts

@@ -44,6 +44,11 @@ export function parseKeycloakIssuerUri(issuerUri: string):
         kcHttpRelativePath: keycloakUtils.issuerUriParsed.kcHttpRelativePath,
         adminConsoleUrl: keycloakUtils.adminConsoleUrl,
         adminConsoleUrl_master: keycloakUtils.adminConsoleUrl_master,
-        getAccountUrl: keycloakUtils.getAccountUrl
+        getAccountUrl: ({ clientId, backToAppFromAccountUrl, locale }) =>
+            keycloakUtils.getAccountUrl({
+                clientId,
+                validRedirectUri: backToAppFromAccountUrl,
+                locale
+            })
     };
 }

package/src/vite-plugin/manageOptimizedDeps.ts

@@ -34,7 +34,8 @@ export function manageOptimizedDeps(params: {
                 const moduleNames_include = [
                     "oidc-spa/react-spa",
                     "oidc-spa/entrypoint",
-                    "oidc-spa/keycloak"
+                    "oidc-spa/keycloak",
+                    "oidc-spa/core"
                 ];
 
                 for (const moduleName of moduleNames_include) {

package/tools/lazySessionStorage.d.ts

@@ -7,4 +7,6 @@ export type LazySessionStorage = {
     setItem(key: string, value: string): void;
     persistCurrentStateAndSubsequentChanges: () => void;
 };
-export declare function createLazySessionStorage(): LazySessionStorage;
+export declare function createLazySessionStorage(params: {
+    storageId: string;
+}): LazySessionStorage;

package/tools/lazySessionStorage.js

@@ -2,20 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLazySessionStorage = createLazySessionStorage;
 const assert_1 = require("../tools/tsafe/assert");
-const SESSION_STORAGE_PREFIX = "lazy-session-storage:";
-function createLazySessionStorage() {
+function createLazySessionStorage(params) {
+    const { storageId } = params;
+    const sessionStoragePrefix = `lazy-session-storage:${storageId}:`;
+    const getSessionStorageKey = (key) => `${sessionStoragePrefix}${key}`;
     const entries = [];
     for (let i = 0; i < sessionStorage.length; i++) {
         const key = sessionStorage.key(i);
         (0, assert_1.assert)(key !== null, "470498");
-        if (!key.startsWith(SESSION_STORAGE_PREFIX)) {
+        if (!key.startsWith(sessionStoragePrefix)) {
             continue;
         }
         const value = sessionStorage.getItem(key);
         (0, assert_1.assert)(value !== null, "846771");
         sessionStorage.removeItem(key);
         entries.push({
-            key: key.slice(SESSION_STORAGE_PREFIX.length),
+            key: key.slice(sessionStoragePrefix.length),
             value
         });
     }
@@ -46,7 +48,7 @@ function createLazySessionStorage() {
             if (entry === undefined) {
                 return;
             }
-            sessionStorage.removeItem(`${SESSION_STORAGE_PREFIX}${entry.key}`);
+            sessionStorage.removeItem(getSessionStorageKey(entry.key));
             const index = entries.indexOf(entry);
             entries.splice(index, 1);
         },
@@ -66,7 +68,7 @@ function createLazySessionStorage() {
         },
         setItem: (key, value) => {
             if (isPersistenceEnabled) {
-                sessionStorage.setItem(`${SESSION_STORAGE_PREFIX}${key}`, value);
+                sessionStorage.setItem(getSessionStorageKey(key), value);
             }
             update: {
                 const entry = entries.find(entry => entry.key === key);

package/tools/lazySessionStorage.js.map

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

package/tools/parseKeycloakIssuerUri.js

@@ -30,7 +30,11 @@ function parseKeycloakIssuerUri(issuerUri) {
         kcHttpRelativePath: keycloakUtils.issuerUriParsed.kcHttpRelativePath,
         adminConsoleUrl: keycloakUtils.adminConsoleUrl,
         adminConsoleUrl_master: keycloakUtils.adminConsoleUrl_master,
-        getAccountUrl: keycloakUtils.getAccountUrl
+        getAccountUrl: ({ clientId, backToAppFromAccountUrl, locale }) => keycloakUtils.getAccountUrl({
+            clientId,
+            validRedirectUri: backToAppFromAccountUrl,
+            locale
+        })
     };
 }
 //# sourceMappingURL=parseKeycloakIssuerUri.js.map

package/tools/parseKeycloakIssuerUri.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseKeycloakIssuerUri.js","sourceRoot":"","sources":["../src/tools/parseKeycloakIssuerUri.ts"],"names":[],"mappings":";;AAmBA,wDA6BC;AAhDD,0CAA8D;AAE9D;;;;;;;;;;;;;;;;KAgBK;AACL,SAAgB,sBAAsB,CAAC,SAAiB;IAepD,IAAI,CAAC,IAAA,qBAAU,EAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;QAC7B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,aAAa,GAAG,IAAA,8BAAmB,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAEzD,OAAO;QACH,MAAM,EAAE,aAAa,CAAC,eAAe,CAAC,MAAM;QAC5C,KAAK,EAAE,aAAa,CAAC,eAAe,CAAC,KAAK;QAC1C,kBAAkB,EAAE,aAAa,CAAC,eAAe,CAAC,kBAAkB;QACpE,eAAe,EAAE,aAAa,CAAC,eAAe;QAC9C,sBAAsB,EAAE,aAAa,CAAC,sBAAsB;QAC5D,aAAa,EAAE,aAAa,CAAC,aAAa;KAC7C,CAAC;AACN,CAAC"}
+{"version":3,"file":"parseKeycloakIssuerUri.js","sourceRoot":"","sources":["../src/tools/parseKeycloakIssuerUri.ts"],"names":[],"mappings":";;AAmBA,wDAkCC;AArDD,0CAA8D;AAE9D;;;;;;;;;;;;;;;;KAgBK;AACL,SAAgB,sBAAsB,CAAC,SAAiB;IAepD,IAAI,CAAC,IAAA,qBAAU,EAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;QAC7B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,aAAa,GAAG,IAAA,8BAAmB,EAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAEzD,OAAO;QACH,MAAM,EAAE,aAAa,CAAC,eAAe,CAAC,MAAM;QAC5C,KAAK,EAAE,aAAa,CAAC,eAAe,CAAC,KAAK;QAC1C,kBAAkB,EAAE,aAAa,CAAC,eAAe,CAAC,kBAAkB;QACpE,eAAe,EAAE,aAAa,CAAC,eAAe;QAC9C,sBAAsB,EAAE,aAAa,CAAC,sBAAsB;QAC5D,aAAa,EAAE,CAAC,EAAE,QAAQ,EAAE,uBAAuB,EAAE,MAAM,EAAE,EAAE,EAAE,CAC7D,aAAa,CAAC,aAAa,CAAC;YACxB,QAAQ;YACR,gBAAgB,EAAE,uBAAuB;YACzC,MAAM;SACT,CAAC;KACT,CAAC;AACN,CAAC"}

package/vite-plugin/manageOptimizedDeps.js

@@ -59,7 +59,8 @@ function manageOptimizedDeps(params) {
                 const moduleNames_include = [
                     "oidc-spa/react-spa",
                     "oidc-spa/entrypoint",
-                    "oidc-spa/keycloak"
+                    "oidc-spa/keycloak",
+                    "oidc-spa/core"
                 ];
                 for (const moduleName of moduleNames_include) {
                     (0, assert_1.assert)(moduleNames.includes(moduleName));

package/vite-plugin/manageOptimizedDeps.js.map

@@ -1 +1 @@
-{"version":3,"file":"manageOptimizedDeps.js","sourceRoot":"","sources":["../src/vite-plugin/manageOptimizedDeps.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,kDA0DC;AAhED,4FAAqF;AACrF,4CAA8B;AAC9B,+BAAwC;AAExC,kDAA+C;AAE/C,SAAgB,mBAAmB,CAAC,MAGnC;;IACG,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAE3C,IAAI,WAAW,KAAK,OAAO,EAAE,CAAC;QAC1B,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAChC,EAAE,CAAC,YAAY,CAAC,IAAA,WAAQ,EAAC,IAAA,2DAA0B,GAAE,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CACzB,CAAC;IAEpE,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC;SACxD,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC;SACjD,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;IAEhE,QAAQ,WAAW,EAAE,CAAC;QAClB,KAAK,gBAAgB;YACjB,CAAC;gBACG,OAAC,CAAC,UAAU,CAAC,YAAY,KAAvB,UAAU,CAAC,YAAY,GAAK,EAAE,EAAC,EAAC,OAAO,QAAP,OAAO,GAAK,EAAE,EAAC,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;YAC3E,CAAC;YACD,MAAM;QACV,KAAK,wBAAwB;YACzB,CAAC;gBACG,MAAM,mBAAmB,GAAG;oBACxB,oBAAoB;oBACpB,qBAAqB;oBACrB,mBAAmB;iBACtB,CAAC;gBAEF,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE,CAAC;oBAC3C,IAAA,eAAM,EAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;gBAC7C,CAAC;gBAED,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE;oBACzB,IAAI,CAAC;wBACD,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;oBACxC,CAAC;oBAAC,MAAM,CAAC;wBACL,OAAO,KAAK,CAAC;oBACjB,CAAC;oBAED,OAAO,IAAI,CAAC;gBAChB,CAAC,CAAC,EAAE,CAAC;gBAEL,IAAI,cAAc,EAAE,CAAC;oBACjB,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACpC,CAAC;gBAED,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAErC,OAAC,CAAC,UAAU,CAAC,YAAY,KAAvB,UAAU,CAAC,YAAY,GAAK,EAAE,EAAC,EAAC,OAAO,QAAP,OAAO,GAAK,EAAE,EAAC,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,CAAC;YACnF,CAAC;YACD,MAAM;IACd,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC"}
+{"version":3,"file":"manageOptimizedDeps.js","sourceRoot":"","sources":["../src/vite-plugin/manageOptimizedDeps.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,kDA2DC;AAjED,4FAAqF;AACrF,4CAA8B;AAC9B,+BAAwC;AAExC,kDAA+C;AAE/C,SAAgB,mBAAmB,CAAC,MAGnC;;IACG,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;IAE3C,IAAI,WAAW,KAAK,OAAO,EAAE,CAAC;QAC1B,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAChC,EAAE,CAAC,YAAY,CAAC,IAAA,WAAQ,EAAC,IAAA,2DAA0B,GAAE,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CACzB,CAAC;IAEpE,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC;SACxD,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC;SACjD,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;IAEhE,QAAQ,WAAW,EAAE,CAAC;QAClB,KAAK,gBAAgB;YACjB,CAAC;gBACG,OAAC,CAAC,UAAU,CAAC,YAAY,KAAvB,UAAU,CAAC,YAAY,GAAK,EAAE,EAAC,EAAC,OAAO,QAAP,OAAO,GAAK,EAAE,EAAC,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;YAC3E,CAAC;YACD,MAAM;QACV,KAAK,wBAAwB;YACzB,CAAC;gBACG,MAAM,mBAAmB,GAAG;oBACxB,oBAAoB;oBACpB,qBAAqB;oBACrB,mBAAmB;oBACnB,eAAe;iBAClB,CAAC;gBAEF,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE,CAAC;oBAC3C,IAAA,eAAM,EAAC,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;gBAC7C,CAAC;gBAED,MAAM,cAAc,GAAG,CAAC,GAAG,EAAE;oBACzB,IAAI,CAAC;wBACD,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;oBACxC,CAAC;oBAAC,MAAM,CAAC;wBACL,OAAO,KAAK,CAAC;oBACjB,CAAC;oBAED,OAAO,IAAI,CAAC;gBAChB,CAAC,CAAC,EAAE,CAAC;gBAEL,IAAI,cAAc,EAAE,CAAC;oBACjB,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACpC,CAAC;gBAED,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAErC,OAAC,CAAC,UAAU,CAAC,YAAY,KAAvB,UAAU,CAAC,YAAY,GAAK,EAAE,EAAC,EAAC,OAAO,QAAP,OAAO,GAAK,EAAE,EAAC,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,CAAC;YACnF,CAAC;YACD,MAAM;IACd,CAAC;IAED,OAAO,UAAU,CAAC;AACtB,CAAC"}