@batijs/cli 0.0.164 → 0.0.165

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

@@ -2,16 +2,24 @@ import { createServer, type IncomingMessage, type ServerResponse } from "node:ht
 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 { 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 { getAuth, type UserRecord } from "firebase-admin/auth";
 import {
   createApp,
   createRouter,
+  deleteCookie,
   eventHandler,
   fromNodeMiddleware,
+  getCookie,
+  getResponseStatus,
+  getResponseStatusText,
+  readBody,
+  setCookie,
   setResponseHeaders,
   setResponseStatus,
   toNodeListener,
@@ -31,6 +39,14 @@ const __dirname = dirname(__filename);
 const isProduction = process.env.NODE_ENV === "production";
 const root = __dirname;
 
+/*{ @if (it.BATI.has("firebase-auth")) }*/
+declare module "h3" {
+  interface H3EventContext {
+    user: UserRecord | null;
+  }
+}
+/*{ /if }*/
+
 startServer();
 
 async function startServer() {
@@ -95,6 +111,71 @@ async function startServer() {
     );
   }
 
+  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.error("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("trpc")) {
     /**
      * tRPC route
@@ -153,7 +234,12 @@ async function startServer() {
   router.use(
     "/**",
     eventHandler(async (event) => {
-      const pageContextInit = { urlOriginal: event.node.req.originalUrl || event.node.req.url! };
+      const pageContextInit = BATI.has("firebase-auth")
+        ? { urlOriginal: event.node.req.originalUrl || event.node.req.url! }
+        : {
+            urlOriginal: event.node.req.originalUrl || event.node.req.url!,
+            user: event.context.user,
+          };
       const pageContext = await renderPage(pageContextInit);
       const response = pageContext.httpResponse;
 

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

@@ -1 +1,6 @@
-export {};
+import { type UserRecord } from "firebase-admin/auth";
+declare module "h3" {
+    interface H3EventContext {
+        user: UserRecord | null;
+    }
+}

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

@@ -48,13 +48,13 @@ var require_package = __commonJS({
         "@hattip/core": "^0.0.43",
         "@hattip/router": "^0.0.43",
         "@hattip/vite": "^0.0.43",
-        "@trpc/server": "^10.45.1",
+        "@trpc/server": "^10.45.2",
         "@types/node": "^18.19.14",
         hattip: "^0.0.33",
         telefunc: "^0.1.71",
         vike: "^0.4.165",
         "vike-authjs": "^0.1.5",
-        vite: "^5.1.4"
+        vite: "^5.1.6"
       },
       dependencies: {
         "@batijs/core": "workspace:*"

package/dist/boilerplates/@batijs/prettier/files/.prettierignore

@@ -83,6 +83,9 @@ web_modules/
 .cache
 .parcel-cache
 
+# firebase-admin service-account
+firebase
+
 # Next.js build output
 .next
 out

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

@@ -46,18 +46,18 @@ var require_package = __commonJS({
         "@babel/plugin-transform-react-jsx": "^7.23.4",
         "@batijs/compile": "workspace:*",
         "@types/node": "^18.19.14",
-        "@types/react": "^18.2.61",
-        "@types/react-dom": "^18.2.19",
+        "@types/react": "^18.2.64",
+        "@types/react-dom": "^18.2.21",
         "@vitejs/plugin-react": "^4.2.1",
         "cross-fetch": "^4.0.0",
         "eslint-plugin-react": "^7.34.0",
         react: "^18.2.0",
         "react-dom": "^18.2.0",
         tailwindcss: "^3.4.1",
-        typescript: "^5.3.3",
+        typescript: "^5.4.2",
         vike: "^0.4.165",
         "vike-react": "^0.4.6",
-        vite: "^5.1.4"
+        vite: "^5.1.6"
       },
       dependencies: {
         "@batijs/core": "workspace:*"

package/dist/boilerplates/@batijs/react/files/pages/+config.ts

@@ -7,7 +7,18 @@ import Layout from "../layouts/LayoutDefault";
 export default {
   Layout,
   Head,
+  /*{ @if (it.BATI.has("firebase-auth")) }*/
+  passToClient: ["user"],
+  /*{ /if }*/
   // <title>
   title: "My Vike App",
   extends: vikeReact,
+  /*{ @if (it.BATI.has("firebase-auth")) }*/
+  meta: {
+    // Temporary workaround until +client.js is implemented: https://github.com/vikejs/vike/issues/1468
+    firebaseApp: {
+      env: { client: true },
+    },
+  },
+  /*{ /if }*/
 } satisfies Config;

package/dist/boilerplates/@batijs/react/types/pages/+config.d.ts

@@ -3,6 +3,7 @@ import Layout from "../layouts/LayoutDefault";
 declare const _default: {
     Layout: typeof Layout;
     Head: typeof Head;
+    passToClient: string[];
     title: string;
     extends: {
         name: string;
@@ -71,5 +72,12 @@ declare const _default: {
             };
         };
     };
+    meta: {
+        firebaseApp: {
+            env: {
+                client: true;
+            };
+        };
+    };
 };
 export default _default;

package/dist/boilerplates/@batijs/react-firebase-auth/files/pages/login/+Page.tsx

@@ -0,0 +1,52 @@
+import "firebaseui/dist/firebaseui.css"
+import React, { useEffect, useState } from 'react'
+import { startFirebaseUI } from "@batijs/firebase-auth/libs/firebaseUI"
+import * as firebaseui from "firebaseui"
+import { getAuth, type UserCredential } from 'firebase/auth'
+import { reload } from "vike/client/router"
+
+export default Page
+
+function Page() {
+    const [error, setError] = useState("")
+
+    async function sessionLogin(authResult: UserCredential) {
+        const idToken = await authResult.user.getIdToken() || ""
+        try {
+            const response = await fetch("/api/sessionLogin", {
+                method: "POST",
+                body: JSON.stringify({ idToken }),
+                headers: {
+                    "Content-Type": "application/json",
+                },
+            })
+            if (response.ok) {
+                await reload()
+            } else {
+                setError(response.statusText)
+            }
+            await getAuth().signOut()
+        } catch (err) {
+            console.log('error :', err)
+        }
+    }
+    
+    useEffect(() => {
+        const ui = firebaseui.auth.AuthUI.getInstance() || new firebaseui.auth.AuthUI(getAuth())
+        if (!error) {
+            startFirebaseUI(ui, sessionLogin)
+        }
+    }, [error])
+
+    return (
+        <>
+            <div id="firebaseui-auth-container"></div>
+            {error && (
+                <>
+                    <div style={{ color: "red" }}>There is an error occured : {error}</div>
+                    <button onClick={() => setError("")}>Try Again</button>
+                </>
+            )}
+        </>
+    )
+}

package/dist/boilerplates/@batijs/react-firebase-auth/types/pages/login/+Page.d.ts

@@ -0,0 +1,3 @@
+import "firebaseui/dist/firebaseui.css";
+export default Page;
+declare function Page(): import("react/jsx-runtime").JSX.Element;

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

@@ -47,10 +47,10 @@ var require_package = __commonJS({
         "eslint-plugin-solid": "^0.13.1",
         "solid-js": "^1.8.15",
         tailwindcss: "^3.4.1",
-        typescript: "^5.3.3",
+        typescript: "^5.4.2",
         vike: "^0.4.165",
         "vike-solid": "^0.4.2",
-        vite: "^5.1.4",
+        vite: "^5.1.6",
         "vite-plugin-solid": "^2.10.1"
       },
       dependencies: {

package/dist/boilerplates/@batijs/solid/files/pages/+config.ts

@@ -8,6 +8,17 @@ export default {
   Layout,
   Head,
   // <title>
+  /*{ @if (it.BATI.has("firebase-auth")) }*/
+  passToClient: ["user"],
+  /*{ /if }*/
   title: "My Vike App",
   extends: vikeSolid,
+  /*{ @if (it.BATI.has("firebase-auth")) }*/
+  meta: {
+    // Temporary workaround until +client.js is implemented: https://github.com/vikejs/vike/issues/1468
+    firebaseApp: {
+      env: { client: true },
+    },
+  },
+  /*{ /if }*/
 } satisfies Config;

package/dist/boilerplates/@batijs/solid/types/pages/+config.d.ts

@@ -4,7 +4,15 @@ import Layout from "../layouts/LayoutDefault";
 declare const _default: {
     Layout: typeof Layout;
     Head: typeof Head;
+    passToClient: string[];
     title: string;
     extends: typeof vikeSolid;
+    meta: {
+        firebaseApp: {
+            env: {
+                client: true;
+            };
+        };
+    };
 };
 export default _default;

package/dist/boilerplates/@batijs/solid-firebase-auth/files/pages/login/+Page.tsx

@@ -0,0 +1,52 @@
+import "firebaseui/dist/firebaseui.css"
+import { createEffect, createSignal } from "solid-js"
+import { startFirebaseUI } from "@batijs/firebase-auth/libs/firebaseUI"
+import * as firebaseui from "firebaseui"
+import { getAuth, type UserCredential } from 'firebase/auth'
+import { reload } from "vike/client/router"
+
+export default Page
+
+function Page() {
+    const [error, setError] = createSignal("")
+
+    async function sessionLogin(authResult: UserCredential) {
+        const idToken = await authResult.user.getIdToken() || ""
+        try {
+            const response = await fetch("/api/sessionLogin", {
+                method: "POST",
+                body: JSON.stringify({ idToken }),
+                headers: {
+                    "Content-Type": "application/json",
+                },
+            })
+            if (response.ok) {
+                await reload()
+            } else {
+                setError(response.statusText)
+            }
+            await getAuth().signOut()
+        } catch (err) {
+            console.log('error :', err)
+        }
+    }
+
+    createEffect(() => {
+        const ui = firebaseui.auth.AuthUI.getInstance() || new firebaseui.auth.AuthUI(getAuth())
+        if (!error()) {
+            startFirebaseUI(ui, sessionLogin)
+        }
+    })
+
+    return (
+        <>
+            <div id="firebaseui-auth-container" />
+            {error() && (
+                <>
+                    <div style={{ color: "red" }}>There is an error occured : {error()}</div>
+                    <button onClick={() => setError("")}>Try Again</button>
+                </>
+            )}
+        </>
+    )
+}

package/dist/boilerplates/@batijs/solid-firebase-auth/types/pages/login/+Page.d.ts

@@ -0,0 +1,3 @@
+import "firebaseui/dist/firebaseui.css";
+export default Page;
+declare function Page(): import("solid-js").JSX.Element;

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

@@ -44,11 +44,11 @@ var require_package = __commonJS({
         "@batijs/compile": "workspace:*",
         "@types/node": "^18.19.14",
         autoprefixer: "^10.4.18",
-        daisyui: "^4.7.2",
+        daisyui: "^4.7.3",
         postcss: "^8.4.35",
         tailwindcss: "^3.4.1",
         vike: "^0.4.165",
-        vite: "^5.1.4"
+        vite: "^5.1.6"
       },
       dependencies: {
         "@batijs/core": "workspace:*"

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

@@ -45,7 +45,7 @@ var require_package = __commonJS({
         "@types/node": "^18.19.14",
         telefunc: "^0.1.71",
         vike: "^0.4.165",
-        vite: "^5.1.4"
+        vite: "^5.1.6"
       },
       dependencies: {
         "@batijs/core": "workspace:*"

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

@@ -43,10 +43,10 @@ var require_package = __commonJS({
       devDependencies: {
         "@batijs/compile": "workspace:*",
         "@batijs/shared-db": "workspace:*",
-        "@trpc/client": "^10.45.1",
-        "@trpc/server": "^10.45.1",
+        "@trpc/client": "^10.45.2",
+        "@trpc/server": "^10.45.2",
         "@types/node": "^18.19.14",
-        vite: "^5.1.4"
+        vite: "^5.1.6"
       },
       dependencies: {
         "@batijs/core": "workspace:*"

package/dist/boilerplates/@batijs/trpc/types/trpc/client.d.ts

@@ -1,38 +1,72 @@
-export declare const trpc: {
-    demo: {
-        query: import("@trpc/client").Resolver<import("@trpc/server").BuildProcedure<"query", {
-            _config: import("@trpc/server").RootConfig<{
-                ctx: object;
-                meta: object;
-                errorShape: import("@trpc/server").DefaultErrorShape;
-                transformer: import("@trpc/server").DefaultDataTransformer;
-            }>;
-            _ctx_out: object;
-            _input_in: typeof import("@trpc/server").unsetMarker;
-            _input_out: typeof import("@trpc/server").unsetMarker;
-            _output_in: typeof import("@trpc/server").unsetMarker;
-            _output_out: typeof import("@trpc/server").unsetMarker;
-            _meta: object;
-        }, {
-            demo: boolean;
-        }>>;
-    };
-    onNewTodo: {
-        mutate: import("@trpc/client").Resolver<import("@trpc/server").BuildProcedure<"mutation", {
-            _config: import("@trpc/server").RootConfig<{
-                ctx: object;
-                meta: object;
-                errorShape: import("@trpc/server").DefaultErrorShape;
-                transformer: import("@trpc/server").DefaultDataTransformer;
-            }>;
-            _meta: object;
-            _ctx_out: object;
-            _input_in: string;
-            _input_out: string;
-            _output_in: typeof import("@trpc/server").unsetMarker;
-            _output_out: typeof import("@trpc/server").unsetMarker;
-        }, {
-            todoItems: import("@batijs/shared-db/database/todoItems").TodoItem[];
-        }>>;
-    };
-};
+export declare const trpc: import("@trpc/client").inferRouterProxyClient<import("@trpc/server/dist/core/router").CreateRouterInner<import("@trpc/server").RootConfig<{
+    ctx: object;
+    meta: object;
+    errorShape: import("@trpc/server").DefaultErrorShape;
+    transformer: import("@trpc/server").DefaultDataTransformer;
+}>, {
+    demo: import("@trpc/server").BuildProcedure<"query", {
+        _config: import("@trpc/server").RootConfig<{
+            ctx: object;
+            meta: object;
+            errorShape: import("@trpc/server").DefaultErrorShape;
+            transformer: import("@trpc/server").DefaultDataTransformer;
+        }>;
+        _ctx_out: object;
+        _input_in: typeof import("@trpc/server").unsetMarker;
+        _input_out: typeof import("@trpc/server").unsetMarker;
+        _output_in: typeof import("@trpc/server").unsetMarker;
+        _output_out: typeof import("@trpc/server").unsetMarker;
+        _meta: object;
+    }, {
+        demo: boolean;
+    }>;
+    onNewTodo: import("@trpc/server").BuildProcedure<"mutation", {
+        _config: import("@trpc/server").RootConfig<{
+            ctx: object;
+            meta: object;
+            errorShape: import("@trpc/server").DefaultErrorShape;
+            transformer: import("@trpc/server").DefaultDataTransformer;
+        }>;
+        _meta: object;
+        _ctx_out: object;
+        _input_in: string;
+        _input_out: string;
+        _output_in: typeof import("@trpc/server").unsetMarker;
+        _output_out: typeof import("@trpc/server").unsetMarker;
+    }, {
+        todoItems: import("@batijs/shared-db/database/todoItems").TodoItem[];
+    }>;
+}>, {
+    demo: import("@trpc/server").BuildProcedure<"query", {
+        _config: import("@trpc/server").RootConfig<{
+            ctx: object;
+            meta: object;
+            errorShape: import("@trpc/server").DefaultErrorShape;
+            transformer: import("@trpc/server").DefaultDataTransformer;
+        }>;
+        _ctx_out: object;
+        _input_in: typeof import("@trpc/server").unsetMarker;
+        _input_out: typeof import("@trpc/server").unsetMarker;
+        _output_in: typeof import("@trpc/server").unsetMarker;
+        _output_out: typeof import("@trpc/server").unsetMarker;
+        _meta: object;
+    }, {
+        demo: boolean;
+    }>;
+    onNewTodo: import("@trpc/server").BuildProcedure<"mutation", {
+        _config: import("@trpc/server").RootConfig<{
+            ctx: object;
+            meta: object;
+            errorShape: import("@trpc/server").DefaultErrorShape;
+            transformer: import("@trpc/server").DefaultDataTransformer;
+        }>;
+        _meta: object;
+        _ctx_out: object;
+        _input_in: string;
+        _input_out: string;
+        _output_in: typeof import("@trpc/server").unsetMarker;
+        _output_out: typeof import("@trpc/server").unsetMarker;
+    }, {
+        todoItems: import("@batijs/shared-db/database/todoItems").TodoItem[];
+    }>;
+}>;

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

@@ -45,7 +45,7 @@ var require_package = __commonJS({
         "@types/node": "^18.19.14",
         "@vite-plugin-vercel/vike": "^4.0.1",
         vike: "^0.4.165",
-        vite: "^5.1.4",
+        vite: "^5.1.6",
         "vite-plugin-vercel": "^4.0.1"
       },
       dependencies: {

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

@@ -49,11 +49,11 @@ var require_package = __commonJS({
         "cross-fetch": "^4.0.0",
         "eslint-plugin-vue": "^9.22.0",
         tailwindcss: "^3.4.1",
-        typescript: "^5.3.3",
+        typescript: "^5.4.2",
         "unplugin-vue-markdown": "^0.26.0",
         vike: "^0.4.165",
         "vike-vue": "^0.6.3",
-        vite: "^5.1.4",
+        vite: "^5.1.6",
         vue: "^3.4.21",
         "vue-gtag": "^2.0.1"
       },

package/dist/boilerplates/@batijs/vue/files/pages/+config.ts

@@ -8,6 +8,17 @@ export default {
   Layout,
   Head,
   // <title>
+  /*{ @if (it.BATI.has("firebase-auth")) }*/
+  passToClient: ["user"],
+  /*{ /if }*/
   title: "My Vike App",
   extends: vikeVue,
+  /*{ @if (it.BATI.has("firebase-auth")) }*/
+  meta: {
+    // Temporary workaround until +client.js is implemented: https://github.com/vikejs/vike/issues/1468
+    firebaseApp: {
+      env: { client: true },
+    },
+  },
+  /*{ /if }*/
 } satisfies Config;

package/dist/boilerplates/@batijs/vue/types/pages/+config.d.ts

@@ -3,7 +3,15 @@ import Head from "../layouts/HeadDefault.vue";
 declare const _default: {
     Layout: typeof Head;
     Head: typeof Head;
+    passToClient: string[];
     title: string;
     extends: typeof vikeVue;
+    meta: {
+        firebaseApp: {
+            env: {
+                client: true;
+            };
+        };
+    };
 };
 export default _default;

package/dist/boilerplates/@batijs/vue-firebase-auth/files/pages/login/+Page.vue

@@ -0,0 +1,51 @@
+<template>
+  <div id="firebaseui-auth-container"></div>
+  <div v-if="error">
+    <div style="color:red">There is an error occured : {{ error }}</div>
+    <button @click="clearError">Try Again</button>
+  </div>
+</template>
+
+<script setup lang="ts">
+import "firebaseui/dist/firebaseui.css"
+import { ref, onMounted, onUpdated } from "vue";
+import * as firebaseui from "firebaseui"
+import { getAuth, type UserCredential } from 'firebase/auth'
+import { reload } from "vike/client/router"
+import { startFirebaseUI } from "@batijs/firebase-auth/libs/firebaseUI"
+
+const error = ref("")
+const clearError = () => error.value = ""
+const ui = firebaseui.auth.AuthUI.getInstance() || new firebaseui.auth.AuthUI(getAuth())
+
+async function sessionLogin(authResult: UserCredential) {
+    const idToken = await authResult.user.getIdToken() || ""
+    try {
+        const response = await fetch("/api/sessionLogin", {
+            method: "POST",
+            body: JSON.stringify({ idToken }),
+            headers: {
+                "Content-Type": "application/json",
+            },
+        })
+        if (response.ok) {
+            await reload()
+        } else {
+            error.value = response.statusText
+        }
+        await getAuth().signOut()
+    } catch (err) {
+        console.log('error :', err)
+    }
+}
+
+onMounted(() => {
+    startFirebaseUI(ui, sessionLogin)
+})
+
+onUpdated(() => {
+    if (!error.value) {
+        startFirebaseUI(ui, sessionLogin)
+    }
+})
+</script>