@batijs/cli 0.0.194 → 0.0.196

package/dist/boilerplates/@batijs/auth0/files/$.env.js

@@ -1,17 +1,13 @@
 // files/$.env.ts
-import { appendToEnv, randomBytes } from "@batijs/core";
+import { appendToEnv } from "@batijs/core";
 async function getEnv(props) {
   const auth0ClientId = process.env.TEST_AUTH0_CLIENT_ID;
+  const auth0ClientSecret = process.env.TEST_AUTH0_CLIENT_SECRET;
   const auth0BaseUrl = process.env.TEST_AUTH0_ISSUER_BASE_URL;
   let envContent = await props.readfile?.();
-  envContent = appendToEnv(
-    envContent,
-    "SECRET",
-    randomBytes(32).toString("hex"),
-    "Randomly generated by Bati CLI, used by Auth0"
-  );
-  envContent = appendToEnv(envContent, "CLIENT_ID", auth0ClientId ?? "", "Auth0 Client ID");
-  envContent = appendToEnv(envContent, "ISSUER_BASE_URL", auth0BaseUrl ?? "", "Auth0 base URL");
+  envContent = appendToEnv(envContent, "AUTH0_CLIENT_ID", auth0ClientId ?? "", "Auth0 Client ID");
+  envContent = appendToEnv(envContent, "AUTH0_CLIENT_SECRET", auth0ClientSecret ?? "", "Auth0 Client Secret");
+  envContent = appendToEnv(envContent, "AUTH0_ISSUER_BASE_URL", auth0BaseUrl ?? "", "Auth0 base URL");
   return envContent;
 }
 export {

package/dist/boilerplates/@batijs/auth0/files/$README.md.js

@@ -8,32 +8,23 @@ async function getReadme(props) {
 - Create Application -> Regular Web Application 
 - What technology are you using for your project? -> Node.js (Express) -> Integrate Now
 - Configure Auth0:
-  - Allowed Callback URL: http://localhost:3000/api/auth/callback
+  - Allowed Callback URL: http://localhost:3000/api/auth/callback/auth0
   - Allowed Logout URLs: http://localhost:3000
 - Save Changes
-- Copy your \`clientID\` and \`issuerBaseURL\` and paste it in \`.env\` file like this:
+- Copy your \`Client ID\`, \`Client Secret\` and \`Domain\` and paste it in \`.env\` file like this:
 
 \`\`\`env
 // .env
-SECRET=<random string>
-CLIENT_ID=<Client ID>
-ISSUER_BASE_URL=https://<your-auth0-domain>.<eu>.auth0.com
+AUTH0_CLIENT_SECRET=<Client Secret>
+AUTH0_CLIENT_ID=<Client ID>
+AUTH0_ISSUER_BASE_URL=https://<your-auth0-domain>.<eu>.auth0.com
 \`\`\`
 
 > [!NOTE]
-> Environment variables that are automatically made available to Auth0 :
-> - \`SECRET\`
-> - \`ISSUER_BASE_URL\`
-> - \`BASE_URL\`
-> - \`CLIENT_ID\`
-> - \`CLIENT_SECRET\`
+> Login route is \`http://localhost:3000/api/auth/signin\`.
+> Logout route is \`http://localhost:3000/api/auth/signout\`.
 
-> [!NOTE]
-> Login route is \`http://localhost:3000/api/auth/login\`.
-> Logout route is \`http://localhost:3000/api/auth/logout\`.
-
-- Read more [Auth0 Express SDK Quickstarts: Login](https://auth0.com/docs/quickstart/webapp/express)
-- Read more [Auth0 Express SDK Quickstarts: Add Login to your Express App](https://auth0.com/docs/quickstart/webapp/express/interactive)
+- Read more [Auth.js: Auth0 provider](https://authjs.dev/reference/core/providers/auth0)
 `;
   content.addTodo(todo);
   return content.finalize();

package/dist/boilerplates/@batijs/authjs/files/server/authjs-handler.ts

@@ -0,0 +1,100 @@
+import { Auth, createActionURL, setEnvDefaults, type AuthConfig } from "@auth/core";
+import Auth0 from "@auth/core/providers/auth0";
+import CredentialsProvider from "@auth/core/providers/credentials";
+import type { Session } from "@auth/core/types";
+
+const env: Record<string, string | undefined> =
+  typeof process?.env !== "undefined"
+    ? process.env
+    : import.meta && "env" in import.meta
+      ? (import.meta as ImportMeta & { env: Record<string, string | undefined> }).env
+      : {};
+
+if (!globalThis.crypto) {
+  /**
+   * Polyfill needed if Auth.js code runs on node18
+   */
+  Object.defineProperty(globalThis, "crypto", {
+    value: await import("node:crypto").then((crypto) => crypto.webcrypto as Crypto),
+    writable: false,
+    configurable: true,
+  });
+}
+
+const authjsConfig = {
+  basePath: "/api/auth",
+  trustHost: Boolean(env.AUTH_TRUST_HOST ?? env.VERCEL ?? env.NODE_ENV !== "production"),
+  // TODO: Replace secret {@see https://authjs.dev/reference/core#secret}
+  secret: "MY_SECRET",
+  providers: [
+    // TODO: Choose and implement 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;
+      },
+    }),
+    //# BATI.has("auth0")
+    Auth0({
+      issuer: env.AUTH0_ISSUER_BASE_URL,
+      clientId: env.AUTH0_CLIENT_ID,
+      clientSecret: env.AUTH0_CLIENT_SECRET,
+    }),
+  ],
+} satisfies Omit<AuthConfig, "raw">;
+
+/**
+ * Retrieve Auth.js session from Request
+ */
+export async function getSession(req: Request, config: Omit<AuthConfig, "raw">): Promise<Session | null> {
+  setEnvDefaults(process.env, config);
+  const requestURL = new URL(req.url);
+  const url = createActionURL("session", requestURL.protocol, req.headers, process.env, config.basePath);
+
+  const response = await Auth(new Request(url, { headers: { cookie: req.headers.get("cookie") ?? "" } }), config);
+
+  const { status = 200 } = response;
+
+  const data = await response.json();
+
+  if (!data || !Object.keys(data).length) return null;
+  if (status === 200) return data;
+  throw new Error(data.message);
+}
+
+/**
+ * Add Auth.js session to context
+ * @link {@see https://authjs.dev/getting-started/session-management/get-session}
+ **/
+export async function authjsSessionMiddleware(
+  request: Request,
+  context: Record<string | number | symbol, unknown>,
+): Promise<void> {
+  try {
+    context.session = await getSession(request, authjsConfig);
+  } catch (error) {
+    console.debug("authjsSessionMiddleware:", error);
+    context.user = null;
+  }
+}
+
+/**
+ * Auth.js route
+ * @link {@see https://authjs.dev/getting-started/installation}
+ **/
+export function authjsHandler<Context extends Record<string | number | symbol, unknown>>(
+  request: Request,
+  _context?: Context,
+): Promise<Response> {
+  return Auth(request, authjsConfig);
+}

