stackkit 0.2.9 → 0.3.0

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

@@ -1,49 +1,49 @@
-import { Role, UserStatus } from "@prisma/client";
 import { betterAuth } from "better-auth";
 import { bearer, emailOTP } from "better-auth/plugins";
 {{#if combo == "prisma:express"}}
+import { Role, UserStatus } from "@prisma/client";
 import { envVars } from "../config/env";
 import { sendEmail } from "../shared/utils/email";
 import { prisma } from "../database/prisma";
 import { prismaAdapter } from "better-auth/adapters/prisma";
 {{/if}}
-
 {{#if combo == "prisma:nextjs"}}
+import { Role, UserStatus } from "@prisma/client";
 import { sendEmail } from "../service/email/email-service";
 import { prisma } from "../database/prisma";
 import { envVars } from "@/lib/env";
 import { prismaAdapter } from "better-auth/adapters/prisma";
 {{/if}}
-
 {{#if combo == "mongoose:express"}}
 import { envVars } from "../config/env";
-import { sendEmail } from "../../shared/email/email-service";
-import { mongoose } from "../../database/mongoose";
+import { Role, UserStatus } from "../modules/auth/auth.constants";
+import { sendEmail } from "../shared/utils/email";
+import { getMongoClient, getMongoDb, mongoose } from "../database/mongoose";
 import { mongodbAdapter } from "better-auth/adapters/mongodb";
 {{/if}}
-
 {{#if combo == "mongoose:nextjs"}}
 import { sendEmail } from "../service/email/email-service";
-import { mongoose } from "../database/mongoose";
+import { getMongoClient, getMongoDb, mongoose } from "../database/mongoose";
+import { Role, UserStatus } from "@/lib/auth/auth-constants";
 import { envVars } from "@/lib/env";
 import { mongodbAdapter } from "better-auth/adapters/mongodb";
 {{/if}}
 
 {{#if database == "mongoose"}}
-export async function initAuth() {
-const mongooseInstance = await mongoose();
-const client = mongooseInstance.connection.getClient();
-const db = client.db();
+await mongoose();
+const client = getMongoClient();
+const db = getMongoDb();
+const usersCollection = db.collection("user");
 {{/if}}
 
-{{#if database == "mongoose"}}return{{else}}export const auth = {{/if}} betterAuth({
+export const auth = betterAuth({
 {{#if database == "prisma"}}
   database: prismaAdapter(prisma, {
     provider: "{{prismaProvider}}",
   }),
 {{/if}}
 {{#if database == "mongoose"}}
-  database: mongodbAdapter(db, { client }),
+  database: mongodbAdapter(db, { client, transaction: false }),
 {{/if}}
   baseURL: envVars.BETTER_AUTH_URL,
   secret: envVars.BETTER_AUTH_SECRET,
@@ -112,11 +112,16 @@ const db = client.db();
       overrideDefaultEmailVerification: true,
       async sendVerificationOTP({ email, otp, type }) {
         if (type === "email-verification") {
+          {{#if database == "prisma"}}
           const user = await prisma.user.findUnique({
             where: {
               email,
             },
           });
+          {{/if}}
+          {{#if database == "mongoose"}}
+          const user = await usersCollection.findOne({ email });
+          {{/if}}
 
           if (!user) {
             console.error(
@@ -144,11 +149,16 @@ const db = client.db();
             });
           }
         } else if (type === "forget-password") {
+          {{#if database == "prisma"}}
           const user = await prisma.user.findUnique({
             where: {
               email,
             },
           });
+          {{/if}}
+          {{#if database == "mongoose"}}
+          const user = await usersCollection.findOne({ email });
+          {{/if}}
 
           if (user) {
             sendEmail({
@@ -179,7 +189,6 @@ const db = client.db();
     signIn: `${envVars.BETTER_AUTH_URL}/api/v1/auth/google/success`,
   },
   advanced: {
-    // disableCSRFCheck: true,
     useSecureCookies: false,
     cookies: {
       state: {
@@ -200,14 +209,4 @@ const db = client.db();
       },
     },
   },
- })
-{{#if database == "mongoose"}}
-};
-
-export let auth: ReturnType<typeof betterAuth> | undefined = undefined;
-
-export async function setupAuth() {
-  auth = await initAuth();
-  return auth;
-}
-{{/if}}
+});

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

@@ -0,0 +1,11 @@
+export const Role = {
+  ADMIN: "ADMIN",
+  USER: "USER",
+  SUPER_ADMIN: "SUPER_ADMIN",
+} as const;
+
+export const UserStatus = {
+  ACTIVE: "ACTIVE",
+  BLOCKED: "BLOCKED",
+  DELETED: "DELETED",
+} as const;

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

@@ -0,0 +1,51 @@
+import status from "http-status";
+import { getMongoDb, mongoose } from "../../database/mongoose";
+import { AppError } from "../../shared/errors/app-error";
+
+export type AuthUser = {
+  id: string;
+  role: string;
+  name: string;
+  email: string;
+  status?: string;
+  isDeleted?: boolean;
+  emailVerified?: boolean;
+  needPasswordChange?: boolean;
+  deletedAt?: Date | null;
+};
+
+export type AuthUserDocument = AuthUser & {
+  createdAt?: Date;
+  updatedAt?: Date;
+};
+
+export type AuthSessionDocument = {
+  token: string;
+  userId: string;
+  createdAt?: Date;
+  updatedAt?: Date;
+  expiresAt?: Date;
+};
+
+export const getAuthCollections = async () => {
+  await mongoose();
+
+  try {
+    const db = getMongoDb();
+
+    return {
+      users: db.collection<AuthUserDocument>("user"),
+      sessions: db.collection<AuthSessionDocument>("session"),
+    };
+  } catch {
+    throw new AppError(
+      status.INTERNAL_SERVER_ERROR,
+      "Auth database is not initialized",
+    );
+  }
+};
+
+export const deleteAuthUserById = async (id: string) => {
+  const { users } = await getAuthCollections();
+  await users.deleteOne({ id });
+};

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

@@ -7,7 +7,6 @@ import { envVars } from "../../config/env";
 import { AppError } from "../errors/app-error";
 {{/if}}
 {{#if framework == "nextjs"}}
-import nodemailer from "nodemailer";
 import { renderEmailTemplate } from "../email/otp-template";
 import { envVars } from "../env";
 {{/if}}

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

@@ -27,6 +27,18 @@
       "destination": "src/modules/auth/*",
       "condition": { "framework": "express" }
     },
+    {
+      "type": "create-file",
+      "source": "shared/mongoose/auth/helper.ts",
+      "destination": "src/modules/auth/auth.helper.ts",
+      "condition": { "framework": "express", "database": "mongoose" }
+    },
+    {
+      "type": "create-file",
+      "source": "shared/mongoose/auth/constants.ts",
+      "destination": "src/modules/auth/auth.constants.ts",
+      "condition": { "framework": "express", "database": "mongoose" }
+    },
     {
       "type": "create-file",
       "source": "express/middlewares/authorize.ts",
@@ -67,7 +79,7 @@
         {
           "type": "add-code",
           "after": "// API routes",
-          "code": ["app.use(\"/api/auth\", toNodeHandler(auth));"]
+          "code": ["app.use(\"/api/auth\", (req, res) => {", "  return toNodeHandler(auth)(req, res);", "});"]
         },
         {
           "type": "add-code",
@@ -95,22 +107,6 @@
         }
       ]
     },
-    {
-      "type": "patch-file",
-      "destination": "src/server.ts",
-      "condition": { "framework": "express", "database": "mongoose" },
-      "operations": [
-        {
-          "type": "add-import",
-          "imports": ["import { setupAuth } from \"./modules/auth/auth\";"]
-        },
-        {
-          "type": "add-code",
-          "before": "app.listen(envVars.PORT, () => {",
-          "code": "await setupAuth();"
-        }
-      ]
-    },
     {
       "type": "add-dependency",
       "condition": { "framework": "express" },
@@ -127,7 +123,7 @@
       "type": "add-env",
       "condition": { "framework": "express" },
       "envVars": {
-        "BETTER_AUTH_URL": "http://localhost:3000/api/auth",
+        "BETTER_AUTH_URL": "http://localhost:3000",
         "BETTER_AUTH_SECRET": "your_better_auth_secret",
         "BETTER_AUTH_SESSION_TOKEN_EXPIRES_IN": "1d",
         "BETTER_AUTH_SESSION_TOKEN_UPDATE_AGE": "1d",
@@ -135,6 +131,8 @@
         "ACCESS_TOKEN_EXPIRES_IN": "1d",
         "REFRESH_TOKEN_SECRET": "your_refresh_token_secret",
         "REFRESH_TOKEN_EXPIRES_IN": "7d",
+        "GOOGLE_CLIENT_ID": "your_google_client_id",
+        "GOOGLE_CLIENT_SECRET": "your_google_client_secret",
         "GOOGLE_CALLBACK_URL": "http://localhost:5000/api/auth/callback/google",
         "EMAIL_SENDER_SMTP_USER": "your_email@gmail.com",
         "EMAIL_SENDER_SMTP_PASS": "your_email_password",
@@ -173,7 +171,13 @@
       "type": "create-file",
       "source": "shared/lib/auth-client.ts",
       "destination": "lib/auth/auth-client.ts",
-      "condition": { "framework": ["nextjs"] }
+      "condition": { "framework": "nextjs" }
+    },
+    {
+      "type": "create-file",
+      "source": "shared/mongoose/auth/constants.ts",
+      "destination": "lib/auth/auth-constants.ts",
+      "condition": { "framework": "nextjs" }
     },
     {
       "type": "create-file",
@@ -199,7 +203,7 @@
       "envVars": {
         "NEXT_PUBLIC_APP_URL": "http://localhost:3000",
         "NEXT_PUBLIC_FRONTEND_URL": "http://localhost:3000",
-        "NEXT_PUBLIC_BETTER_AUTH_URL": "http://localhost:3000/api/auth",
+        "NEXT_PUBLIC_BETTER_AUTH_URL": "http://localhost:3000",
         "BETTER_AUTH_SECRET": "your_better_auth_secret",
         "GOOGLE_CLIENT_ID": "your_google_client_id",
         "GOOGLE_CLIENT_SECRET": "your_google_client_secret",

package/modules/database/mongoose/files/lib/mongoose.ts

@@ -1,4 +1,5 @@
 import mongoose from "mongoose";
+import { envVars } from "../config/env";
 
 type MongooseCache = {
   conn: typeof mongoose | null;
@@ -24,14 +25,13 @@ async function dbConnect(): Promise<typeof mongoose> {
     return cached.conn;
   }
 
-  const uri = process.env.DATABASE_URL as string;
+  const uri = envVars.DATABASE_URL;
 
   if (!cached.promise) {
     const opts = {
       bufferCommands: false,
       connectTimeoutMS: 10000,
       serverSelectionTimeoutMS: 10000,
-      // serverApi removed: not needed for mongoose-only connection
     };
 
     cached.promise = mongoose
@@ -60,4 +60,29 @@ async function dbConnect(): Promise<typeof mongoose> {
   return cached.conn;
 }
 
-export { dbConnect as mongoose, dbConnect as connectMongoose };
+const getMongoClient = () => {
+  if (!mongoose.connection.readyState) {
+    throw new Error("MongoDB is not connected. Call mongoose() first.");
+  }
+
+  return mongoose.connection.getClient();
+};
+
+const getMongoDb = () => {
+  const db = mongoose.connection.db;
+
+  if (!db) {
+    throw new Error("MongoDB is not connected. Call mongoose() first.");
+  }
+
+  return db;
+};
+
+export {
+  dbConnect as connectMongoose,
+  getMongoClient,
+  getMongoDb,
+  dbConnect as mongoose,
+  dbConnect,
+};
+

package/modules/database/mongoose/generator.json

@@ -52,7 +52,7 @@
     {
       "type": "add-env",
       "envVars": {
-        "DATABASE_URL": "mongodb://localhost:27017/database_name"
+        "DATABASE_URL": "mongodb://username:password@localhost:27017/database_name?authSource=admin"
       }
     }
   ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stackkit",
-  "version": "0.2.9",
+  "version": "0.3.0",
   "description": "Production-ready CLI to create and extend JavaScript or TypeScript apps with modular stacks.",
   "main": "dist/index.js",
   "bin": {
@@ -80,4 +80,4 @@
     "@types/validate-npm-package-name": "^4.0.2",
     "typescript": "^5.3.3"
   }
-}
+}

package/templates/express/env.example

@@ -1,3 +1,4 @@
 PORT=5000
 NODE_ENV=development
+APP_URL=http://localhost:5000
 FRONTEND_URL=http://localhost:3000

package/templates/express/src/config/env.ts

@@ -8,11 +8,12 @@ dotenv.config({ path: path.join(process.cwd(), ".env") });
 interface EnvConfig {
   NODE_ENV: string;
   PORT: string;
-  FRONTEND_URL?: string;
+  APP_URL: string;
+  FRONTEND_URL: string;
 }
 
 const loadEnvVars = (): EnvConfig => {
-  const requiredEnvVars = ["NODE_ENV", "PORT", "FRONTEND_URL"];
+  const requiredEnvVars = ["NODE_ENV", "PORT", "APP_URL", "FRONTEND_URL"];
 
   requiredEnvVars.forEach((varName) => {
     if (!process.env[varName]) {
@@ -26,6 +27,7 @@ const loadEnvVars = (): EnvConfig => {
   return {
     NODE_ENV: process.env.NODE_ENV as string,
     PORT: process.env.PORT as string,
+    APP_URL: process.env.APP_URL as string,
     FRONTEND_URL: process.env.FRONTEND_URL as string,
   };
 };