oidc-spa 8.5.5 → 8.6.1

package/src/core/tokenPlaceholderSubstitution.ts

@@ -2,7 +2,7 @@ import { assert } from "../tools/tsafe/assert";
 
 let isTokenSubstitutionEnabled = false;
 
-export function markTokenSubstitutionAdEnabled() {
+export function markTokenSubstitutionAsEnabled() {
     isTokenSubstitutionEnabled = true;
 }
 
@@ -18,10 +18,61 @@ type Tokens = {
 
 const entries: {
     configId: string;
-    tokens: Tokens;
     id: number;
+    tokens: Tokens;
+    tokens_placeholder: Tokens;
 }[] = [];
 
+function generatePlaceholderForToken(params: {
+    tokenType: "id_token" | "access_token" | "refresh_token";
+    token_real: string;
+    id: number;
+}): string {
+    const { tokenType, token_real, id } = params;
+
+    const match = token_real.match(/^([A-Za-z0-9\-_]+)\.([A-Za-z0-9\-_]+)\.([A-Za-z0-9\-_]+)$/);
+
+    if (match === null) {
+        assert(tokenType !== "id_token", "39232932927");
+        return `${tokenType}_placeholder_${id}`;
+    }
+
+    const [, header_b64, payload_b64, signature_b64] = match;
+
+    const signatureByteLength = (() => {
+        const b64 = signature_b64
+            .replace(/-/g, "+")
+            .replace(/_/g, "/")
+            .padEnd(Math.ceil(signature_b64.length / 4) * 4, "=");
+
+        const padding = b64.endsWith("==") ? 2 : b64.endsWith("=") ? 1 : 0;
+        return (b64.length * 3) / 4 - padding;
+    })();
+
+    const targetSigB64Length = Math.ceil((signatureByteLength * 4) / 3);
+
+    const sig_placeholder = (function makeZeroPaddedBase64UrlString(
+        targetLength: number,
+        seed: string
+    ): string {
+        const PAD = "A";
+
+        let out = seed.slice(0, targetLength);
+
+        if (out.length < targetLength) {
+            out = out + PAD.repeat(targetLength - out.length);
+        }
+
+        if (out.length % 4 === 1) {
+            out = out.slice(0, -1) + PAD;
+        }
+
+        return out;
+    })(targetSigB64Length, `sig_placeholder_${id}_`);
+
+    return `${header_b64}.${payload_b64}.${sig_placeholder}`;
+}
+
 let counter = Math.floor(Math.random() * 1_000_000) + 1_000_000;
 
 export function getTokensPlaceholders(params: { configId: string; tokens: Tokens }): Tokens {
@@ -48,66 +99,68 @@ export function getTokensPlaceholders(params: { configId: string; tokens: Tokens
     const id = counter++;
 
     const entry_new: (typeof entries)[number] = {
-        id,
         configId,
+        id,
         tokens: {
-            accessToken: tokens.accessToken,
             idToken: tokens.idToken,
+            accessToken: tokens.accessToken,
             refreshToken: tokens.refreshToken
+        },
+        tokens_placeholder: {
+            idToken: generatePlaceholderForToken({
+                tokenType: "id_token",
+                id,
+                token_real: tokens.idToken
+            }),
+            accessToken: generatePlaceholderForToken({
+                tokenType: "access_token",
+                id,
+                token_real: tokens.accessToken
+            }),
+            refreshToken:
+                tokens.refreshToken === undefined
+                    ? undefined
+                    : generatePlaceholderForToken({
+                          tokenType: "refresh_token",
+                          id,
+                          token_real: tokens.refreshToken
+                      })
         }
     };
 
     entries.push(entry_new);
 
-    return {
-        accessToken: `access_token_placeholder_${id}`,
-        idToken: `id_token_placeholder_${id}`,
-        refreshToken: tokens.refreshToken === undefined ? undefined : `refresh_token_placeholder_${id}`
-    };
+    return entry_new.tokens_placeholder;
 }
 
-export function substitutePlaceholderByRealToken(params: {
-    text: string;
-    doEncodeUriComponent: boolean;
-}): string {
-    const { text, doEncodeUriComponent } = params;
+export function substitutePlaceholderByRealToken(text: string): string {
+    if (!text.includes("_placeholder_")) {
+        return text;
+    }
 
     let text_modified = text;
 
-    for (const [tokenType, regExp] of [
-        ["access_token", /access_token_placeholder_(\d+)/g],
-        ["id_token", /id_token_placeholder_(\d+)/g],
-        ["refresh_token", /refresh_token_placeholder_(\d+)/g]
-    ] as const) {
-        text_modified = text_modified.replace(regExp, (...[, p1]) => {
-            const id = parseInt(p1);
-
-            const entry = entries.find(e => e.id === id);
-
-            if (!entry) {
-                throw new Error(
-                    [
-                        "oidc-spa: Outdated token used to make a request.",
-                        "Token should not be stored at the application level, when a token",
-                        "is needed, it should be requested and used immediately."
-                    ].join(" ")
-                );
-            }
+    for (const entry of entries) {
+        if (!text.includes(`${entry.id}`)) {
+            continue;
+        }
+
+        for (const tokenType of ["idToken", "accessToken", "refreshToken"] as const) {
+            const placeholder = entry.tokens_placeholder[tokenType];
 
-            const token = (() => {
-                switch (tokenType) {
-                    case "access_token":
-                        return entry.tokens.accessToken;
-                    case "id_token":
-                        return entry.tokens.idToken;
-                    case "refresh_token":
-                        assert(entry.tokens.refreshToken !== undefined, "204392284");
-                        return entry.tokens.refreshToken;
+            if (tokenType === "refreshToken") {
+                if (placeholder === undefined) {
+                    continue;
                 }
-            })();
+            }
+            assert(placeholder !== undefined, "023948092393");
+
+            const realToken = entry.tokens[tokenType];
 
-            return doEncodeUriComponent ? encodeURIComponent(token) : token;
-        });
+            assert(realToken !== undefined, "02394809239328");
+
+            text_modified = text_modified.split(placeholder).join(realToken);
+        }
     }
 
     return text_modified;

package/src/keycloak/keycloak-js/Keycloak.ts

@@ -71,7 +71,7 @@ type ConstructorParams = KeycloakServerConfig & {
  * This module provides a drop-in replacement for `keycloak-js`,
  * designed for teams migrating to `oidc-spa` with minimal changes.
  *
- * ⚠️ While the import path is `oidc-spa/keycloak-js`, this is *not* a re-export or patch —
+ * While the import path is `oidc-spa/keycloak-js`, this is *not* a re-export or patch —
  * it is a full alternative implementation aligned with the `keycloak-js` API.
  */
 export class Keycloak {

package/src/vite-plugin/vite-plugin.ts

@@ -11,7 +11,7 @@ export type OidcSpaVitePluginParams =
     | Omit<ParamsOfEarlyInit, "BASE_URL">
     | Omit<ParamsOfEarlyInit_legacy, "BASE_URL">;
 
-export function oidcSpa(params: OidcSpaVitePluginParams) {
+export function oidcSpa(params: OidcSpaVitePluginParams = {}) {
     let load_handleClientEntrypoint:
         | ReturnType<typeof createHandleClientEntrypoint>["load_handleClientEntrypoint"]
         | undefined = undefined;

package/vite-plugin/vite-plugin.d.ts

@@ -1,4 +1,4 @@
 import type { Plugin } from "vite";
 import type { ParamsOfEarlyInit, ParamsOfEarlyInit_legacy } from "../core/earlyInit";
 export type OidcSpaVitePluginParams = Omit<ParamsOfEarlyInit, "BASE_URL"> | Omit<ParamsOfEarlyInit_legacy, "BASE_URL">;
-export declare function oidcSpa(params: OidcSpaVitePluginParams): Plugin<any>;
+export declare function oidcSpa(params?: OidcSpaVitePluginParams): Plugin<any>;

package/vite-plugin/vite-plugin.js

@@ -7,7 +7,7 @@ const handleServerEntrypoint_1 = require("./handleServerEntrypoint");
 const manageOptimizedDeps_1 = require("./manageOptimizedDeps");
 const transformTanstackRouterCreateFileRoute_1 = require("./transformTanstackRouterCreateFileRoute");
 const projectType_1 = require("./projectType");
-function oidcSpa(params) {
+function oidcSpa(params = {}) {
     let load_handleClientEntrypoint = undefined;
     let load_handleServerEntrypoint = undefined;
     let projectType = undefined;

package/vite-plugin/vite-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin.js","sourceRoot":"","sources":["../src/vite-plugin/vite-plugin.ts"],"names":[],"mappings":";;AAaA,0BA4FC;AAxGD,kDAA+C;AAE/C,qEAAwE;AACxE,qEAAwE;AACxE,+DAA4D;AAC5D,qGAAoF;AACpF,+CAAiE;AAMjE,SAAgB,OAAO,CAAC,MAA+B;IACnD,IAAI,2BAA2B,GAEb,SAAS,CAAC;IAC5B,IAAI,2BAA2B,GAEb,SAAS,CAAC;IAE5B,IAAI,WAAW,GAA4B,SAAS,CAAC;IAErD,MAAM,MAAM,GAAW;QACnB,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,KAAK;QACd,MAAM,CAAC,UAAU;YACb,MAAM,WAAW,GAAG,IAAA,4BAAc,EAAC;gBAC/B,WAAW,EACP,UAAU,CAAC,OAAO;oBACd,EAAE,IAAI,EAAE;qBACP,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,YAAY,MAAM,CAAC;qBAC1C,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,IAAI,MAAM,CAAC;qBAClC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE;aAC5C,CAAC,CAAC;YAEH,UAAU,GAAG,IAAA,yCAAmB,EAAC,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;YAC9D,OAAO,UAAU,CAAC;QACtB,CAAC;QACD,cAAc,CAAC,cAAc;YACzB,WAAW,GAAG,IAAA,4BAAc,EAAC;gBACzB,WAAW,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;aAC9D,CAAC,CAAC;YAEH,2BAA2B,GAAG,IAAA,qDAA4B,EAAC;gBACvD,uBAAuB,EAAE,MAAM;gBAC/B,cAAc;gBACd,WAAW;aACd,CAAC,CAAC,2BAA2B,CAAC;YAE/B,2BAA2B,GAAG,IAAA,qDAA4B,EAAC;gBACvD,cAAc;gBACd,WAAW;aACd,CAAC,CAAC,2BAA2B,CAAC;QACnC,CAAC;QACD,SAAS,CAAC,IAAI,EAAE,EAAE;YACd,IAAI,WAAW,GAA2B,IAAI,CAAC;YAE/C,IAAA,eAAM,EAAC,WAAW,KAAK,SAAS,CAAC,CAAC;YAElC,uCAAuC,EAAE,CAAC;gBACtC,IAAI,WAAW,KAAK,gBAAgB,EAAE,CAAC;oBACnC,MAAM,uCAAuC,CAAC;gBAClD,CAAC;gBAED,WAAW,GAAG,IAAA,iEAAwB,EAAC;oBACnC,IAAI;oBACJ,EAAE;iBACL,CAAC,CAAC;YACP,CAAC;YAED,OAAO,WAAW,CAAC;QACvB,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE;YACT,CAAC;gBACG,IAAA,eAAM,EAAC,2BAA2B,KAAK,SAAS,CAAC,CAAC;gBAElD,MAAM,CAAC,GAAG,MAAM,2BAA2B,CAAC;oBACxC,EAAE;oBACF,aAAa,EAAE,IAAI;iBACtB,CAAC,CAAC;gBAEH,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;oBACb,OAAO,CAAC,CAAC;gBACb,CAAC;YACL,CAAC;YAED,CAAC;gBACG,IAAA,eAAM,EAAC,2BAA2B,KAAK,SAAS,CAAC,CAAC;gBAElD,MAAM,CAAC,GAAG,MAAM,2BAA2B,CAAC;oBACxC,EAAE;oBACF,aAAa,EAAE,IAAI;iBACtB,CAAC,CAAC;gBAEH,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;oBACb,OAAO,CAAC,CAAC;gBACb,CAAC;YACL,CAAC;YAED,OAAO,IAAI,CAAC;QAChB,CAAC;KACJ,CAAC;IAEF,OAAO,MAAM,CAAC;AAClB,CAAC"}
+{"version":3,"file":"vite-plugin.js","sourceRoot":"","sources":["../src/vite-plugin/vite-plugin.ts"],"names":[],"mappings":";;AAaA,0BA4FC;AAxGD,kDAA+C;AAE/C,qEAAwE;AACxE,qEAAwE;AACxE,+DAA4D;AAC5D,qGAAoF;AACpF,+CAAiE;AAMjE,SAAgB,OAAO,CAAC,SAAkC,EAAE;IACxD,IAAI,2BAA2B,GAEb,SAAS,CAAC;IAC5B,IAAI,2BAA2B,GAEb,SAAS,CAAC;IAE5B,IAAI,WAAW,GAA4B,SAAS,CAAC;IAErD,MAAM,MAAM,GAAW;QACnB,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,KAAK;QACd,MAAM,CAAC,UAAU;YACb,MAAM,WAAW,GAAG,IAAA,4BAAc,EAAC;gBAC/B,WAAW,EACP,UAAU,CAAC,OAAO;oBACd,EAAE,IAAI,EAAE;qBACP,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,YAAY,MAAM,CAAC;qBAC1C,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,IAAI,MAAM,CAAC;qBAClC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE;aAC5C,CAAC,CAAC;YAEH,UAAU,GAAG,IAAA,yCAAmB,EAAC,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;YAC9D,OAAO,UAAU,CAAC;QACtB,CAAC;QACD,cAAc,CAAC,cAAc;YACzB,WAAW,GAAG,IAAA,4BAAc,EAAC;gBACzB,WAAW,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;aAC9D,CAAC,CAAC;YAEH,2BAA2B,GAAG,IAAA,qDAA4B,EAAC;gBACvD,uBAAuB,EAAE,MAAM;gBAC/B,cAAc;gBACd,WAAW;aACd,CAAC,CAAC,2BAA2B,CAAC;YAE/B,2BAA2B,GAAG,IAAA,qDAA4B,EAAC;gBACvD,cAAc;gBACd,WAAW;aACd,CAAC,CAAC,2BAA2B,CAAC;QACnC,CAAC;QACD,SAAS,CAAC,IAAI,EAAE,EAAE;YACd,IAAI,WAAW,GAA2B,IAAI,CAAC;YAE/C,IAAA,eAAM,EAAC,WAAW,KAAK,SAAS,CAAC,CAAC;YAElC,uCAAuC,EAAE,CAAC;gBACtC,IAAI,WAAW,KAAK,gBAAgB,EAAE,CAAC;oBACnC,MAAM,uCAAuC,CAAC;gBAClD,CAAC;gBAED,WAAW,GAAG,IAAA,iEAAwB,EAAC;oBACnC,IAAI;oBACJ,EAAE;iBACL,CAAC,CAAC;YACP,CAAC;YAED,OAAO,WAAW,CAAC;QACvB,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE;YACT,CAAC;gBACG,IAAA,eAAM,EAAC,2BAA2B,KAAK,SAAS,CAAC,CAAC;gBAElD,MAAM,CAAC,GAAG,MAAM,2BAA2B,CAAC;oBACxC,EAAE;oBACF,aAAa,EAAE,IAAI;iBACtB,CAAC,CAAC;gBAEH,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;oBACb,OAAO,CAAC,CAAC;gBACb,CAAC;YACL,CAAC;YAED,CAAC;gBACG,IAAA,eAAM,EAAC,2BAA2B,KAAK,SAAS,CAAC,CAAC;gBAElD,MAAM,CAAC,GAAG,MAAM,2BAA2B,CAAC;oBACxC,EAAE;oBACF,aAAa,EAAE,IAAI;iBACtB,CAAC,CAAC;gBAEH,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;oBACb,OAAO,CAAC,CAAC;gBACb,CAAC;YACL,CAAC;YAED,OAAO,IAAI,CAAC;QAChB,CAAC;KACJ,CAAC;IAEF,OAAO,MAAM,CAAC;AAClB,CAAC"}