oidc-spa 8.3.6 → 8.3.8

package/src/vite-plugin/transformTanstackRouterCreateFileRoute.ts

@@ -4,8 +4,6 @@ import { babelParser, babelTraverse, babelTypes as t } from "../vendor/build-run
 const DISABLE_SSR_SPECIFIER = "__disableSsrIfLoginEnforced";
 const DISABLE_SSR_SOURCE = "oidc-spa/react-tanstack-start";
 const CREATE_FILE_ROUTE_IDENTIFIER = "createFileRoute";
-const POST_LOGIN_IMPORT_SPECIFIER = "withHandlingOidcPostLoginNavigation";
-const POST_LOGIN_IMPORT_SOURCE = "oidc-spa/react-tanstack-start";
 
 type TransformParams = {
     code: string;
@@ -38,9 +36,7 @@ export function transformCreateFileRoute(params: TransformParams): TransformResu
     const magicString = new MagicString(code);
     let hasCreateFileRouteImport = false;
     let hasEnableImport = false;
-    let hasPostLoginImport = false;
     let requiresEnableImport = false;
-    let requiresPostLoginImport = false;
     let lastImportEnd: number | undefined;
     let mutated = false;
 
@@ -79,18 +75,6 @@ export function transformCreateFileRoute(params: TransformParams): TransformResu
                     hasEnableImport = true;
                 }
             }
-
-            if (sourceValue === POST_LOGIN_IMPORT_SOURCE) {
-                if (
-                    path.node.specifiers.some(
-                        specifier =>
-                            t.isImportSpecifier(specifier) &&
-                            t.isIdentifier(specifier.imported, { name: POST_LOGIN_IMPORT_SPECIFIER })
-                    )
-                ) {
-                    hasPostLoginImport = true;
-                }
-            }
         },
         CallExpression(path) {
             const callee = path.get("callee");
@@ -128,33 +112,6 @@ export function transformCreateFileRoute(params: TransformParams): TransformResu
                 }
             }
 
-            const innerArgs = callee.node.arguments ?? [];
-            const isRootRoute =
-                innerArgs.length > 0 && t.isStringLiteral(innerArgs[0]) && innerArgs[0].value === "/";
-
-            if (isRootRoute) {
-                const componentProp = findComponentProperty(configNode);
-                if (componentProp) {
-                    const valueNode = componentProp.value as t.Expression;
-
-                    if (!isWrappedWithHandling(valueNode)) {
-                        const start = valueNode.start ?? undefined;
-                        const end = valueNode.end ?? undefined;
-
-                        if (typeof start === "number" && typeof end === "number") {
-                            const original = code.slice(start, end);
-                            magicString.overwrite(
-                                start,
-                                end,
-                                `${POST_LOGIN_IMPORT_SPECIFIER}(${original})`
-                            );
-                            requiresPostLoginImport = true;
-                            localMutated = true;
-                        }
-                    }
-                }
-            }
-
             if (localMutated) {
                 mutated = true;
             }
@@ -171,12 +128,6 @@ export function transformCreateFileRoute(params: TransformParams): TransformResu
         importStatements.push(`import { ${DISABLE_SSR_SPECIFIER} } from "${DISABLE_SSR_SOURCE}";`);
     }
 
-    if (requiresPostLoginImport && !hasPostLoginImport) {
-        importStatements.push(
-            `import { ${POST_LOGIN_IMPORT_SPECIFIER} } from "${POST_LOGIN_IMPORT_SOURCE}";`
-        );
-    }
-
     if (importStatements.length > 0) {
         const insertionPoint = lastImportEnd ?? 0;
         const prefix = insertionPoint === 0 ? "" : "\n";
@@ -190,15 +141,6 @@ export function transformCreateFileRoute(params: TransformParams): TransformResu
     };
 }
 