package/dist/boilerplates/@batijs/authjs/types/server/authjs-handler.d.ts

@@ -0,0 +1,16 @@
+import { type AuthConfig } from "@auth/core";
+import type { Session } from "@auth/core/types";
+/**
+ * Retrieve Auth.js session from Request
+ */
+export declare function getSession(req: Request, config: Omit<AuthConfig, "raw">): Promise<Session | null>;
+/**
+ * Add Auth.js session to context
+ * @link {@see https://authjs.dev/getting-started/session-management/get-session}
+ **/
+export declare function authjsSessionMiddleware(request: Request, context: Record<string | number | symbol, unknown>): Promise<void>;
+/**
+ * Auth.js route
+ * @link {@see https://authjs.dev/getting-started/installation}
+ **/
+export declare function authjsHandler<Context extends Record<string | number | symbol, unknown>>(request: Request, _context?: Context): Promise<Response>;

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

@@ -46,7 +46,7 @@ var require_package = __commonJS({
         "@prisma/client": "^5.14.0",
         "@types/node": "^18.19.14",
         colorette: "^2.0.20",
-        edgedb: "^1.5.6"
+        edgedb: "^1.5.7"
       },
       dependencies: {
         "@batijs/core": "workspace:*"

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

@@ -42,8 +42,8 @@ var require_package = __commonJS({
       },
       devDependencies: {
         "@batijs/compile": "workspace:^",
-        "@typescript-eslint/eslint-plugin": "^7.9.0",
-        "@typescript-eslint/parser": "^7.9.0",
+        "@typescript-eslint/eslint-plugin": "^7.10.0",
+        "@typescript-eslint/parser": "^7.10.0",
         eslint: "^8.57.0"
       },
       dependencies: {

package/dist/boilerplates/@batijs/eslint/files/.eslintrc.json

@@ -1,10 +1,23 @@
 {
   "root": true,
   "parser": "@typescript-eslint/parser",
-  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
-  "plugins": ["@typescript-eslint"],
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended"
+  ],
+  "plugins": [
+    "@typescript-eslint"
+  ],
   "parserOptions": {
     "sourceType": "module",
     "ecmaVersion": "latest"
+  },
+  "rules": {
+    "@typescript-eslint/no-unused-vars": [
+      1,
+      {
+        "argsIgnorePattern": "^_"
+      }
+    ]
   }
 }

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

@@ -42,23 +42,24 @@ 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",
         "@trpc/server": "^10.45.2",
         "@types/cookie-parser": "^1.4.7",
         "@types/express": "^4.17.21",
         "@types/node": "^18.19.14",
+        "@universal-middleware/express": "^0.0.2",
         "cookie-parser": "^1.4.6",
         dotenv: "^16.4.5",
         express: "^4.19.2",
         "express-openid-connect": "^2.17.1",
-        "firebase-admin": "^12.1.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: {
@@ -111,18 +112,16 @@ async function getPackageJson(props) {
   return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
     devDependencies: [
       "@types/express",
-      ...props.meta.BATI.has("firebase-auth") ? ["@types/cookie-parser"] : [],
-      ...props.meta.BATI.has("auth0") ? ["dotenv"] : []
+      ...props.meta.BATI.has("firebase-auth") ? ["@types/cookie-parser"] : []
     ],
     dependencies: [
-      "@hattip/adapter-node",
+      "@universal-middleware/express",
       "express",
       "tsx",
       "vite",
       "vike",
-      ...props.meta.BATI.has("authjs") ? ["@auth/core", "vike-authjs"] : [],
-      ...props.meta.BATI.has("firebase-auth") ? ["cookie-parser"] : [],
-      ...props.meta.BATI.has("auth0") ? ["express-openid-connect"] : []
+      ...props.meta.BATI.has("authjs") || props.meta.BATI.has("auth0") ? ["@auth/core", "dotenv"] : [],
+      ...props.meta.BATI.has("firebase-auth") ? ["cookie-parser"] : []
     ]
   });
 }

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

@@ -2,18 +2,18 @@
 import "dotenv/config";
 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 { createMiddleware } from "@hattip/adapter-node";
 import * as trpcExpress from "@trpc/server/adapters/express";
-import cookieParser from "cookie-parser";
-import express, { type Request } from "express";
-import { auth, type ConfigParams } from "express-openid-connect";
-import { getAuth } from "firebase-admin/auth";
-import { telefunc } from "telefunc";
-import { VikeAuth } from "vike-authjs";
-import { renderPage } from "vike/server";
+import { createMiddleware } from "@universal-middleware/express";
+import express from "express";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -22,6 +22,34 @@ 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 handlerAdapter<Context extends Record<string | number | symbol, unknown>>(
+  handler: Middleware<Context>,
+) {
+  return createMiddleware(
+    async (context) => {
+      const rawRequest = context.platform.request as unknown as Record<string, unknown>;
+      rawRequest.context ??= {};
+      const response = await handler(context.request, rawRequest.context as Context);
+
+      if (!response) {
+        context.passThrough();
+        return new Response("", {
+          status: 404,
+        });
+      }
+
+      return response;
+    },
+    {
+      alwaysCallNext: false,
+    },
+  );
+}
+
 startServer();
 
 async function startServer() {
@@ -43,104 +71,23 @@ async function startServer() {
     app.use(viteDevMiddleware);
   }
 
-  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" };
+    app.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;
-          },
-        }),
-      ],
-    });
-
-    app.all(
-      "/api/auth/*",
-      createMiddleware(Auth, {
-        alwaysCallNext: false,
-      }),
-    );
+    /**
+     * Auth.js route
+     * @link {@see https://authjs.dev/getting-started/installation}
+     **/
+    app.all("/api/auth/*", handlerAdapter(authjsHandler));
   }
 
   if (BATI.has("firebase-auth")) {
-    app.use(cookieParser());
-    app.use(async function (req: Request, _, next) {
-      const sessionCookie: string = req.cookies.__session || "";
-
-      try {
-        const auth = getAuth(firebaseAdmin);
-        const decodedIdToken = await auth.verifySessionCookie(sessionCookie, true);
-        const user = await auth.getUser(decodedIdToken.sub);
-        req.user = user;
-      } catch (error) {
-        console.debug("verifySessionCookie:", error);
-        req.user = null;
-      }
-
-      next();
-    });
-
-    app.use(express.json()); // Parse & make HTTP request body available at `req.body`
-    app.post("/api/sessionLogin", (req: Request, res) => {
-      const idToken: string = req.body.idToken || "";
-
-      const expiresIn = 60 * 60 * 24 * 5 * 1000; // 5 days
-
-      getAuth(firebaseAdmin)
-        .createSessionCookie(idToken, { expiresIn })
-        .then(
-          (sessionCookie) => {
-            // Set cookie policy for session cookie.
-            const options = { maxAge: expiresIn, httpOnly: true, secure: true };
-            res.cookie("__session", sessionCookie, options);
-            res.end(JSON.stringify({ status: "success" }));
-          },
-          (error) => {
-            console.error("createSessionCookie:", error);
-            res.status(401).send("Unauthorized Request");
-          },
-        );
-    });
-
-    app.post("/api/sessionLogout", function (_, res) {
-      res.clearCookie("__session");
-      res.end();
-    });
-  }
-
-  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"
-      },
-    };
-
-    app.use(auth(config));
+    app.use(handlerAdapter(firebaseAuthMiddleware));
+    app.post("/api/sessionLogin", handlerAdapter(firebaseAuthLoginHandler));
+    app.post("/api/sessionLogout", handlerAdapter(firebaseAuthLogoutHandler));
   }
 
   if (BATI.has("trpc")) {
@@ -166,29 +113,7 @@ async function startServer() {
      *
      * @link {@see https://telefunc.com}
      **/
-    app.post(
-      "/_telefunc",
-      createMiddleware(
-        async (context) => {
-          const httpResponse = await telefunc({
-            url: context.request.url.toString(),
-            method: context.request.method,
-            body: await context.request.text(),
-            context,
-          });
-          const { body, statusCode, contentType } = httpResponse;
-          return new Response(body, {
-            status: statusCode,
-            headers: {
-              "content-type": contentType,
-            },
-          });
-        },
-        {
-          alwaysCallNext: false,
-        },
-      ),
-    );
+    app.post("/_telefunc", handlerAdapter(telefuncHandler));
   }
 
   /**
@@ -196,25 +121,7 @@ async function startServer() {
    *
    * @link {@see https://vike.dev}
    **/
-  app.all("*", async (req: Request, res, next) => {
-    const pageContextInit = BATI.has("auth0")
-      ? { urlOriginal: req.originalUrl, user: req.oidc.user }
-      : BATI.has("firebase-auth")
-        ? { urlOriginal: req.originalUrl, user: req.user }
-        : { urlOriginal: req.originalUrl };
-
-    const pageContext = await renderPage(pageContextInit);
-    const { httpResponse } = pageContext;
-
-    if (!httpResponse) {
-      return next();
-    } else {
-      const { statusCode, headers } = httpResponse;
-      headers.forEach(([name, value]) => res.setHeader(name, value));
-      res.status(statusCode);
-      httpResponse.pipe(res);
-    }
-  });
+  app.all("*", handlerAdapter(vikeHandler));
 
   app.listen(port, () => {
     console.log(`Server listening on http://localhost:${port}`);

package/dist/boilerplates/@batijs/express/types/express-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 handlerAdapter<Context extends Record<string | number | symbol, unknown>>(handler: Middleware<Context>): import("@universal-middleware/express/native-fetch").NodeMiddleware;
+export {};

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

@@ -42,26 +42,23 @@ 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:^",
-        "@fastify/cookie": "^9.3.1",
-        "@fastify/formbody": "^7.4.0",
         "@fastify/middie": "^8.3.1",
         "@fastify/static": "^7.0.4",
-        "@hattip/adapter-node": "^0.0.45",
         "@trpc/server": "^10.45.2",
         "@types/express": "^4.17.21",
         "@types/node": "^18.19.14",
+        "@universal-middleware/express": "^0.0.2",
         dotenv: "^16.4.5",
-        express: "^4.19.2",
-        "express-openid-connect": "^2.17.1",
         fastify: "^4.27.0",
-        "firebase-admin": "^12.1.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: {
@@ -116,13 +113,12 @@ async function getPackageJson(props) {
     dependencies: [
       "@fastify/middie",
       "@fastify/static",
+      "@universal-middleware/express",
       "fastify",
       "tsx",
       "vike",
       "vite",
-      ...props.meta.BATI.has("authjs") ? ["@auth/core", "@fastify/formbody", "@hattip/adapter-node", "vike-authjs"] : [],
-      ...props.meta.BATI.has("firebase-auth") ? ["@fastify/cookie"] : [],
-      ...props.meta.BATI.has("auth0") ? ["express", "express-openid-connect"] : []
+      ...props.meta.BATI.has("authjs") || props.meta.BATI.has("auth0") ? ["@auth/core", "dotenv"] : []
     ]
   });
 }