oidc-spa 7.3.0 → 7.3.1

package/core/createOidc.js

@@ -63,7 +63,7 @@ const isNewBrowserSession_1 = require("./isNewBrowserSession");
 const getIsOnline_1 = require("../tools/getIsOnline");
 const isKeycloak_1 = require("../keycloak/isKeycloak");
 // NOTE: Replaced at build time
-const VERSION = "7.3.0";
+const VERSION = "7.3.1";
 const globalContext = {
     prOidcByConfigId: new Map(),
     hasLogoutBeenCalled: (0, tsafe_1.id)(false),

package/esm/core/createOidc.js

@@ -26,7 +26,7 @@ import { createGetIsNewBrowserSession } from "./isNewBrowserSession";
 import { getIsOnline } from "../tools/getIsOnline";
 import { isKeycloak } from "../keycloak/isKeycloak";
 // NOTE: Replaced at build time
-const VERSION = "7.3.0";
+const VERSION = "7.3.1";
 const globalContext = {
     prOidcByConfigId: new Map(),
     hasLogoutBeenCalled: id(false),

package/esm/keycloak/keycloak-js/Keycloak.d.ts

@@ -1,4 +1,5 @@
 import type { KeycloakServerConfig, KeycloakInitOptions, KeycloakError, KeycloakLogoutOptions, KeycloakRoles, KeycloakTokenParsed, KeycloakResourceAccess, KeycloakProfile, KeycloakUserInfo, KeycloakLoginOptions, KeycloakRegisterOptions, KeycloakAccountOptions } from "./types";
+import { type Oidc } from "../../core";
 type ConstructorParams = KeycloakServerConfig & {
     homeUrl: string;
 };
@@ -10,6 +11,7 @@ type ConstructorParams = KeycloakServerConfig & {
  * it is a full alternative implementation aligned with the `keycloak-js` API.
  */
 export declare class Keycloak {
+    #private;
     /**
      * Creates a new Keycloak client instance.
      * @param config A configuration object or path to a JSON config file.
@@ -278,5 +280,7 @@ export declare class Keycloak {
      * @private Undocumented.
      */
     loadUserInfo(): Promise<KeycloakUserInfo>;
+    /** Get the underlying oidc-spa instance */
+    get oidc(): Oidc<Record<string, unknown>>;
 }
 export {};

package/esm/keycloak/keycloak-js/Keycloak.js

@@ -1,3 +1,15 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _Keycloak_state;
 import { assert, is, isAmong } from "../../vendor/frontend/tsafe";
 import { createOidc, OidcInitializationError } from "../../core";
 import { Deferred } from "../../tools/Deferred";
@@ -6,7 +18,6 @@ import { createKeycloakUtils } from "../keycloakUtils";
 import { workerTimers } from "../../vendor/frontend/worker-timers";
 import { createStatefulEvt } from "../../tools/StatefulEvt";
 import { readExpirationTimeInJwt } from "../../tools/readExpirationTimeInJwt";
-const internalStateByInstance = new WeakMap();
 /**
  * This module provides a drop-in replacement for `keycloak-js`,
  * designed for teams migrating to `oidc-spa` with minimal changes.
@@ -24,6 +35,7 @@ export class Keycloak {
      * I'm not seeing the usecase when ran against keycloak right now so not doing it.
      */
     constructor(params) {
+        _Keycloak_state.set(this, void 0);
         /**
          * Response mode passed in init (default value is `'fragment'`).
          *
@@ -45,7 +57,7 @@ export class Keycloak {
          */
         this.flow = "standard";
         const issuerUri = `${params.url.replace(/\/$/, "")}/realms/${params.realm}`;
-        internalStateByInstance.set(this, {
+        __classPrivateFieldSet(this, _Keycloak_state, {
             constructorParams: params,
             dInitialized: new Deferred(),
             initOptions: undefined,
@@ -56,7 +68,7 @@ export class Keycloak {
             profile: undefined,
             userInfo: undefined,
             $onTokenExpired: createStatefulEvt(() => undefined)
-        });
+        }, "f");
     }
     /**
      * Called to initialize the adapter.
@@ -65,25 +77,23 @@ export class Keycloak {
      */
     async init(initOptions = {}) {
         const { onLoad = "check-sso", redirectUri, enableLogging, scope, locale } = initOptions;
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        if (internalState.initOptions !== undefined) {
-            if (JSON.stringify(internalState.initOptions) !== JSON.stringify(initOptions)) {
+        if (__classPrivateFieldGet(this, _Keycloak_state, "f").initOptions !== undefined) {
+            if (JSON.stringify(__classPrivateFieldGet(this, _Keycloak_state, "f").initOptions) !== JSON.stringify(initOptions)) {
                 throw new Error("Can't call init() multiple time with different params");
             }
-            await internalState.dInitialized.pr;
-            const { oidc } = internalState;
+            await __classPrivateFieldGet(this, _Keycloak_state, "f").dInitialized.pr;
+            const { oidc } = __classPrivateFieldGet(this, _Keycloak_state, "f");
             assert(oidc !== undefined);
             return oidc.isUserLoggedIn;
         }
-        internalState.initOptions = initOptions;
-        const { constructorParams, issuerUri } = internalState;
+        __classPrivateFieldGet(this, _Keycloak_state, "f").initOptions = initOptions;
+        const { constructorParams, issuerUri } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         const autoLogin = onLoad === "login-required";
         let hasCreateResolved = false;
         const oidcOrError = await createOidc({
             homeUrl: constructorParams.homeUrl,
             issuerUri,
-            clientId: internalState.constructorParams.clientId,
+            clientId: __classPrivateFieldGet(this, _Keycloak_state, "f").constructorParams.clientId,
             autoLogin,
             postLoginRedirectUrl: redirectUri,
             debugLogs: enableLogging,
@@ -112,75 +122,90 @@ export class Keycloak {
             assert(false);
         }
         const oidc = oidcOrError;
-        internalState.oidc = oidc;
         if (oidc.isUserLoggedIn) {
-            {
-                const tokens = await oidc.getTokens();
-                const onNewToken = (tokens_new) => {
-                    internalState.tokens = tokens_new;
-                    this.onAuthRefreshSuccess?.();
-                };
-                onNewToken(tokens);
-                oidc.subscribeToTokensChange(onNewToken);
+            const tokens = await oidc.getTokens();
+            const onNewToken = (tokens_new) => {
+                __classPrivateFieldGet(this, _Keycloak_state, "f").tokens = tokens_new;
+                this.onAuthRefreshSuccess?.();
+            };
+            onNewToken(tokens);
+            oidc.subscribeToTokensChange(onNewToken);
+        }
+        __classPrivateFieldGet(this, _Keycloak_state, "f").oidc = oidc;
+        __classPrivateFieldGet(this, _Keycloak_state, "f").dInitialized.resolve();
+        this.onReady?.(oidc.isUserLoggedIn);
+        onAuthSuccess_call: {
+            if (!oidc.isUserLoggedIn) {
+                break onAuthSuccess_call;
             }
-            {
-                const { $onTokenExpired } = internalState;
-                let clear = undefined;
-                $onTokenExpired.subscribe(onTokenExpired => {
-                    clear?.();
-                    if (onTokenExpired === undefined) {
-                        return;
-                    }
-                    let timer = undefined;
-                    const onNewToken = () => {
-                        if (timer !== undefined) {
-                            workerTimers.clearTimeout(timer);
-                        }
-                        const { tokens } = internalState;
-                        assert(tokens !== undefined);
-                        timer = workerTimers.setTimeout(() => {
-                            onTokenExpired.call(this);
-                        }, Math.max(tokens.accessTokenExpirationTime - Date.now() - 3000, 0));
-                    };
-                    onNewToken();
-                    const { unsubscribe } = oidc.subscribeToTokensChange(onNewToken);
-                    clear = () => {
-                        if (timer !== undefined) {
-                            workerTimers.clearTimeout(timer);
-                        }
-                        unsubscribe();
-                    };
-                });
+            this.onAuthSuccess?.();
+        }
+        onAuthError_call: {
+            if (oidc.isUserLoggedIn) {
+                break onAuthError_call;
             }
-            onActionUpdate_call: {
-                if (this.onActionUpdate === undefined) {
-                    break onActionUpdate_call;
-                }
-                const { backFromAuthServer } = oidc;
-                if (backFromAuthServer === undefined) {
-                    break onActionUpdate_call;
-                }
-                const status = backFromAuthServer.result.kc_action_status;
-                if (!isAmong(["success", "cancelled", "error"], status)) {
-                    break onActionUpdate_call;
-                }
-                const action = backFromAuthServer.extraQueryParams.kc_action;
-                if (action === undefined) {
-                    break onActionUpdate_call;
-                }
-                this.onActionUpdate(status, action);
+            if (oidc.initializationError === undefined) {
+                break onAuthError_call;
             }
-        }
-        if (!oidc.isUserLoggedIn && oidc.initializationError !== undefined) {
             this.onAuthError?.({
                 error: oidc.initializationError.name,
                 error_description: oidc.initializationError.message
             });
         }
-        internalState.dInitialized.resolve();
-        this.onReady?.(oidc.isUserLoggedIn);
-        if (oidc.isUserLoggedIn) {
-            this.onAuthSuccess?.();
+        onActionUpdate_call: {
+            if (!oidc.isUserLoggedIn) {
+                break onActionUpdate_call;
+            }
+            if (this.onActionUpdate === undefined) {
+                break onActionUpdate_call;
+            }
+            const { backFromAuthServer } = oidc;
+            if (backFromAuthServer === undefined) {
+                break onActionUpdate_call;
+            }
+            const status = backFromAuthServer.result.kc_action_status;
+            if (!isAmong(["success", "cancelled", "error"], status)) {
+                break onActionUpdate_call;
+            }
+            const action = backFromAuthServer.extraQueryParams.kc_action;
+            if (action === undefined) {
+                break onActionUpdate_call;
+            }
+            this.onActionUpdate(status, action);
+        }
+        schedule_onTokenExpired_call: {
+            if (!oidc.isUserLoggedIn) {
+                break schedule_onTokenExpired_call;
+            }
+            const { $onTokenExpired } = __classPrivateFieldGet(this, _Keycloak_state, "f");
+            let clear = undefined;
+            const next = (onTokenExpired) => {
+                clear?.();
+                if (onTokenExpired === undefined) {
+                    return;
+                }
+                let timer = undefined;
+                const onNewToken = () => {
+                    if (timer !== undefined) {
+                        workerTimers.clearTimeout(timer);
+                    }
+                    const { tokens } = __classPrivateFieldGet(this, _Keycloak_state, "f");
+                    assert(tokens !== undefined);
+                    timer = workerTimers.setTimeout(() => {
+                        onTokenExpired.call(this);
+                    }, Math.max(tokens.accessTokenExpirationTime - tokens.getServerDateNow() - 3000, 0));
+                };
+                onNewToken();
+                const { unsubscribe } = oidc.subscribeToTokensChange(onNewToken);
+                clear = () => {
+                    if (timer !== undefined) {
+                        workerTimers.clearTimeout(timer);
+                    }
+                    unsubscribe();
+                };
+            };
+            next($onTokenExpired.current);
+            $onTokenExpired.subscribe(next);
         }
         return oidc.isUserLoggedIn;
     }
@@ -191,9 +216,7 @@ export class Keycloak {
         if (!this.didInitialize) {
             return false;
         }
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { oidc } = internalState;
+        const { oidc } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         return oidc.isUserLoggedIn;
     }
@@ -204,9 +227,7 @@ export class Keycloak {
         if (!this.didInitialize) {
             return undefined;
         }
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { oidc, tokens } = internalState;
+        const { oidc, tokens } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         if (!oidc.isUserLoggedIn) {
             console.warn("Trying to read keycloak.subject when keycloak.authenticated is false is a logical error in your application");
@@ -222,9 +243,7 @@ export class Keycloak {
         if (!this.didInitialize) {
             return undefined;
         }
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { oidc, tokens } = internalState;
+        const { oidc, tokens } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         if (!oidc.isUserLoggedIn) {
             console.warn("Trying to read keycloak.realAccess when keycloak.authenticated is false is a logical error in your application");
@@ -241,9 +260,7 @@ export class Keycloak {
         if (!this.didInitialize) {
             return undefined;
         }
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { oidc, tokens } = internalState;
+        const { oidc, tokens } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         if (!oidc.isUserLoggedIn) {
             console.warn("Trying to read keycloak.resourceAccess when keycloak.authenticated is false is a logical error in your application");
@@ -258,12 +275,10 @@ export class Keycloak {
      * requests to services.
      */
     get token() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
         if (!this.didInitialize) {
-            return internalState.initOptions?.token;
+            return __classPrivateFieldGet(this, _Keycloak_state, "f").initOptions?.token;
         }
-        const { oidc, tokens } = internalState;
+        const { oidc, tokens } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         if (!oidc.isUserLoggedIn) {
             console.warn("Trying to read keycloak.token when keycloak.authenticated is false is a logical error in your application");
@@ -276,16 +291,14 @@ export class Keycloak {
      * The parsed token as a JavaScript object.
      */
     get tokenParsed() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
         if (!this.didInitialize) {
-            const { token } = internalState.initOptions ?? {};
+            const { token } = __classPrivateFieldGet(this, _Keycloak_state, "f").initOptions ?? {};
             if (token === undefined) {
                 return undefined;
             }
             return decodeJwt(token);
         }
-        const { oidc, tokens } = internalState;
+        const { oidc, tokens } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         if (!oidc.isUserLoggedIn) {
             console.warn("Trying to read keycloak.tokenParsed when keycloak.authenticated is false is a logical error in your application");
@@ -298,12 +311,10 @@ export class Keycloak {
      * The base64 encoded refresh token that can be used to retrieve a new token.
      */
     get refreshToken() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
         if (!this.didInitialize) {
-            return internalState.initOptions?.refreshToken;
+            return __classPrivateFieldGet(this, _Keycloak_state, "f").initOptions?.refreshToken;
         }
-        const { oidc, tokens } = internalState;
+        const { oidc, tokens } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         if (!oidc.isUserLoggedIn) {
             console.warn("Trying to read keycloak.refreshToken when keycloak.authenticated is false is a logical error in your application");
@@ -316,16 +327,14 @@ export class Keycloak {
      * The parsed refresh token as a JavaScript object.
      */
     get refreshTokenParsed() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
         if (!this.didInitialize) {
-            const { refreshToken } = internalState.initOptions ?? {};
+            const { refreshToken } = __classPrivateFieldGet(this, _Keycloak_state, "f").initOptions ?? {};
             if (refreshToken === undefined) {
                 return undefined;
             }
             return decodeJwt(refreshToken);
         }
-        const { oidc, tokens } = internalState;
+        const { oidc, tokens } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         if (!oidc.isUserLoggedIn) {
             console.warn("Trying to read keycloak.refreshTokenParsed when keycloak.authenticated is false is a logical error in your application");
@@ -341,12 +350,10 @@ export class Keycloak {
      * The base64 encoded ID token.
      */
     get idToken() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
         if (!this.didInitialize) {
-            return internalState.initOptions?.idToken;
+            return __classPrivateFieldGet(this, _Keycloak_state, "f").initOptions?.idToken;
         }
-        const { oidc, tokens } = internalState;
+        const { oidc, tokens } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         if (!oidc.isUserLoggedIn) {
             console.warn("Trying to read keycloak.idToken when keycloak.authenticated is false is a logical error in your application");
@@ -359,16 +366,14 @@ export class Keycloak {
      * The parsed id token as a JavaScript object.
      */
     get idTokenParsed() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
         if (!this.didInitialize) {
-            const { idToken } = internalState.initOptions ?? {};
+            const { idToken } = __classPrivateFieldGet(this, _Keycloak_state, "f").initOptions ?? {};
             if (idToken === undefined) {
                 return undefined;
             }
             return decodeJwt(idToken);
         }
-        const { oidc, tokens } = internalState;
+        const { oidc, tokens } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         if (!oidc.isUserLoggedIn) {
             console.warn("Trying to read keycloak.idTokenParsed when keycloak.authenticated is false is a logical error in your application");
@@ -384,16 +389,14 @@ export class Keycloak {
      * enough when determining if a token is expired or not.
      */
     get timeSkew() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
         if (!this.didInitialize) {
-            const { timeSkew } = internalState.initOptions ?? {};
+            const { timeSkew } = __classPrivateFieldGet(this, _Keycloak_state, "f").initOptions ?? {};
             if (timeSkew === undefined) {
                 return null;
             }
             return timeSkew;
         }
-        const { oidc, tokens } = internalState;
+        const { oidc, tokens } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         if (!oidc.isUserLoggedIn) {
             console.warn("Trying to read keycloak.timeSkew when keycloak.authenticated is false is a logical error in your application");
@@ -406,17 +409,13 @@ export class Keycloak {
      * Whether the instance has been initialized by calling `.init()`.
      */
     get didInitialize() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        return internalState.oidc !== undefined;
+        return __classPrivateFieldGet(this, _Keycloak_state, "f").oidc !== undefined;
     }
     /**
      * @private Undocumented.
      */
     get loginRequired() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { initOptions } = internalState;
+        const { initOptions } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         if (initOptions === undefined) {
             return false;
         }
@@ -426,36 +425,28 @@ export class Keycloak {
      * @private Undocumented.
      */
     get authServerUrl() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { keycloakUtils: { issuerUriParsed } } = internalState;
+        const { keycloakUtils: { issuerUriParsed } } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         return `${issuerUriParsed.origin}${issuerUriParsed.kcHttpRelativePath}`;
     }
     /**
      * @private Undocumented.
      */
     get realm() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { keycloakUtils: { issuerUriParsed } } = internalState;
+        const { keycloakUtils: { issuerUriParsed } } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         return issuerUriParsed.realm;
     }
     /**
      * @private Undocumented.
      */
     get clientId() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { constructorParams } = internalState;
+        const { constructorParams } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         return constructorParams.clientId;
     }
     /**
      * @private Undocumented.
      */
     get redirectUri() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { initOptions } = internalState;
+        const { initOptions } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         if (initOptions === undefined) {
             return undefined;
         }
@@ -468,9 +459,7 @@ export class Keycloak {
         if (!this.didInitialize) {
             return undefined;
         }
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { oidc, tokens } = internalState;
+        const { oidc, tokens } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         if (!oidc.isUserLoggedIn) {
             console.warn("Trying to read keycloak.sessionId when keycloak.authenticated is false is a logical error in your application");
@@ -485,18 +474,14 @@ export class Keycloak {
      * @private Undocumented.
      */
     get profile() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { profile } = internalState;
+        const { profile } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         return profile;
     }
     /**
      * @private Undocumented.
      */
     get userInfo() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { userInfo } = internalState;
+        const { userInfo } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         return userInfo;
     }
     /**
@@ -519,15 +504,11 @@ export class Keycloak {
      * obtain a new access token.
      */
     set onTokenExpired(value) {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { $onTokenExpired } = internalState;
+        const { $onTokenExpired } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         $onTokenExpired.current = value;
     }
     get onTokenExpired() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { $onTokenExpired } = internalState;
+        const { $onTokenExpired } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         return $onTokenExpired.current;
     }
     /**
@@ -536,12 +517,10 @@ export class Keycloak {
      */
     async login(options) {
         const { redirectUri, action, loginHint, acr, acrValues, idpHint, locale, doesCurrentHrefRequiresAuth } = options ?? {};
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
         if (!this.didInitialize) {
-            await internalState.dInitialized.pr;
+            await __classPrivateFieldGet(this, _Keycloak_state, "f").dInitialized.pr;
         }
-        const { oidc, keycloakUtils } = internalState;
+        const { oidc, keycloakUtils } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         const extraQueryParams_commons = {
             claims: acr === undefined
@@ -587,12 +566,10 @@ export class Keycloak {
      * @param options Logout options.
      */
     async logout(options) {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
         if (!this.didInitialize) {
-            await internalState.dInitialized.pr;
+            await __classPrivateFieldGet(this, _Keycloak_state, "f").dInitialized.pr;
         }
-        const { oidc, initOptions } = internalState;
+        const { oidc, initOptions } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         assert(initOptions !== undefined);
         assert(oidc.isUserLoggedIn, "The user is not currently logged in");
@@ -652,9 +629,7 @@ export class Keycloak {
      */
     createAccountUrl(options) {
         const { locale, redirectUri } = options ?? {};
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
-        const { keycloakUtils } = internalState;
+        const { keycloakUtils } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         return keycloakUtils.getAccountUrl({
             clientId: this.clientId,
             backToAppFromAccountUrl: redirectUri ?? location.href,
@@ -667,8 +642,6 @@ export class Keycloak {
      * @param minValidity If not specified, `0` is used.
      */
     isTokenExpired(minValidity = 0) {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
         let accessTokenExpirationTime;
         if (!this.didInitialize) {
             const fakeAccessToken = this.token;
@@ -680,7 +653,7 @@ export class Keycloak {
             accessTokenExpirationTime = time;
         }
         else {
-            const { tokens } = internalState;
+            const { tokens } = __classPrivateFieldGet(this, _Keycloak_state, "f");
             assert(tokens !== undefined);
             accessTokenExpirationTime = tokens.accessTokenExpirationTime;
         }
@@ -709,12 +682,10 @@ export class Keycloak {
      * });
      */
     async updateToken(minValidity = 5) {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
         if (!this.didInitialize) {
-            await internalState.dInitialized.pr;
+            await __classPrivateFieldGet(this, _Keycloak_state, "f").dInitialized.pr;
         }
-        const { oidc } = internalState;
+        const { oidc } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         assert(oidc.isUserLoggedIn, "updateToken called too early");
         if (!this.isTokenExpired(minValidity)) {
@@ -760,31 +731,35 @@ export class Keycloak {
      * @returns A promise to set functions to be invoked on success or error.
      */
     async loadUserProfile() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
         if (!this.didInitialize) {
-            await internalState.dInitialized.pr;
+            await __classPrivateFieldGet(this, _Keycloak_state, "f").dInitialized.pr;
         }
-        const { oidc, keycloakUtils } = internalState;
+        const { oidc, keycloakUtils } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         assert(oidc.isUserLoggedIn, "Can't load userProfile if user not authenticated");
         const { accessToken } = await oidc.getTokens();
-        return (internalState.profile = await keycloakUtils.fetchUserProfile({ accessToken }));
+        return (__classPrivateFieldGet(this, _Keycloak_state, "f").profile = await keycloakUtils.fetchUserProfile({ accessToken }));
     }
     /**
      * @private Undocumented.
      */
     async loadUserInfo() {
-        const internalState = internalStateByInstance.get(this);
-        assert(internalState !== undefined);
         if (!this.didInitialize) {
-            await internalState.dInitialized.pr;
+            await __classPrivateFieldGet(this, _Keycloak_state, "f").dInitialized.pr;
         }
-        const { oidc, keycloakUtils } = internalState;
+        const { oidc, keycloakUtils } = __classPrivateFieldGet(this, _Keycloak_state, "f");
         assert(oidc !== undefined);
         assert(oidc.isUserLoggedIn, "Can't load userInfo if user not authenticated");
         const { accessToken } = await oidc.getTokens();
-        return (internalState.userInfo = await keycloakUtils.fetchUserInfo({ accessToken }));
+        return (__classPrivateFieldGet(this, _Keycloak_state, "f").userInfo = await keycloakUtils.fetchUserInfo({ accessToken }));
+    }
+    /** Get the underlying oidc-spa instance */
+    get oidc() {
+        assert(this.didInitialize, "Cannot get keycloak.oidc before the init() method was called and have resolved.");
+        const { oidc } = __classPrivateFieldGet(this, _Keycloak_state, "f");
+        assert(oidc !== undefined);
+        return oidc;
     }
 }
+_Keycloak_state = new WeakMap();
 //# sourceMappingURL=Keycloak.js.map