-function findComponentProperty(node: t.ObjectExpression): t.ObjectProperty | undefined {
-    return node.properties.find(
-        prop =>
-            t.isObjectProperty(prop) &&
-            ((t.isIdentifier(prop.key) && prop.key.name === "component") ||
-                (t.isStringLiteral(prop.key) && prop.key.value === "component"))
-    ) as t.ObjectProperty | undefined;
-}
-
 function objectContainsLoaderOrBeforeLoad(node: t.ObjectExpression): boolean {
     return node.properties.some(prop => {
         if (!t.isObjectProperty(prop)) {
@@ -218,12 +160,6 @@ function objectContainsLoaderOrBeforeLoad(node: t.ObjectExpression): boolean {
     });
 }
 
-function isWrappedWithHandling(node: t.Node): boolean {
-    return (
-        t.isCallExpression(node) && t.isIdentifier(node.callee, { name: POST_LOGIN_IMPORT_SPECIFIER })
-    );
-}
-
 function isCandidateFile(id: string): boolean {
     if (id.includes("node_modules")) {
         return false;

package/src/vite-plugin/utils.ts

@@ -0,0 +1,64 @@
+import { existsSync } from "node:fs";
+import * as path from "node:path";
+import { fileURLToPath } from "node:url";
+import { normalizePath } from "vite";
+
+export function resolveCandidate({
+    root,
+    subDirectories,
+    filenames
+}: {
+    root: string;
+    subDirectories: string[];
+    filenames: string[];
+}): string | undefined {
+    for (const subDirectory of subDirectories) {
+        for (const filename of filenames) {
+            const candidate = path.resolve(root, subDirectory, filename);
+            if (existsSync(candidate)) {
+                return candidate;
+            }
+        }
+    }
+    return undefined;
+}
+
+export function resolvePackageFile(packageName: string, segments: string[]): string {
+    const pkgPath = require.resolve(`${packageName}/package.json`);
+    return path.resolve(path.dirname(pkgPath), ...segments);
+}
+
+export function normalizeAbsolute(filePath: string): string {
+    return normalizePath(filePath);
+}
+
+export function splitId(id: string): { path: string; queryParams: URLSearchParams } {
+    const queryIndex = id.indexOf("?");
+    if (queryIndex === -1) {
+        return { path: id, queryParams: new URLSearchParams() };
+    }
+
+    const pathPart = id.slice(0, queryIndex);
+    const queryString = id.slice(queryIndex + 1);
+    return { path: pathPart, queryParams: new URLSearchParams(queryString) };
+}
+
+export function normalizeRequestPath(id: string): string {
+    let requestPath = id;
+
+    if (requestPath.startsWith("\0")) {
+        requestPath = requestPath.slice(1);
+    }
+
+    if (requestPath.startsWith("/@fs/")) {
+        requestPath = requestPath.slice("/@fs/".length);
+    } else if (requestPath.startsWith("file://")) {
+        requestPath = fileURLToPath(requestPath);
+    }
+
+    if (path.isAbsolute(requestPath) || requestPath.startsWith(".")) {
+        return normalizePath(requestPath);
+    }
+
+    return normalizePath(requestPath);
+}

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

@@ -2,15 +2,13 @@ import type { Plugin, TransformResult } from "vite";
 import { assert } from "../tools/tsafe/assert";
 import type { Param0 } from "../tools/tsafe/Param0";
 import type { oidcEarlyInit } from "../entrypoint";
-import { createLoadHandleEntrypoint } from "./handleClientEntrypoint";
+import { createHandleClientEntrypoint } from "./handleClientEntrypoint";
+import { createHandleServerEntrypoint } from "./handleServerEntrypoint";
 import { manageOptimizedDeps } from "./manageOptimizedDeps";
 import { transformCreateFileRoute } from "./transformTanstackRouterCreateFileRoute";
 import { getProjectType, type ProjectType } from "./projectType";
 
-export type OidcSpaVitePluginParams = Omit<
-    Param0<typeof oidcEarlyInit>,
-    "isPostLoginRedirectManual" | "BASE_URL"
->;
+export type OidcSpaVitePluginParams = Omit<Param0<typeof oidcEarlyInit>, "BASE_URL">;
 
 export function oidcSpa(
     params: OidcSpaVitePluginParams = {
@@ -19,7 +17,12 @@ export function oidcSpa(
         freezeWebSocket: true
     }
 ) {
-    let loadHandleEntrypoint: ReturnType<typeof createLoadHandleEntrypoint> | undefined = undefined;
+    let load_handleClientEntrypoint:
+        | ReturnType<typeof createHandleClientEntrypoint>["load_handleClientEntrypoint"]
+        | undefined = undefined;
+    let load_handleServerEntrypoint:
+        | ReturnType<typeof createHandleServerEntrypoint>["load_handleServerEntrypoint"]
+        | undefined = undefined;
 
     let projectType: ProjectType | undefined = undefined;
 
@@ -44,11 +47,16 @@ export function oidcSpa(
                 pluginNames: resolvedConfig.plugins.map(({ name }) => name)
             });
 
-            loadHandleEntrypoint = createLoadHandleEntrypoint({
+            load_handleClientEntrypoint = createHandleClientEntrypoint({
                 oidcSpaVitePluginParams: params,
                 resolvedConfig,
                 projectType
-            });
+            }).load_handleClientEntrypoint;
+
+            load_handleServerEntrypoint = createHandleServerEntrypoint({
+                resolvedConfig,
+                projectType
+            }).load_handleServerEntrypoint;
         },
         transform(code, id) {
             let transformed: TransformResult | null = null;
@@ -69,10 +77,23 @@ export function oidcSpa(
             return transformed;
         },
         async load(id) {
-            assert(loadHandleEntrypoint !== undefined);
+            {
+                assert(load_handleClientEntrypoint !== undefined);
+
+                const r = await load_handleClientEntrypoint({
+                    id,
+                    pluginContext: this
+                });
+
+                if (r !== null) {
+                    return r;
+                }
+            }
 
             {
-                const r = await loadHandleEntrypoint({
+                assert(load_handleServerEntrypoint !== undefined);
+
+                const r = await load_handleServerEntrypoint({
                     id,
                     pluginContext: this
                 });

package/vite-plugin/handleClientEntrypoint.d.ts

@@ -2,11 +2,13 @@ import type { OidcSpaVitePluginParams } from "./vite-plugin";
 import type { ResolvedConfig } from "vite";
 import type { PluginContext } from "rollup";
 import type { ProjectType } from "./projectType";
-export declare function createLoadHandleEntrypoint(params: {
+export declare function createHandleClientEntrypoint(params: {
     oidcSpaVitePluginParams: OidcSpaVitePluginParams;
     resolvedConfig: ResolvedConfig;
     projectType: ProjectType;
-}): (params: {
-    id: string;
-    pluginContext: PluginContext;
-}) => Promise<null | string>;
+}): {
+    load_handleClientEntrypoint: (params: {
+        id: string;
+        pluginContext: PluginContext;
+    }) => Promise<null | string>;
+};

package/vite-plugin/handleClientEntrypoint.js

@@ -33,13 +33,11 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLoadHandleEntrypoint = createLoadHandleEntrypoint;
+exports.createHandleClientEntrypoint = createHandleClientEntrypoint;
 const node_fs_1 = require("node:fs");
-const node_fs_2 = require("node:fs");
 const path = __importStar(require("node:path"));
-const node_url_1 = require("node:url");
-const vite_1 = require("vite");
 const assert_1 = require("../tools/tsafe/assert");
+const utils_1 = require("./utils");
 const ORIGINAL_QUERY_PARAM = "oidc-spa-original";
 const GENERIC_ENTRY_CANDIDATES = ["src/main.tsx", "src/main.ts", "src/main.jsx", "src/main.js"];
 const REACT_ROUTER_ENTRY_CANDIDATES = [
@@ -49,16 +47,16 @@ const REACT_ROUTER_ENTRY_CANDIDATES = [
     "entry.client.js"
 ];
 const TANSTACK_ENTRY_CANDIDATES = ["client.tsx", "client.ts", "client.jsx", "client.js"];
-function createLoadHandleEntrypoint(params) {
+function createHandleClientEntrypoint(params) {
     const { oidcSpaVitePluginParams, resolvedConfig, projectType } = params;
     const entryResolution = resolveEntryForProject({
         config: resolvedConfig,
         projectType
     });
-    async function loadHandleEntrypoint(params) {
+    async function load_handleClientEntrypoint(params) {
         const { id, pluginContext } = params;
-        const { path: rawPath, queryParams } = splitId(id);
-        const normalizedRequestPath = normalizeRequestPath(rawPath);
+        const { path: rawPath, queryParams } = (0, utils_1.splitId)(id);
+        const normalizedRequestPath = (0, utils_1.normalizeRequestPath)(rawPath);
         if (!normalizedRequestPath) {
             return null;
         }
@@ -80,7 +78,6 @@ function createLoadHandleEntrypoint(params) {
             `    freezeWebSocket: ${freezeWebSocket},`,
             `    freezePromise: ${freezePromise},`,
             `    safeMode: ${safeMode},`,
-            `    isPostLoginRedirectManual: ${projectType === "tanstack-start"},`,
             `    BASE_URL: "${resolvedConfig.base}"`,
             `});`,
             ``,
@@ -92,25 +89,25 @@ function createLoadHandleEntrypoint(params) {
             .join("\n");
         return stubSourceCache;
     }
-    return loadHandleEntrypoint;
+    return { load_handleClientEntrypoint };
 }
 function resolveEntryForProject({ config, projectType }) {
     const root = config.root;
     switch (projectType) {
         case "tanstack-start": {
-            const candidate = resolveCandidate({
+            const candidate = (0, utils_1.resolveCandidate)({
                 root,
                 subDirectories: ["src"],
                 filenames: TANSTACK_ENTRY_CANDIDATES
             });
             const entryPath = candidate ??
-                resolvePackageFile("@tanstack/react-start", [
+                (0, utils_1.resolvePackageFile)("@tanstack/react-start", [
                     "dist",
                     "plugin",
                     "default-entry",
                     "client.tsx"
                 ]);
-            const normalized = normalizeAbsolute(entryPath);
+            const normalized = (0, utils_1.normalizeAbsolute)(entryPath);
             const resolution = {
                 absolutePath: entryPath,
                 normalizedPath: normalized,
@@ -119,19 +116,19 @@ function resolveEntryForProject({ config, projectType }) {
             return resolution;
         }
         case "react-router-framework": {
-            const candidate = resolveCandidate({
+            const candidate = (0, utils_1.resolveCandidate)({
                 root,
                 subDirectories: ["app"],
                 filenames: REACT_ROUTER_ENTRY_CANDIDATES
             });
             const entryPath = candidate ??
-                resolvePackageFile("@react-router/dev", [
+                (0, utils_1.resolvePackageFile)("@react-router/dev", [
                     "dist",
                     "config",
                     "defaults",
                     "entry.client.tsx"
                 ]);
-            const normalized = normalizeAbsolute(entryPath);
+            const normalized = (0, utils_1.normalizeAbsolute)(entryPath);
             const resolution = {
                 absolutePath: entryPath,
                 normalizedPath: normalized,
@@ -140,13 +137,13 @@ function resolveEntryForProject({ config, projectType }) {
             return resolution;
         }
         case "other": {
-            const candidate = resolveCandidate({
+            const candidate = (0, utils_1.resolveCandidate)({
                 root,
                 subDirectories: ["."],
                 filenames: GENERIC_ENTRY_CANDIDATES
             });
             (0, assert_1.assert)(candidate !== undefined);
-            const normalized = normalizeAbsolute(candidate);
+            const normalized = (0, utils_1.normalizeAbsolute)(candidate);
             const resolution = {
                 absolutePath: candidate,
                 normalizedPath: normalized,
@@ -160,49 +157,6 @@ function resolveEntryForProject({ config, projectType }) {
 }
 function loadOriginalModule(entry, context) {
     entry.watchFiles.forEach(file => context.addWatchFile(file));
-    return node_fs_2.promises.readFile(entry.absolutePath, "utf8");
-}
-function resolveCandidate({ root, subDirectories, filenames }) {
-    for (const subDirectory of subDirectories) {
-        for (const filename of filenames) {
-            const candidate = path.resolve(root, subDirectory, filename);
-            if ((0, node_fs_1.existsSync)(candidate)) {
-                return candidate;
-            }
-        }
-    }
-    return undefined;
-}
-function resolvePackageFile(packageName, segments) {
-    const pkgPath = require.resolve(`${packageName}/package.json`);
-    return path.resolve(path.dirname(pkgPath), ...segments);
-}
-function normalizeAbsolute(filePath) {
-    return (0, vite_1.normalizePath)(filePath);
-}
-function splitId(id) {
-    const queryIndex = id.indexOf("?");
-    if (queryIndex === -1) {
-        return { path: id, queryParams: new URLSearchParams() };
-    }
-    const pathPart = id.slice(0, queryIndex);
-    const queryString = id.slice(queryIndex + 1);
-    return { path: pathPart, queryParams: new URLSearchParams(queryString) };
-}
-function normalizeRequestPath(id) {
-    let requestPath = id;
-    if (requestPath.startsWith("\0")) {
-        requestPath = requestPath.slice(1);
-    }
-    if (requestPath.startsWith("/@fs/")) {
-        requestPath = requestPath.slice("/@fs/".length);
-    }
-    else if (requestPath.startsWith("file://")) {
-        requestPath = (0, node_url_1.fileURLToPath)(requestPath);
-    }
-    if (path.isAbsolute(requestPath) || requestPath.startsWith(".")) {
-        return (0, vite_1.normalizePath)(requestPath);
-    }
-    return (0, vite_1.normalizePath)(requestPath);
+    return node_fs_1.promises.readFile(entry.absolutePath, "utf8");
 }
 //# sourceMappingURL=handleClientEntrypoint.js.map

package/vite-plugin/handleClientEntrypoint.js.map

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

package/vite-plugin/handleServerEntrypoint.d.ts

@@ -0,0 +1,12 @@
+import type { ResolvedConfig } from "vite";
+import type { PluginContext } from "rollup";
+import type { ProjectType } from "./projectType";
+export declare function createHandleServerEntrypoint(params: {
+    resolvedConfig: ResolvedConfig;
+    projectType: ProjectType;
+}): {
+    load_handleServerEntrypoint: (params: {
+        id: string;
+        pluginContext: PluginContext;
+    }) => Promise<null | string>;
+};

package/vite-plugin/handleServerEntrypoint.js

@@ -0,0 +1,113 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createHandleServerEntrypoint = createHandleServerEntrypoint;
+const node_fs_1 = require("node:fs");
+const path = __importStar(require("node:path"));
+const assert_1 = require("../tools/tsafe/assert");
+const utils_1 = require("./utils");
+const ORIGINAL_QUERY_PARAM = "oidc-spa-original";
+function createHandleServerEntrypoint(params) {
+    const { resolvedConfig, projectType } = params;
+    const entryResolution = resolveEntryForProject({
+        config: resolvedConfig,
+        projectType
+    });
+    async function load_handleServerEntrypoint(params) {
+        if (entryResolution === undefined) {
+            return null;
+        }
+        const { id, pluginContext } = params;
+        const { path: rawPath, queryParams } = (0, utils_1.splitId)(id);
+        const normalizedRequestPath = (0, utils_1.normalizeRequestPath)(rawPath);
+        if (!normalizedRequestPath) {
+            return null;
+        }
+        if (normalizedRequestPath !== entryResolution.normalizedPath) {
+            return null;
+        }
+        const isOriginalRequest = queryParams.getAll(ORIGINAL_QUERY_PARAM).includes("true");
+        if (isOriginalRequest) {
+            return loadOriginalModule(entryResolution, pluginContext);
+        }
+        entryResolution.watchFiles.forEach(file => pluginContext.addWatchFile(file));
+        const stubSourceCache = [
+            `import serverEntry_original from "./${path.basename(entryResolution.absolutePath)}?${ORIGINAL_QUERY_PARAM}=true";`,
+            `import { __withOidcSpaServerEntry } from "oidc-spa/react-tanstack-start";`,
+            ``,
+            `const serverEntry = __withOidcSpaServerEntry(serverEntry_original);`,
+            ``,
+            `export default serverEntry;`
+        ].join("\n");
+        return stubSourceCache;
+    }
+    return { load_handleServerEntrypoint };
+}
+function resolveEntryForProject({ config, projectType }) {
+    const root = config.root;
+    switch (projectType) {
+        case "tanstack-start": {
+            const candidate = (0, utils_1.resolveCandidate)({
+                root,
+                subDirectories: ["src"],
+                filenames: ["server.ts", "server.js", "server.tsx", "server.jsx"]
+            });
+            const entryPath = candidate ??
+                (0, utils_1.resolvePackageFile)("@tanstack/react-start", [
+                    "dist",
+                    "plugin",
+                    "default-entry",
+                    "server.ts"
+                ]);
+            const normalized = (0, utils_1.normalizeAbsolute)(entryPath);
+            const resolution = {
+                absolutePath: entryPath,
+                normalizedPath: normalized,
+                watchFiles: [entryPath]
+            };
+            return resolution;
+        }
+        case "react-router-framework":
+        case "other":
+            return undefined;
+        default:
+            (0, assert_1.assert)(false);
+    }
+}
+function loadOriginalModule(entry, context) {
+    entry.watchFiles.forEach(file => context.addWatchFile(file));
+    return node_fs_1.promises.readFile(entry.absolutePath, "utf8");
+}
+//# sourceMappingURL=handleServerEntrypoint.js.map

package/vite-plugin/handleServerEntrypoint.js.map

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