stackkit 0.3.4 → 0.3.5

package/modules/auth/better-auth/files/express/modules/auth/auth.route.ts

@@ -12,10 +12,10 @@ const router = Router()
 
 router.post("/register", authController.registerUser)
 router.post("/login", authController.loginUser)
-router.get("/me", authorize(Role.ADMIN, Role.USER, Role.SUPER_ADMIN), authController.getMe)
+router.get("/me", authorize(Role.ADMIN, Role.USER), authController.getMe)
 router.post("/refresh-token", authController.getNewToken)
-router.post("/change-password", authorize(Role.ADMIN, Role.USER, Role.SUPER_ADMIN), authController.changePassword)
-router.post("/logout", authorize(Role.ADMIN, Role.USER, Role.SUPER_ADMIN), authController.logoutUser)
+router.post("/change-password", authorize(Role.ADMIN, Role.USER), authController.changePassword)
+router.post("/logout", authorize(Role.ADMIN, Role.USER), authController.logoutUser)
 router.post("/verify-email", authController.verifyEmail)
 router.post("/forget-password", authController.forgetPassword)
 router.post("/reset-password", authController.resetPassword)

package/modules/auth/better-auth/files/express/modules/auth/auth.service.ts

@@ -24,6 +24,18 @@ import {
 const registerUser = async (payload: IRegisterUserPayload) => {
     const { name, email, password } = payload;
 
+    if (email) {
+      const existingUser = await prisma.user.findUnique({
+        where: {
+          email: email,
+        },
+      });
+
+      if (existingUser) {
+        throw new AppError(status.CONFLICT, "Email already exists");
+      }
+    }
+
     const data = await auth.api.signUpEmail({
       body: {
         name,

package/modules/auth/better-auth/files/express/templates/google-redirect.ejs

@@ -19,6 +19,6 @@
     <script>
         document.getElementById("social-login-form")?.submit();
     </script>
-    </body>
+</body>
 
 </html>

package/modules/auth/better-auth/files/nextjs/lib/auth/auth-guards.ts

@@ -10,16 +10,6 @@ export async function getSession() {
   return session;
 }
 
-export async function requireSuperAdmin() {
-  const session = await getSession();
-
-  if (!session || session.user.role !== "SUPER_ADMIN") {
-    redirect("/login");
-  }
-
-  return session.user;
-}
-
 export async function requireAdmin() {
   const session = await getSession();
 

package/modules/auth/better-auth/files/nextjs/proxy.ts

@@ -1,23 +1,45 @@
-import { NextResponse, type NextRequest } from "next/server";
+import { NextRequest, NextResponse } from "next/server";
 
-function isAuthenticated(req: NextRequest) {
-  const token = req.cookies.get("better-auth.session_token")?.value;
+export async function proxy(request: NextRequest) {
+  const { pathname, search } = request.nextUrl;
 
-  return Boolean(token);
-}
+  let isAuthenticated = false;
+  let isAdmin = false;
+
+  // Mock user data for demonstration purposes replace this with actual authentication session logic
+  const data = {
+    name: "John Doe",
+    email: "john.doe@example.com",
+    role: "ADMIN",
+  };
+
+  if (data) {
+    isAuthenticated = true;
+    const role = data?.role;
+    isAdmin = role === "ADMIN";
+  }
 
-export function proxy(req: NextRequest) {
-  const { pathname, search } = req.nextUrl;
-  const authed = isAuthenticated(req);
+  if (
+    pathname === "/login" ||
+    pathname === "/register" ||
+    pathname === "/signup"
+  ) {
+    if (isAuthenticated) {
+      if (isAdmin) {
+        return NextResponse.redirect(new URL("/dashboard/admin", request.url));
+      }
 
-  if (pathname === "/login" || pathname === "/signup") {
-    if (authed) return NextResponse.redirect(new URL("/dashboard", req.url));
+      return NextResponse.redirect(new URL("/dashboard", request.url));
+    }
     return NextResponse.next();
   }
 
-  if (pathname.startsWith("/dashboard") && !authed) {
+  if (pathname.startsWith("/dashboard") && !isAuthenticated) {
     const next = encodeURIComponent(pathname + (search || ""));
-    return NextResponse.redirect(new URL(`/login?next=${next}`, req.url));
+    const res = NextResponse.redirect(
+      new URL(`/login?next=${next}`, request.url),
+    );
+    return res;
   }
 
   return NextResponse.next();
@@ -28,6 +50,7 @@ export const config = {
     "/((?!_next|[^?]*\\.(?:html?|css|js(?!on)|jpe?g|webp|png|gif|svg|ttf|woff2?|ico|csv|docx?|xlsx?|zip|webmanifest)).*)",
     "/(api|trpc)(.*)",
     "/login",
+    "/register",
     "/signup",
     "/dashboard/:path*",
   ],

package/modules/auth/better-auth/files/shared/config/env.ts

@@ -8,6 +8,7 @@ dotenv.config({ path: path.join(process.cwd(), ".env") });
 {{/if}}
 
 interface EnvConfig {
+  APP_NAME?: string;
   APP_URL: string;
   {{#if framework == "nextjs"}}
   API_URL: string;
@@ -35,8 +36,6 @@ interface EnvConfig {
   ACCESS_TOKEN_EXPIRES_IN: string;
   REFRESH_TOKEN_SECRET: string;
   REFRESH_TOKEN_EXPIRES_IN: string;
-  SUPER_ADMIN_EMAIL: string;
-  SUPER_ADMIN_PASSWORD: string;
   {{/if}}
 }
 
@@ -67,8 +66,6 @@ const loadEnvVars = (): EnvConfig => {
     "ACCESS_TOKEN_EXPIRES_IN",
     "REFRESH_TOKEN_SECRET",
     "REFRESH_TOKEN_EXPIRES_IN",
-    "SUPER_ADMIN_EMAIL",
-    "SUPER_ADMIN_PASSWORD",
     {{/if}}
   ];
 
@@ -88,9 +85,10 @@ const loadEnvVars = (): EnvConfig => {
   });
 
   return {
-    APP_URL: process.env.APP_URL as string,
     {{#if framework == "nextjs"}}
-    API_URL: process.env.API_URL as string,
+    APP_NAME: process.env.NEXT_PUBLIC_APP_NAME ?? "Your App",
+    APP_URL: process.env.NEXT_PUBLIC_APP_URL as string,
+    API_URL: process.env.NEXT_PUBLIC_API_URL as string,
     {{/if}}
     DATABASE_URL: process.env.DATABASE_URL as string,
     FRONTEND_URL: process.env.FRONTEND_URL as string,
@@ -107,9 +105,11 @@ const loadEnvVars = (): EnvConfig => {
       SMTP_FROM: process.env.EMAIL_SENDER_SMTP_FROM as string,
     },
     {{#if framework == "express" }}
+    APP_NAME: process.env.APP_NAME ?? "Your App",
+    APP_URL: process.env.APP_URL as string,
     NODE_ENV: process.env.NODE_ENV as string,
     PORT: process.env.PORT as string,
-        BETTER_AUTH_SESSION_TOKEN_EXPIRES_IN: process.env
+    BETTER_AUTH_SESSION_TOKEN_EXPIRES_IN: process.env
       .BETTER_AUTH_SESSION_TOKEN_EXPIRES_IN as string,
     BETTER_AUTH_SESSION_TOKEN_UPDATE_AGE: process.env
       .BETTER_AUTH_SESSION_TOKEN_UPDATE_AGE as string,
@@ -117,8 +117,6 @@ const loadEnvVars = (): EnvConfig => {
     ACCESS_TOKEN_EXPIRES_IN: process.env.ACCESS_TOKEN_EXPIRES_IN as string,
     REFRESH_TOKEN_SECRET: process.env.REFRESH_TOKEN_SECRET as string,
     REFRESH_TOKEN_EXPIRES_IN: process.env.REFRESH_TOKEN_EXPIRES_IN as string,
-    SUPER_ADMIN_EMAIL: process.env.SUPER_ADMIN_EMAIL as string,
-    SUPER_ADMIN_PASSWORD: process.env.SUPER_ADMIN_PASSWORD as string,
     {{/if}}
   };
 };

package/modules/auth/better-auth/files/shared/lib/auth.ts

@@ -133,20 +133,14 @@ export const auth = betterAuth({
             return;
           }
 
-          if (user && user.role === Role.SUPER_ADMIN) {
-            console.log(
-              `User with email ${email} is a super admin. Skipping sending verification OTP.`,
-            );
-            return;
-          }
-
           if (user && !user.emailVerified) {
             sendEmail({
               to: email,
               subject: "Verify your email",
               templateName: "otp",
               templateData: {
-                name: user.name,
+                userName: user.name,
+                appName: envVars.APP_NAME as string,
                 otp,
               },
             });
@@ -169,14 +163,15 @@ export const auth = betterAuth({
               subject: "Password Reset OTP",
               templateName: "otp",
               templateData: {
-                name: user.name,
+                userName: user.name,
+                appName: envVars.APP_NAME as string,
                 otp,
               },
             });
           }
         }
       },
-      expiresIn: 2 * 60, // 2 minutes in seconds
+      expiresIn: 5 * 60, // 5 minutes in seconds
       otpLength: 6,
     }),
   ],

package/modules/auth/better-auth/files/shared/mongoose/auth/constants.ts

@@ -1,7 +1,6 @@
 export const Role = {
   ADMIN: "ADMIN",
   USER: "USER",
-  SUPER_ADMIN: "SUPER_ADMIN",
 } as const;
 
 export const UserStatus = {

package/modules/auth/better-auth/files/shared/prisma/enums.prisma

@@ -1,5 +1,4 @@
 enum Role {
-    SUPER_ADMIN
     ADMIN
     USER
 }

package/modules/auth/better-auth/files/shared/utils/email.ts

@@ -21,6 +21,8 @@ const transporter = nodemailer.createTransport({
   port: Number(envVars.EMAIL_SENDER.SMTP_PORT),
 });
 
+transporter.verify().catch(() => null);
+
 interface SendEmailOptions {
   to: string;
   subject: string;
@@ -42,12 +44,27 @@ export const sendEmail = async ({
 }: SendEmailOptions) => {
   try {
     {{#if framework == "express"}}
-        const templatePath = path.resolve(
+     const templatePath = path.resolve(
       process.cwd(),
       `src/templates/${templateName}.ejs`,
     );
 
-    const html = await ejs.renderFile(templatePath, templateData);
+    const td = templateData as Record<string, unknown>;
+    const expiresVal =
+      td && Object.prototype.hasOwnProperty.call(td, "expiresInMinutes")
+        ? td["expiresInMinutes"]
+        : undefined;
+    const expiresInMinutes = typeof expiresVal === "number" ? expiresVal : 5;
+
+    const templateDataWithDefaults: Record<string, unknown> = {
+      appName: envVars.APP_NAME ?? "Your App",
+      supportEmail: envVars.SUPER_ADMIN_EMAIL ?? "support@example.com",
+      year: new Date().getFullYear(),
+      expiresInMinutes,
+      ...td,
+    };
+
+    const html = await ejs.renderFile(templatePath, templateDataWithDefaults);
     {{/if}}
     {{#if framework == "nextjs"}}
     const html = renderEmailTemplate(templateName, templateData);

package/modules/auth/better-auth/generator.json

@@ -123,6 +123,7 @@
       "type": "add-env",
       "condition": { "framework": "express" },
       "envVars": {
+        "APP_NAME": "Your App",
         "BETTER_AUTH_URL": "http://localhost:3000",
         "BETTER_AUTH_SECRET": "your_better_auth_secret",
         "BETTER_AUTH_SESSION_TOKEN_EXPIRES_IN": "1d",
@@ -138,9 +139,7 @@
         "EMAIL_SENDER_SMTP_PASS": "your_email_password",
         "EMAIL_SENDER_SMTP_HOST": "smtp.gmail.com",
         "EMAIL_SENDER_SMTP_PORT": "465",
-        "EMAIL_SENDER_SMTP_FROM": "your_email@gmail.com",
-        "SUPER_ADMIN_EMAIL": "your_email@gmail.com",
-        "SUPER_ADMIN_PASSWORD": "your_super_admin_password"
+        "EMAIL_SENDER_SMTP_FROM": "your_email@gmail.com"
       }
     },
     {
@@ -201,6 +200,7 @@
       "type": "add-env",
       "condition": { "framework": "nextjs" },
       "envVars": {
+        "NEXT_PUBLIC_APP_NAME": "Your App",
         "NEXT_PUBLIC_APP_URL": "http://localhost:3000",
         "NEXT_PUBLIC_FRONTEND_URL": "http://localhost:3000",
         "NEXT_PUBLIC_BETTER_AUTH_URL": "http://localhost:3000",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stackkit",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Production-ready CLI to create and extend JavaScript or TypeScript apps with modular stacks.",
   "main": "dist/index.js",
   "bin": {

package/templates/express/node_modules/.bin/acorn

@@ -1,17 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/acorn@8.15.0/node_modules/acorn/bin/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/acorn@8.15.0/node_modules/acorn/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/acorn@8.15.0/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/acorn@8.15.0/node_modules/acorn/bin/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/acorn@8.15.0/node_modules/acorn/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/acorn@8.15.0/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../node_modules/.pnpm/acorn@8.15.0/node_modules/acorn/bin/acorn" "$@"
-else
-  exec node  "$basedir/../../../../node_modules/.pnpm/acorn@8.15.0/node_modules/acorn/bin/acorn" "$@"
-fi

package/templates/express/node_modules/.bin/eslint

@@ -1,17 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/eslint@9.39.2/node_modules/eslint/bin/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/eslint@9.39.2/node_modules/eslint/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/eslint@9.39.2/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/eslint@9.39.2/node_modules/eslint/bin/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/eslint@9.39.2/node_modules/eslint/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/eslint@9.39.2/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../node_modules/.pnpm/eslint@9.39.2/node_modules/eslint/bin/eslint.js" "$@"
-else
-  exec node  "$basedir/../../../../node_modules/.pnpm/eslint@9.39.2/node_modules/eslint/bin/eslint.js" "$@"
-fi

package/templates/express/node_modules/.bin/tsc

@@ -1,17 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/typescript@5.9.3/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/typescript@5.9.3/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/tsc" "$@"
-else
-  exec node  "$basedir/../../../../node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/tsc" "$@"
-fi

package/templates/express/node_modules/.bin/tsserver

@@ -1,17 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/typescript@5.9.3/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/typescript@5.9.3/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/tsserver" "$@"
-else
-  exec node  "$basedir/../../../../node_modules/.pnpm/typescript@5.9.3/node_modules/typescript/bin/tsserver" "$@"
-fi

package/templates/express/node_modules/.bin/tsx

@@ -1,17 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/tsx@4.21.0/node_modules/tsx/dist/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/tsx@4.21.0/node_modules/tsx/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/tsx@4.21.0/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/tsx@4.21.0/node_modules/tsx/dist/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/tsx@4.21.0/node_modules/tsx/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/tsx@4.21.0/node_modules:/home/tariqul/Projects/open-source/stackkit/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../../../../node_modules/.pnpm/tsx@4.21.0/node_modules/tsx/dist/cli.mjs" "$@"
-else
-  exec node  "$basedir/../../../../node_modules/.pnpm/tsx@4.21.0/node_modules/tsx/dist/cli.mjs" "$@"
-fi

package/templates/nextjs/next-env.d.ts

@@ -1,6 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.