@batijs/cli 0.0.194 → 0.0.196

package/dist/boilerplates/@batijs/h3/files/h3-entry.ts

@@ -3,36 +3,29 @@ import "dotenv/config";
 import { createServer, type IncomingMessage, type ServerResponse } from "node:http";
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
-import CredentialsProvider from "@auth/core/providers/credentials";
-import { firebaseAdmin } from "@batijs/firebase-auth/libs/firebaseAdmin";
+import { authjsHandler, authjsSessionMiddleware } from "@batijs/authjs/server/authjs-handler";
+import {
+  firebaseAuthLoginHandler,
+  firebaseAuthLogoutHandler,
+  firebaseAuthMiddleware,
+} from "@batijs/firebase-auth/server/firebase-auth-middleware";
+import { vikeHandler } from "@batijs/shared-server/server/vike-handler";
+import { telefuncHandler } from "@batijs/telefunc/server/telefunc-handler";
 import { appRouter } from "@batijs/trpc/trpc/server";
 import installCrypto from "@hattip/polyfills/crypto";
 import installGetSetCookie from "@hattip/polyfills/get-set-cookie";
 import installWhatwgNodeFetch from "@hattip/polyfills/whatwg-node";
 import { nodeHTTPRequestHandler, type NodeHTTPCreateContextFnOptions } from "@trpc/server/adapters/node-http";
-import express from "express";
-import { auth, type ConfigParams } from "express-openid-connect";
-import { getAuth } from "firebase-admin/auth";
 import {
   createApp,
   createRouter,
-  deleteCookie,
   eventHandler,
   fromNodeMiddleware,
-  getCookie,
-  getResponseStatus,
-  getResponseStatusText,
-  readBody,
-  setCookie,
-  setResponseHeaders,
-  setResponseStatus,
+  fromWebHandler,
   toNodeListener,
   toWebRequest,
 } from "h3";
 import serveStatic from "serve-static";
-import { telefunc } from "telefunc";
-import { VikeAuth } from "vike-authjs";
-import { renderPage } from "vike/server";
 
 installWhatwgNodeFetch();
 installGetSetCookie();
@@ -45,6 +38,20 @@ const root = __dirname;
 const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 3000;
 const hmrPort = process.env.HMR_PORT ? parseInt(process.env.HMR_PORT, 10) : 24678;
 
