oidc-spa 10.3.0-rc.3 → 11.0.0-rc.2

package/README.md

@@ -158,27 +158,3 @@ Project backers, we trust and recommend their services.
 <p align="center">
     <i><a href="https://phasetwo.io/?utm_source=keycloakify"><strong>Keycloak as a Service</strong></a> — Keycloak community contributors of popular <a href="https://github.com/p2-inc#our-extensions-?utm_source=keycloakify">extensions</a> providing free and dedicated <a href="https://phasetwo.io/hosting/?utm_source=keycloakify">Keycloak hosting</a> and enterprise <a href="https://phasetwo.io/support/?utm_source=keycloakify">Keycloak support</a> to businesses of all sizes.</i>
 </p>
-
-<br/>
-<br/>
-<br/>
-
-<div align="center">
-
-![Logo Dark](https://github.com/user-attachments/assets/dd3925fb-a58a-4e91-b360-69c2fa1f1087#gh-dark-mode-only)
-
-</div>
-
-<div align="center">
-
-![Logo Light](https://github.com/user-attachments/assets/6c00c201-eed7-485a-a887-70891559d69b#gh-light-mode-only)
-
-</div>
-
-<br/>
-
-<p align="center">
-  <a href="https://www.zone2.tech/services/keycloak-consulting">
-    <i><strong>Keycloak Consulting Services</strong> — Your partner in Keycloak deployment, configuration, and extension development for optimized identity management solutions.</i>
-  </a>
-</p>

package/core/Oidc.d.ts

@@ -1,5 +1,5 @@
 import type { OidcInitializationError } from "./OidcInitializationError";
-export declare type Oidc<DecodedIdToken extends Record<string, unknown> = Oidc.Tokens.DecodedIdToken_OidcCoreSpec, User = never> = Oidc.LoggedIn<DecodedIdToken, User> | Oidc.NotLoggedIn;
+export declare type Oidc<User = never> = Oidc.LoggedIn<User> | Oidc.NotLoggedIn;
 export declare namespace Oidc {
     type Common = {
         issuerUri: string;
@@ -25,20 +25,21 @@ export declare namespace Oidc {
              * Transform the url before redirecting to the login pages.
              * Prefer using the extraQueryParams parameter if you're only adding query parameters.
              */
-            transformUrlBeforeRedirect?: (url: string) => string;
+            transformUrlBeforeRedirect?: (authorizationUrl: string) => string;
         }) => Promise<never>;
         initializationError: OidcInitializationError | undefined;
     };
-    type LoggedIn<DecodedIdToken extends Record<string, unknown> = Record<string, unknown>, User = never> = Common & {
+    type LoggedIn<User = never> = Common & {
         isUserLoggedIn: true;
         renewTokens(params?: {
             extraTokenParams?: Record<string, string | undefined>;
         }): Promise<void>;
-        getTokens: () => Promise<Tokens<DecodedIdToken>>;
-        subscribeToTokensChange: (onTokenChange: (tokens: Tokens<DecodedIdToken>) => void) => {
+        subscribeToTokensChange: (onTokenChange: (tokens: Tokens) => void) => {
             unsubscribeFromTokensChange: () => void;
         };
-        getDecodedIdToken: () => DecodedIdToken;
+        getTokens: () => Promise<Tokens>;
+        getDecodedIdToken: () => Tokens.DecodedIdToken;
+        getAccessToken: () => Promise<string>;
         logout: (params: {
             redirectTo: "home" | "current page";
         } | {
@@ -92,41 +93,30 @@ export declare namespace Oidc {
             refreshUser: () => Promise<User>;
         }>;
     };
-    type Tokens<DecodedIdToken extends Record<string, unknown> = Tokens.DecodedIdToken_OidcCoreSpec> = Tokens.WithRefreshToken<DecodedIdToken> | Tokens.WithoutRefreshToken<DecodedIdToken>;
+    type Tokens = Tokens.WithRefreshToken | Tokens.WithoutRefreshToken;
     namespace Tokens {
-        type Common<DecodedIdToken> = {
+        type Common = {
             accessToken: string;
             /** Millisecond epoch in the server's time */
             accessTokenExpirationTime: number;
             idToken: string;
             decodedIdToken: DecodedIdToken;
-            /**
-             * decodedIdToken_original = decodeJwt(idToken);
-             * decodedIdToken = decodedIdTokenSchema.parse(decodedIdToken_original)
-             *
-             * The idea here is that if you have provided a zod schema as `decodedIdTokenSchema`
-             * it will strip out every claim that you haven't specified.
-             * You might even be applying some transformation.
-             *
-             * `decodedIdToken_original` is the actual decoded payload of the  id_token, untransformed.
-             * */
-            decodedIdToken_original: DecodedIdToken_OidcCoreSpec;
             /** Millisecond epoch in the server's time, read from id_token's JWT, iat claim value */
             issuedAtTime: number;
             /** To use instead of Date.now() if you ever need to tell if a token is expired or not */
             getServerDateNow: () => number;
         };
-        type WithRefreshToken<DecodedIdToken> = Common<DecodedIdToken> & {
+        type WithRefreshToken = Common & {
             hasRefreshToken: true;
             refreshToken: string;
             refreshTokenExpirationTime: number | undefined;
         };
-        type WithoutRefreshToken<DecodedIdToken> = Common<DecodedIdToken> & {
+        type WithoutRefreshToken = Common & {
             hasRefreshToken: false;
             refreshToken?: never;
             refreshTokenExpirationTime?: never;
         };
-        type DecodedIdToken_OidcCoreSpec = {
+        type DecodedIdToken = {
             iss: string;
             sub: string;
             aud: string | string[];

package/core/createGetUser.d.ts

@@ -3,8 +3,10 @@ import type { NonPostableEvt } from "../tools/Evt";
 import type { ParamsOfCreateOidc } from "./createOidc";
 export declare function createGetUser<User>(params: {
     issuerUri: string;
+    clientId: string;
+    validRedirectUri: string;
     createUser: ParamsOfCreateOidc.CreateUser<User> | undefined;
-    getCurrentTokens: () => Oidc.Tokens<any>;
+    getCurrentTokens: () => Oidc.Tokens;
     evtTokensChange: NonPostableEvt<void>;
     renewTokens(): Promise<void>;
     oidcMetadata: {

package/core/createGetUser.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGetUser = createGetUser;
 const id_1 = require("../tools/tsafe/id");
 const assert_1 = require("../tools/tsafe/assert");
+const areDeepEqual_1 = require("../tools/areDeepEqual");
 const decodeJwt_1 = require("../tools/decodeJwt");
 function createGetUser(params) {
-    const { issuerUri, createUser, getCurrentTokens, evtTokensChange, renewTokens, oidcMetadata } = params;
+    const { issuerUri, clientId, validRedirectUri, createUser, getCurrentTokens, evtTokensChange, renewTokens, oidcMetadata } = params;
     async function fetchUserInfo(params) {
         const { accessToken } = params;
         const { userinfo_endpoint } = oidcMetadata;
@@ -36,7 +37,7 @@ function createGetUser(params) {
         const tokens = getCurrentTokens();
         const hash_new = computeHash({
             accessToken: tokens.accessToken,
-            decodedIdToken: tokens.decodedIdToken_original
+            decodedIdToken: tokens.decodedIdToken
         });
         const prUser_new = (async () => {
             const prUser_current = state?.prUser;
@@ -49,8 +50,10 @@ function createGetUser(params) {
             try {
                 user_new = await createUser({
                     accessToken: tokens.accessToken,
-                    decodedIdToken: tokens.decodedIdToken_original,
+                    decodedIdToken: tokens.decodedIdToken,
                     issuerUri,
+                    clientId,
+                    validRedirectUri,
                     fetchUserInfo: () => fetchUserInfo({ accessToken: tokens.accessToken }),
                     user_current
                 });
@@ -68,6 +71,9 @@ function createGetUser(params) {
                 // higher level adapters.
                 throw error;
             }
+            if (user_current !== undefined && (0, areDeepEqual_1.areDeepEqual)(user_new, user_current)) {
+                return user_current;
+            }
             onUserChanges.forEach(onUserChange => onUserChange({
                 user: user_new,
                 user_previous: user_current
@@ -123,15 +129,19 @@ function createGetUser(params) {
             };
             setTimer();
         }
-        const user = await state.prUser;
-        if (timer_cycleDetection !== undefined) {
-            clearTimeout(timer_cycleDetection);
+        try {
+            const user = await state.prUser;
+            return (0, id_1.id)({
+                user,
+                refreshUser,
+                subscribeToUserChange
+            });
+        }
+        finally {
+            if (timer_cycleDetection !== undefined) {
+                clearTimeout(timer_cycleDetection);
+            }
         }
-        return (0, id_1.id)({
-            user,
-            refreshUser,
-            subscribeToUserChange
-        });
     };
     return { getUser };
 }

package/core/createGetUser.js.map

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

package/core/createMockOidc.d.ts

@@ -1,11 +1,14 @@
 import type { Oidc } from "../core";
-export type ParamsOfCreateMockOidc<DecodedIdToken extends Record<string, unknown> = Record<string, unknown>, AutoLogin extends boolean = false, User = never> = {
-    mockedParams?: {
-        issuerUri?: string;
-        clientId?: string;
-    };
-    mockedTokens?: Partial<Oidc.Tokens<DecodedIdToken>>;
-    mockedUser?: User;
+export type ParamsOfCreateMockOidc<User, AutoLogin extends boolean> = {
+    user_mock?: User;
+    issuerUri_mock?: string;
+    clientId_mock?: string;
+    decodedIdToken_mock?: Oidc.Tokens.DecodedIdToken;
+    idToken_mock?: string;
+    accessToken_mock?: string;
+    accessTokenExpirationTime_mock?: number;
+    refreshToken_mock?: string;
+    refreshTokenExpirationTime_mock?: number;
     /**
      * The URL of the home page of your app.
      * We need to know this so we know where to redirect when you call `logout({ redirectTo: "home"})`.
@@ -20,4 +23,8 @@ export type ParamsOfCreateMockOidc<DecodedIdToken extends Record<string, unknown
 } : {
     isUserInitiallyLoggedIn: boolean;
 });
-export declare function createMockOidc<DecodedIdToken extends Record<string, unknown> = Oidc.Tokens.DecodedIdToken_OidcCoreSpec, AutoLogin extends boolean = false, User = never>(params: ParamsOfCreateMockOidc<DecodedIdToken, AutoLogin, User>): Promise<AutoLogin extends true ? Oidc.LoggedIn<DecodedIdToken, User> : Oidc<DecodedIdToken, User>>;
+export declare const ClIENT_ID_MOCK_DEFAULT = "myclientmock";
+export declare const ISSUER_URI_MOCK_DEFAULT = "https://auth.mycompany.com/realms/mymockrealm";
+export declare const ACCESS_TOKEN_MOCK_DEFAULT = "mocked-access-token";
+export declare const ID_TOKEN_MOCK_DEFAULT = "mocked-id-token";
+export declare function createMockOidc<User = never, AutoLogin extends boolean = false>(params: ParamsOfCreateMockOidc<User, AutoLogin>): Promise<AutoLogin extends true ? Oidc.LoggedIn<User> : Oidc<User>>;

package/core/createMockOidc.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ID_TOKEN_MOCK_DEFAULT = exports.ACCESS_TOKEN_MOCK_DEFAULT = exports.ISSUER_URI_MOCK_DEFAULT = exports.ClIENT_ID_MOCK_DEFAULT = void 0;
 exports.createMockOidc = createMockOidc;
 const createObjectThatThrowsIfAccessed_1 = require("../tools/createObjectThatThrowsIfAccessed");
 const id_1 = require("../tools/tsafe/id");
@@ -7,11 +8,16 @@ const toFullyQualifiedUrl_1 = require("../tools/toFullyQualifiedUrl");
 const urlSearchParams_1 = require("../tools/urlSearchParams");
 const earlyInit_rootRelativeOriginalLocationHref_1 = require("../core/earlyInit_rootRelativeOriginalLocationHref");
 const INFINITY_TIME_1 = require("../tools/INFINITY_TIME");
-const earlyInit_BASE_URL_1 = require("../core/earlyInit_BASE_URL");
+const earlyInit_BASE_URL_1 = require("./earlyInit_BASE_URL");
+const decodeJwt_1 = require("../tools/decodeJwt");
 const URL_SEARCH_PARAM_NAME = "isUserLoggedIn";
 const locationHref_moduleEvalTime = location.href;
+exports.ClIENT_ID_MOCK_DEFAULT = "myclientmock";
+exports.ISSUER_URI_MOCK_DEFAULT = "https://auth.mycompany.com/realms/mymockrealm";
+exports.ACCESS_TOKEN_MOCK_DEFAULT = "mocked-access-token";
+exports.ID_TOKEN_MOCK_DEFAULT = "mocked-id-token";
 async function createMockOidc(params) {
-    const { isUserInitiallyLoggedIn = true, mockedParams = {}, mockedTokens = {}, autoLogin = false, postLoginRedirectUrl, mockedUser } = params;
+    const { user_mock, isUserInitiallyLoggedIn = true, issuerUri_mock, clientId_mock, decodedIdToken_mock, idToken_mock, accessToken_mock, accessTokenExpirationTime_mock, refreshToken_mock, refreshTokenExpirationTime_mock, autoLogin = false, postLoginRedirectUrl } = params;
     const BASE_URL_params = params.BASE_URL;
     const isUserLoggedIn = (() => {
         const { wasPresent, value } = (0, urlSearchParams_1.getSearchParam)({
@@ -49,8 +55,8 @@ async function createMockOidc(params) {
         doOutputWithTrailingSlash: true
     });
     const common = {
-        clientId: mockedParams.clientId ?? "mymockclient",
-        issuerUri: mockedParams.issuerUri ?? "https://my-mock-oidc-server.net/realms/mymockrealm",
+        clientId: clientId_mock ?? exports.ClIENT_ID_MOCK_DEFAULT,
+        issuerUri: issuerUri_mock ?? exports.ISSUER_URI_MOCK_DEFAULT,
         validRedirectUri: homeUrl
     };
     const loginOrGoToAuthServer = async (params) => {
@@ -95,32 +101,35 @@ async function createMockOidc(params) {
         renewTokens: async () => { },
         ...(() => {
             const tokens_common = {
-                accessToken: mockedTokens.accessToken ?? "mocked-access-token",
-                accessTokenExpirationTime: mockedTokens.accessTokenExpirationTime ?? INFINITY_TIME_1.INFINITY_TIME,
-                idToken: mockedTokens.idToken ?? "mocked-id-token",
-                decodedIdToken: mockedTokens.decodedIdToken ??
-                    (0, createObjectThatThrowsIfAccessed_1.createObjectThatThrowsIfAccessed)({
+                accessToken: accessToken_mock ?? exports.ACCESS_TOKEN_MOCK_DEFAULT,
+                accessTokenExpirationTime: accessTokenExpirationTime_mock ?? INFINITY_TIME_1.INFINITY_TIME,
+                idToken: idToken_mock ?? exports.ID_TOKEN_MOCK_DEFAULT,
+                decodedIdToken: (() => {
+                    if (decodedIdToken_mock !== undefined) {
+                        return decodedIdToken_mock;
+                    }
+                    if (idToken_mock !== undefined) {
+                        try {
+                            return (0, decodeJwt_1.decodeJwt)(idToken_mock);
+                        }
+                        catch { }
+                    }
+                    return (0, createObjectThatThrowsIfAccessed_1.createObjectThatThrowsIfAccessed)({
                         debugMessage: [
                             "You haven't provided a mocked decodedIdToken",
                             "See https://docs.oidc-spa.dev/v/v10/integration-guides/usage#mock-adapter"
                         ].join("\n")
-                    }),
-                decodedIdToken_original: mockedTokens.decodedIdToken_original ??
-                    (0, createObjectThatThrowsIfAccessed_1.createObjectThatThrowsIfAccessed)({
-                        debugMessage: [
-                            "You haven't provided a mocked decodedIdToken_original",
-                            "See https://docs.oidc-spa.dev/v/v10/integration-guides/usage#mock-adapter"
-                        ].join("\n")
-                    }),
+                    });
+                })(),
                 issuedAtTime: Date.now(),
                 getServerDateNow: () => Date.now()
             };
-            const tokens = mockedTokens.refreshToken !== undefined || mockedTokens.hasRefreshToken === true
+            const tokens = refreshToken_mock !== undefined
                 ? (0, id_1.id)({
                     ...tokens_common,
                     hasRefreshToken: true,
-                    refreshToken: mockedTokens.refreshToken ?? "mocked-refresh-token",
-                    refreshTokenExpirationTime: mockedTokens.refreshTokenExpirationTime
+                    refreshToken: refreshToken_mock,
+                    refreshTokenExpirationTime: refreshTokenExpirationTime_mock ?? INFINITY_TIME_1.INFINITY_TIME
                 })
                 : (0, id_1.id)({
                     ...tokens_common,
@@ -128,6 +137,7 @@ async function createMockOidc(params) {
                 });
             return {
                 getTokens: () => Promise.resolve(tokens),
+                getAccessToken: () => Promise.resolve(tokens.accessToken),
                 getDecodedIdToken: () => tokens_common.decodedIdToken
             };
         })(),
@@ -167,15 +177,15 @@ async function createMockOidc(params) {
         isNewBrowserSession: false,
         backFromAuthServer: undefined,
         getUser: () => {
-            if (mockedUser === undefined) {
+            if (user_mock === undefined) {
                 throw new Error("oidc-spa: No mock user provided");
             }
             return Promise.resolve({
-                refreshUser: () => Promise.resolve(mockedUser),
+                refreshUser: () => Promise.resolve(user_mock),
                 subscribeToUserChange: () => {
                     return { unsubscribeFromUserChange: () => { } };
                 },
-                user: mockedUser
+                user: user_mock
             });
         }
     };

package/core/createMockOidc.js.map

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

package/core/createOidc.d.ts

@@ -4,7 +4,8 @@ import type { Oidc } from "./Oidc";
 import type { Evt } from "../tools/Evt";
 import type { ParamsOfCreateGetServerDateNow } from "../tools/getServerDateNow";
 import type { MaybeAsync } from "../tools/MaybeAsync";
-export type ParamsOfCreateOidc<DecodedIdToken extends Record<string, unknown> = Oidc.Tokens.DecodedIdToken_OidcCoreSpec, AutoLogin extends boolean = false, User = never> = {
+import type { OidcUserInfo } from "../tools/OidcUserInfo";
+export type ParamsOfCreateOidc<User, AutoLogin extends boolean> = {
     createUser?: ParamsOfCreateOidc.CreateUser<User>;
     /**
      * See: https://docs.oidc-spa.dev/v/v10/providers-configuration/provider-configuration
@@ -54,9 +55,6 @@ export type ParamsOfCreateOidc<DecodedIdToken extends Record<string, unknown> =
      *          extraTokenParams: { selectedCustomer: "xxx" }
      */
     extraTokenParams?: Record<string, string | undefined> | (() => Record<string, string | undefined>);
-    decodedIdTokenSchema?: {
-        parse: (decodedIdToken_original: Oidc.Tokens.DecodedIdToken_OidcCoreSpec) => DecodedIdToken;
-    };
     /**
      * This parameter defines after how many seconds of inactivity the user should be
      * logged out automatically.
@@ -189,13 +187,12 @@ export type ParamsOfCreateOidc<DecodedIdToken extends Record<string, unknown> =
 };
 export declare namespace ParamsOfCreateOidc {
     type CreateUser<User> = (params: {
-        decodedIdToken: Oidc.Tokens.DecodedIdToken_OidcCoreSpec;
+        decodedIdToken: Oidc.Tokens.DecodedIdToken;
         accessToken: string;
-        fetchUserInfo: () => Promise<{
-            [key: string]: unknown;
-            sub: string;
-        }>;
+        fetchUserInfo: () => Promise<OidcUserInfo>;
         issuerUri: string;
+        clientId: string;
+        validRedirectUri: string;
         user_current: User | undefined;
     }) => MaybeAsync<User>;
 }
@@ -255,10 +252,10 @@ export declare namespace Exports_DPoP {
 }
 export declare function registerExports_DPoP(exports: Exports_DPoP): void;
 /** @see: https://docs.oidc-spa.dev/v/v10/usage */
-export declare function createOidc<DecodedIdToken extends Record<string, unknown> = Oidc.Tokens.DecodedIdToken_OidcCoreSpec, AutoLogin extends boolean = false, User = never>(params: ParamsOfCreateOidc<DecodedIdToken, AutoLogin, User>): Promise<AutoLogin extends true ? Oidc.LoggedIn<DecodedIdToken, User> : Oidc<DecodedIdToken, User>>;
-export declare function createOidc_nonMemoized<DecodedIdToken extends Record<string, unknown>, AutoLogin extends boolean, User>(params: Omit<ParamsOfCreateOidc<DecodedIdToken, AutoLogin, User>, "issuerUri" | "clientId" | "debugLogs">, preProcessedParams: {
+export declare function createOidc<User = never, AutoLogin extends boolean = false>(params: ParamsOfCreateOidc<User, AutoLogin>): Promise<AutoLogin extends true ? Oidc.LoggedIn<User> : Oidc<User>>;
+export declare function createOidc_nonMemoized<User, AutoLogin extends boolean>(params: Omit<ParamsOfCreateOidc<User, AutoLogin>, "issuerUri" | "clientId" | "debugLogs">, preProcessedParams: {
     issuerUri: string;
     clientId: string;
     configId: string;
     log: typeof console.log | undefined;
-}): Promise<AutoLogin extends true ? Oidc.LoggedIn<DecodedIdToken, User> : Oidc<DecodedIdToken, User>>;
+}): Promise<AutoLogin extends true ? Oidc.LoggedIn<User> : Oidc<User>>;

package/core/createOidc.js

@@ -77,7 +77,7 @@ const loadWebcryptoLinerShim_1 = require("../tools/loadWebcryptoLinerShim");
 const lazySessionStorage_2 = require("../tools/lazySessionStorage");
 const createGetUser_1 = require("./createGetUser");
 // NOTE: Replaced at build time
-const VERSION = "10.3.0-rc.3";
+const VERSION = "11.0.0-rc.2";
 const globalContext = {
     prOidcByConfigId: new Map(),
     hasLogoutBeenCalled: (0, id_1.id)(false),
@@ -151,7 +151,7 @@ async function createOidc(params) {
     return oidc;
 }
 async function createOidc_nonMemoized(params, preProcessedParams) {
-    const { transformUrlBeforeRedirect, extraQueryParams: extraQueryParamsOrGetter, extraTokenParams: extraTokenParamsOrGetter, decodedIdTokenSchema, idleSessionLifetimeInSeconds, autoLogoutParams = { redirectTo: "current page" }, autoLogin = false, postLoginRedirectUrl: postLoginRedirectUrl_default, __unsafe_clientSecret, __unsafe_useIdTokenAsAccessToken = false, __metadata, disableDPoP: disableDPoP_params = false, sessionRestorationMethod: sessionRestorationMethod_params, BASE_URL: BASE_URL_params, createUser } = params;
+    const { transformUrlBeforeRedirect, extraQueryParams: extraQueryParamsOrGetter, extraTokenParams: extraTokenParamsOrGetter, idleSessionLifetimeInSeconds, autoLogoutParams = { redirectTo: "current page" }, autoLogin = false, postLoginRedirectUrl: postLoginRedirectUrl_default, __unsafe_clientSecret, __unsafe_useIdTokenAsAccessToken = false, __metadata, disableDPoP: disableDPoP_params = false, sessionRestorationMethod: sessionRestorationMethod_params, BASE_URL: BASE_URL_params, createUser } = params;
     const exports_earlyInit = await (async () => {
         const timer = window.setTimeout(() => {
             console.warn([
@@ -882,15 +882,13 @@ async function createOidc_nonMemoized(params, preProcessedParams) {
     (0, assert_1.assert)(oidcMetadata !== undefined, "30483403");
     const { oidcClientTsUserToTokens } = (0, oidcClientTsUserToTokens_1.createOidcClientTsUserToTokens)({
         configId,
-        decodedIdTokenSchema,
         __unsafe_useIdTokenAsAccessToken,
         exports_DPoP: shouldEnableDPoP ? exports_DPoP : undefined,
         exports_tokenSubstitution,
         log
     });
     let currentTokens = oidcClientTsUserToTokens({
-        oidcClientTsUser: resultOfLoginProcess.oidcClientTsUser,
-        decodedIdToken_previous: undefined
+        oidcClientTsUser: resultOfLoginProcess.oidcClientTsUser
     });
     const onTokenChanges = new Set();
     const renewTokens = (() => {
@@ -1037,8 +1035,7 @@ async function createOidc_nonMemoized(params, preProcessedParams) {
                     break;
             }
             currentTokens = oidcClientTsUserToTokens({
-                oidcClientTsUser,
-                decodedIdToken_previous: currentTokens.decodedIdToken
+                oidcClientTsUser
             });
             if ((0, persistedAuthState_1.getPersistedAuthState)({ configId }) !== undefined) {
                 (0, persistedAuthState_1.persistAuthState)({
@@ -1113,6 +1110,8 @@ async function createOidc_nonMemoized(params, preProcessedParams) {
         })(),
         getCurrentTokens: () => currentTokens,
         issuerUri,
+        clientId,
+        validRedirectUri: homeUrlAndRedirectUri,
         oidcMetadata,
         renewTokens: () => renewTokens()
     });
@@ -1156,7 +1155,7 @@ async function createOidc_nonMemoized(params, preProcessedParams) {
         }
     }
     const autoLogoutCountdownTickCallbacks = new Set();
-    const { sid: sessionId, sub: subjectId } = currentTokens.decodedIdToken_original;
+    const { sid: sessionId, sub: subjectId } = currentTokens.decodedIdToken;
     (0, assert_1.assert)(subjectId !== undefined, "The 'sub' claim is missing from the id token");
     (0, assert_1.assert)(sessionId === undefined || typeof sessionId === "string");
     let wouldHaveAutoLoggedOutIfBrowserWasOnline = false;
@@ -1194,6 +1193,10 @@ async function createOidc_nonMemoized(params, preProcessedParams) {
             return currentTokens;
         },
         getDecodedIdToken: () => currentTokens.decodedIdToken,
+        getAccessToken: async () => {
+            const { accessToken } = await oidc_loggedIn.getTokens();
+            return accessToken;
+        },
         logout: async (params) => {
             if (globalContext.hasLogoutBeenCalled) {
                 log?.("logout() has already been called, ignoring the call");