+interface Middleware<Context extends Record<string | number | symbol, unknown>> {
+  (request: Request, context: Context): Response | void | Promise<Response> | Promise<void>;
+}
+
+export function fromWebMiddleware<Context extends Record<string | number | symbol, unknown>>(
+  handler: Middleware<Context>,
+) {
+  return eventHandler((event) => {
+    const ctx = event.context as unknown as Record<string, unknown>;
+    ctx.context ??= {};
+    return handler(toWebRequest(event), ctx.context as Context);
+  });
+}
+
 startServer();
 
 async function startServer() {
@@ -68,127 +75,23 @@ async function startServer() {
 
   const router = createRouter();
 
-  if (BATI.has("authjs")) {
+  if (BATI.has("authjs") || BATI.has("auth0")) {
     /**
-     * AuthJS
-     *
-     * TODO: Replace secret {@see https://authjs.dev/reference/core#secret}
-     * TODO: Choose and implement providers
-     *
-     * @link {@see https://authjs.dev/guides/providers/custom-provider}
+     * Append Auth.js session to context
      **/
-    const Auth = VikeAuth({
-      secret: "MY_SECRET",
-      providers: [
-        CredentialsProvider({
-          name: "Credentials",
-          credentials: {
-            username: { label: "Username", type: "text", placeholder: "jsmith" },
-            password: { label: "Password", type: "password" },
-          },
-          async authorize() {
-            // Add logic here to look up the user from the credentials supplied
-            const user = { id: "1", name: "J Smith", email: "jsmith@example.com" };
-
-            // Any object returned will be saved in `user` property of the JWT
-            // If you return null then an error will be displayed advising the user to check their details.
-            // You can also Reject this callback with an Error thus the user will be sent to the error page with the error message as a query parameter
-            return user ?? null;
-          },
-        }),
-      ],
-    });
+    app.use(fromWebMiddleware(authjsSessionMiddleware));
 
-    router.use(
-      "/api/auth/**",
-      eventHandler((event) =>
-        Auth({
-          request: toWebRequest(event),
-        }),
-      ),
-    );
+    /**
+     * Auth.js route
+     * @link {@see https://authjs.dev/getting-started/installation}
+     **/
+    router.use("/api/auth/**", fromWebHandler(authjsHandler));
   }
 
   if (BATI.has("firebase-auth")) {
-    app.use(
-      eventHandler(async (event) => {
-        const sessionCookie = getCookie(event, "__session");
-        if (sessionCookie) {
-          try {
-            const auth = getAuth(firebaseAdmin);
-            const decodedIdToken = await auth.verifySessionCookie(sessionCookie);
-            const user = await auth.getUser(decodedIdToken.sub);
-            event.context.user = user;
-          } catch (error) {
-            console.debug("verifySessionCookie:", error);
-            event.context.user = null;
-          }
-        }
-      }),
-    );
-
-    router.post(
-      "/api/sessionLogin",
-      eventHandler(async (event) => {
-        const body = await readBody(event);
-        const idToken: string = body.idToken || "";
-
-        let status: number;
-        let text: string;
-
-        const expiresIn = 60 * 60 * 24 * 5 * 1000; // 5 days
-
-        try {
-          const auth = getAuth(firebaseAdmin);
-          const sessionCookie = await auth.createSessionCookie(idToken, { expiresIn });
-          setCookie(event, "__session", sessionCookie, {
-            maxAge: expiresIn,
-            httpOnly: true,
-            secure: true,
-          });
-          setResponseStatus(event, 200, "Success");
-
-          status = getResponseStatus(event);
-          text = getResponseStatusText(event);
-        } catch (error) {
-          console.error("createSessionCookie:", error);
-          setResponseStatus(event, 401, "Unauthorized Request");
-          status = getResponseStatus(event);
-          text = getResponseStatusText(event);
-        }
-
-        return {
-          status,
-          text,
-        };
-      }),
-    );
-
-    router.post(
-      "/api/sessionLogout",
-      eventHandler((event) => {
-        deleteCookie(event, "__session");
-        setResponseStatus(event, 200, "Logged Out");
-        return "Logged Out";
-      }),
-    );
-  }
-
-  if (BATI.has("auth0")) {
-    const config: ConfigParams = {
-      authRequired: false, // Controls whether authentication is required for all routes
-      auth0Logout: true, // Uses Auth0 logout feature
-      baseURL: process.env.BASE_URL?.startsWith("http") ? process.env.BASE_URL : `http://localhost:${port}`, // The URL where the application is served
-      routes: {
-        login: "/api/auth/login", // Custom login route, default is "/login"
-        logout: "/api/auth/logout", // Custom logout route, default is "/logout"
-        callback: "/api/auth/callback", // Custom callback route, default is "/callback"
-      },
-    };
-
-    const expressApp = express();
-
-    app.use(fromNodeMiddleware(expressApp.use(auth(config))));
+    app.use(fromWebMiddleware(firebaseAuthMiddleware));
+    router.post("/api/sessionLogin", fromWebHandler(firebaseAuthLoginHandler));
+    router.post("/api/sessionLogout", fromWebHandler(firebaseAuthLogoutHandler));
   }
 
   if (BATI.has("trpc")) {
@@ -219,26 +122,7 @@ async function startServer() {
      *
      * @link {@see https://telefunc.com}
      **/
-    router.post(
-      "/_telefunc",
-      eventHandler(async (event) => {
-        const request = toWebRequest(event);
-        const httpResponse = await telefunc({
-          url: request.url.toString(),
-          method: request.method,
-          body: await request.text(),
-          context: event,
-        });
-        const { body, statusCode, contentType } = httpResponse;
-
-        setResponseStatus(event, statusCode);
-        setResponseHeaders(event, {
-          "content-type": contentType,
-        });
-
-        return body;
-      }),
-    );
+    router.post("/_telefunc", fromWebHandler(telefuncHandler));
   }
 
   /**
@@ -246,30 +130,7 @@ async function startServer() {
    *
    * @link {@see https://vike.dev}
    **/
-  router.use(
-    "/**",
-    eventHandler(async (event) => {
-      const pageContextInit = BATI.has("auth0")
-        ? {
-            urlOriginal: event.node.req.originalUrl || event.node.req.url!,
-            user: event.node.req.oidc.user,
-          }
-        : BATI.has("firebase-auth")
-          ? {
-              urlOriginal: event.node.req.originalUrl || event.node.req.url!,
-              user: event.context.user,
-            }
-          : { urlOriginal: event.node.req.originalUrl || event.node.req.url! };
-
-      const pageContext = await renderPage(pageContextInit);
-      const response = pageContext.httpResponse;
-
-      setResponseStatus(event, response?.statusCode);
-      setResponseHeaders(event, Object.fromEntries(response?.headers ?? []));
-
-      return response?.getBody();
-    }),
-  );
+  router.use("/**", fromWebHandler(vikeHandler));
 
   app.use(router);
 

package/dist/boilerplates/@batijs/h3/types/h3-entry.d.ts

@@ -1 +1,6 @@
 import "dotenv/config";
+interface Middleware<Context extends Record<string | number | symbol, unknown>> {
+    (request: Request, context: Context): Response | void | Promise<Response> | Promise<void>;
+}
+export declare function fromWebMiddleware<Context extends Record<string | number | symbol, unknown>>(handler: Middleware<Context>): import("h3").EventHandler<import("h3").EventHandlerRequest, void | Response | Promise<Response> | Promise<void>>;
+export {};

package/dist/boilerplates/@batijs/hattip/files/$package.json.js

@@ -42,7 +42,11 @@ var require_package = __commonJS({
       license: "MIT",
       devDependencies: {
         "@auth/core": "^0.31.0",
+        "@batijs/authjs": "workspace:*",
         "@batijs/compile": "workspace:*",
+        "@batijs/firebase-auth": "workspace:*",
+        "@batijs/shared-server": "workspace:^",
+        "@batijs/telefunc": "workspace:^",
         "@batijs/trpc": "workspace:^",
         "@hattip/adapter-node": "^0.0.45",
         "@hattip/core": "^0.0.45",
@@ -50,10 +54,10 @@ var require_package = __commonJS({
         "@hattip/vite": "^0.0.45",
         "@trpc/server": "^10.45.2",
         "@types/node": "^18.19.14",
+        dotenv: "^16.4.5",
         hattip: "^0.0.33",
         telefunc: "^0.1.72",
-        vike: "^0.4.171",
-        "vike-authjs": "^0.1.6",
+        vike: "^0.4.172",
         vite: "^5.2.11"
       },
       dependencies: {
@@ -94,7 +98,7 @@ async function getPackageJson(props) {
       warnIfReplaced: true
     },
     build: {
-      value: "NODE_ENV=production hattip build ./hattip-entry.ts --client",
+      value: "NODE_ENV=production hattip build ./hattip-entry.ts --target es2022 --client",
       precedence: 20,
       warnIfReplaced: true
     }
@@ -110,7 +114,7 @@ async function getPackageJson(props) {
       "hattip",
       "vite",
       "vike",
-      ...props.meta.BATI.has("authjs") ? ["@auth/core", "vike-authjs"] : []
+      ...props.meta.BATI.has("authjs") || props.meta.BATI.has("auth0") ? ["@auth/core", "dotenv"] : []
     ]
   });
 }

package/dist/boilerplates/@batijs/hattip/files/hattip-entry.ts

@@ -1,11 +1,31 @@
-import CredentialsProvider from "@auth/core/providers/credentials";
+// BATI.has("auth0")
+import "dotenv/config";
+import { authjsHandler, authjsSessionMiddleware } from "@batijs/authjs/server/authjs-handler";
+import {
+  firebaseAuthLoginHandler,
+  firebaseAuthLogoutHandler,
+  firebaseAuthMiddleware,
+} from "@batijs/firebase-auth/server/firebase-auth-middleware";
+import { vikeHandler } from "@batijs/shared-server/server/vike-handler";
+import { telefuncHandler } from "@batijs/telefunc/server/telefunc-handler";
 import { appRouter } from "@batijs/trpc/trpc/server";
 import type { HattipHandler } from "@hattip/core";
-import { createRouter } from "@hattip/router";
+import { createRouter, type RouteHandler } from "@hattip/router";
 import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
-import { telefunc } from "telefunc";
-import { VikeAuth } from "vike-authjs";
-import { renderPage } from "vike/server";
+
+interface Middleware<Context extends Record<string | number | symbol, unknown>> {
+  (request: Request, context: Context): Response | void | Promise<Response> | Promise<void>;
+}
+
+function handlerAdapter<Context extends Record<string | number | symbol, unknown>>(
+  handler: Middleware<Context>,
+): RouteHandler<unknown, unknown> {
+  return (context) => {
+    const rawContext = context as unknown as Record<string, unknown>;
+    rawContext.context ??= {};
+    return handler(context.request, rawContext.context as Context);
+  };
+}
 
 const router = createRouter();
 
@@ -15,21 +35,7 @@ if (BATI.has("telefunc")) {
    *
    * @link {@see https://telefunc.com}
    **/
-  router.post("/_telefunc", async (context) => {
-    const httpResponse = await telefunc({
-      url: context.url.toString(),
-      method: context.method,
-      body: await context.request.text(),
-      context,
-    });
-    const { body, statusCode, contentType } = httpResponse;
-    return new Response(body, {
-      status: statusCode,
-      headers: {
-        "content-type": contentType,
-      },
-    });
-  });
+  router.post("/_telefunc", handlerAdapter(telefuncHandler));
 }
 
 if (BATI.has("trpc")) {
@@ -50,40 +56,23 @@ if (BATI.has("trpc")) {
   });
 }
 
-if (BATI.has("authjs")) {
+if (BATI.has("authjs") || BATI.has("auth0")) {
   /**
-   * AuthJS
-   *
-   * TODO: Replace secret {@see https://authjs.dev/reference/core#secret}
-   * TODO: Choose and implement providers
-   *
-   * @link {@see https://authjs.dev/guides/providers/custom-provider}
+   * Append Auth.js session to context
    **/
-  const Auth = VikeAuth({
-    secret: "MY_SECRET", // See
-
-    providers: [
-      CredentialsProvider({
-        name: "Credentials",
-        credentials: {
-          username: { label: "Username", type: "text", placeholder: "username" },
-          password: { label: "Password", type: "password" },
-        },
-        async authorize() {
-          // Add logic here to look up the user from the credentials supplied
-          const user = { id: "1", name: "J Smith", email: "jsmith@example.com" };
+  router.use(handlerAdapter(authjsSessionMiddleware));
 
-          // Any object returned will be saved in `user` property of the JWT
-          // If you return null then an error will be displayed advising the user to check their details.
-          // You can also Reject this callback with an Error thus the user will be sent to the error page with the error message as a query parameter
-          return user ?? null;
-        },
-      }),
-    ],
-  });
+  /**
+   * Auth.js route
+   * @link {@see https://authjs.dev/getting-started/installation}
+   **/
+  router.use("/api/auth/*", handlerAdapter(authjsHandler));
+}
 
-  router.get("/api/auth/*", Auth);
-  router.post("/api/auth/*", Auth);
+if (BATI.has("firebase-auth")) {
+  router.use(handlerAdapter(firebaseAuthMiddleware));
+  router.post("/api/sessionLogin", handlerAdapter(firebaseAuthLoginHandler));
+  router.post("/api/sessionLogout", handlerAdapter(firebaseAuthLogoutHandler));
 }
 
 /**
@@ -91,15 +80,6 @@ if (BATI.has("authjs")) {
  *
  * @link {@see https://vike.dev}
  **/
-router.use(async (context) => {
-  const pageContextInit = { urlOriginal: context.request.url };
-  const pageContext = await renderPage(pageContextInit);
-  const response = pageContext.httpResponse;
-
-  return new Response(await response?.getBody(), {
-    status: response?.statusCode,
-    headers: response?.headers,
-  });
-});
+router.use(handlerAdapter(vikeHandler));
 
 export default router.buildHandler() as HattipHandler;

package/dist/boilerplates/@batijs/hattip/types/hattip-entry.d.ts

@@ -1,3 +1,4 @@
+import "dotenv/config";
 import type { HattipHandler } from "@hattip/core";
 declare const _default: HattipHandler;
 export default _default;

package/dist/boilerplates/@batijs/hono/files/$package.json.js

@@ -42,19 +42,21 @@ var require_package = __commonJS({
       license: "MIT",
       devDependencies: {
         "@auth/core": "^0.31.0",
+        "@batijs/authjs": "workspace:*",
         "@batijs/compile": "workspace:*",
         "@batijs/firebase-auth": "workspace:*",
+        "@batijs/shared-server": "workspace:^",
+        "@batijs/telefunc": "workspace:^",
         "@batijs/trpc": "workspace:^",
         "@hono/node-server": "^1.11.1",
         "@hono/vite-dev-server": "^0.12.1",
         "@trpc/server": "^10.45.2",
         "@types/node": "^18.19.14",
-        "firebase-admin": "^12.1.0",
-        hono: "^4.3.8",
+        dotenv: "^16.4.5",
+        hono: "^4.4.0",
         telefunc: "^0.1.72",
-        tsx: "^4.10.5",
-        vike: "^0.4.171",
-        "vike-authjs": "^0.1.6",
+        tsx: "^4.11.0",
+        vike: "^0.4.172",
         vite: "^5.2.11"
       },
       dependencies: {
@@ -112,7 +114,7 @@ async function getPackageJson(props) {
       "tsx",
       "vite",
       "vike",
-      ...props.meta.BATI.has("authjs") ? ["@auth/core", "vike-authjs"] : []
+      ...props.meta.BATI.has("authjs") || props.meta.BATI.has("auth0") ? ["@auth/core", "dotenv"] : []
     ]
   });
 }