nestcraftx 0.2.5 → 0.3.0

package/utils/setups/setupAuth.js

@@ -6,20 +6,23 @@ const { generateDto } = require("../utils");
 
 async function setupAuth(inputs) {
   logInfo(
-    "🚀 Déploiement de l'architecture Auth Ultime (Mappers, DTOs, Multi-ORM)..."
+    "🚀 Déploiement de l'architecture Auth Ultime (Mappers, DTOs, Multi-ORM)...",
   );
 
   const { dbConfig, useSwagger, mode = "full" } = inputs;
   const isFull = mode === "full";
 
   // 1. INSTALLATION DES DÉPENDANCES
+  const pkgManager = inputs.packageManager || "npm";
+  const installCmd = pkgManager === "yarn" || pkgManager === "pnpm" ? `${pkgManager} add` : "npm install";
+
   await runCommand(
-    `npm install @nestjs/jwt @nestjs/passport passport passport-jwt bcrypt uuid`,
-    "Erreur install deps auth"
+    `${installCmd} @nestjs/jwt @nestjs/passport passport passport-jwt bcrypt uuid`,
+    "Erreur install deps auth",
   );
   await runCommand(
-    `npm install -D @types/passport-jwt @types/bcrypt @types/uuid`,
-    "Erreur install dev-deps auth"
+    `${installCmd} -D @types/passport-jwt @types/bcrypt @types/uuid`,
+    "Erreur install dev-deps auth",
   );
 
   // 2. DÉFINITION DES CHEMINS (CLEAN ARCHITECTURE)
@@ -75,6 +78,8 @@ export class Session {
 import { Session } from '${paths.entities}/session.entity';
 import { CreateSessionPersistenceDto } from '${paths.appDtos}/create-session.dto';
 
+export const ISessionRepositoryName = 'ISessionRepository';
+
 export interface ISessionRepository {
   save(dto: CreateSessionPersistenceDto): Promise<Session>;
   findByToken(token: string): Promise<Session | null>;
@@ -137,9 +142,9 @@ export interface CreateSessionPersistenceDto {
   // Définition dynamique des types et injections
   const repoType = isFull ? "ISessionRepository" : "SessionRepository";
   const repoImport = isFull
-    ? `import { ISessionRepository } from '${paths.interfaces}/session.repository.interface';`
+    ? `import { ISessionRepositoryName, type ISessionRepository } from '${paths.interfaces}/session.repository.interface';`
     : `import { SessionRepository } from '${paths.persistence}/session.repository';`;
-  const injectDecorator = isFull ? `@Inject('ISessionRepository') ` : "";
+  const injectDecorator = isFull ? `@Inject(ISessionRepositoryName) ` : "";
 
   await createFile({
     path: `${paths.services}/session.service.ts`,
@@ -247,11 +252,12 @@ import { SendOtpDto } from '${paths.appDtos}/sendOtp.dto';
 import { VerifyOtpDto } from '${paths.appDtos}/verifyOtp.dto';
 import { ForgotPasswordDto } from '${paths.appDtos}/forgotPassword.dto';
 import { ResetPasswordDto } from '${paths.appDtos}/resetPassword.dto';
+${enumImport}
  ${
    mode === "light"
      ? `import { UserRepository } from '${userRepoPath}';
   import { CreateUserDto } from '${userDtoPath}/user.dto';`
-     : `import { IUserRepository } from '${userRepoPath}';
+     : `import type { IUserRepository } from '${userRepoPath}';
   import { CreateUserDto } from '${userDtoPath}/user.dto';`
  }
 
@@ -329,27 +335,32 @@ export class AuthService {
   async refreshToken(token: RefreshTokenDto) {
     const session = await this.sessionService.validate(token.refreshToken);
     if (!session) throw new UnauthorizedException('Session expired or invalid');
-    const payload = this.jwtService.decode(token.refreshToken) as any;
+    const payload: {
+      sub: string;
+      email: string;
+      sid: string;
+      role: Role;
+    } = this.jwtService.decode(token.refreshToken) as any;
     return { accessToken: this.jwtService.sign({ sub: payload.sub, email: payload.email }, { expiresIn: '15m' }) };
   }
 
   // 📲 Send OTP
-   async sendOtp(dto: SendOtpDto) {
+  sendOtp(dto: SendOtpDto) {
     const otp = Math.floor(100000 + Math.random() * 900000).toString();
     this.otps.set(dto.email, otp);
     console.log(\`[OTP] for \${dto.email} is \${otp}\`);
     return { message: 'OTP sent' };
-   }
+  }
 
-   // Verify OTP
-   async verifyOtp(dto: VerifyOtpDto) {
+  // Verify OTP
+  verifyOtp(dto: VerifyOtpDto) {
     const valid = this.otps.get(dto.email);
     if (valid === dto.otp) {
      this.otps.delete(dto.email);
      return { message: 'OTP verified' };
     }
     throw new UnauthorizedException('Invalid OTP');
-   }
+  }
 
    // 📬 Forgot Password
    async forgotPassword(dto: ForgotPasswordDto) {
@@ -413,7 +424,7 @@ export class SessionMapper {
 
   // On prépare l'entête dynamiquement
   const interfaceImport = isFull
-    ? `import { ISessionRepository } from '${paths.interfaces}/session.repository.interface';`
+    ? `import type { ISessionRepository } from '${paths.interfaces}/session.repository.interface';`
     : "";
   const implementsClause = isFull ? "implements ISessionRepository " : "";
 
@@ -765,9 +776,6 @@ export class JwtAuthGuard extends AuthGuard('jwt') {
     const request = context.switchToHttp().getRequest();
     const user = request.user;
 
-    console.log('🔍 Required Roles:', requiredRoles);
-    console.log('👤 User Role:', user?.role);
-
     // Check if the user has one of the required roles
     return user && user.role && requiredRoles.includes(user.role);
    }
@@ -796,6 +804,11 @@ import { Session, SessionSchema } from '${schemaRelativePath}';`;
     dbProviders = "PrismaModule,";
   }
 
+  if (inputs.mode == "full") {
+    dbImports =
+      +"import { ISessionRepositoryName } from '${paths.interfaces}/session.repository.interface';";
+  }
+
   await createFile({
     path: `${paths.root}/auth.module.ts`,
     contente: `
@@ -832,7 +845,7 @@ import { SessionRepository } from '${paths.persistence}/session.repository';
     JwtStrategy,
     ${
       isFull
-        ? "{ provide: 'ISessionRepository', useClass: SessionRepository }"
+        ? "{ provide: ISessionRepositoryName, useClass: SessionRepository }"
         : "SessionRepository"
     }
 
@@ -953,7 +966,7 @@ export class AuthModule {}`.trim(),
   });
 
   logSuccess(
-    ` Authentification Enterprise avec support ${dbConfig.orm.toUpperCase()} et Mappers terminée !`
+    ` Authentification Enterprise avec support ${dbConfig.orm.toUpperCase()} et Mappers terminée !`,
   );
 }
 

package/utils/setups/setupDatabase.js

@@ -1,75 +1,76 @@
-const { logInfo } = require("../loggers/logInfo");
-const { runCommand } = require("../shell");
-const { setupTypeORM } = require("./orms/typeOrmSetup");
-const { setupMongoose } = require("./setupMongoose");
-const { setupPrisma } = require("./setupPrisma");
-
-async function setupDatabase(inputs) {
-  logInfo("🚀 Configuring the database...");
-
-  await runCommand(
-    "npm install dotenv",
-    "Error installing dotenv automatically, please run it manually now"
-  );
-
-  switch (inputs.selectedDB) {
-    case "postgresql":
-      await setupPostgres(inputs); // PostgreSQL Configuration
-      break;
-    case "mysql":
-      await setupMySQL(inputs); // MySQL Configuration
-      break;
-    case "mongodb":
-      await setupMongoDB(inputs); // MongoDB Configuration
-      break;
-    case "sqlite":
-      await setupSQLite(inputs); // SQLite Configuration
-      break;
-    case "firebase":
-      await setupFirebase(inputs); // Firebase Configuration
-      break;
-    case "redis":
-      await setupRedis(inputs); // Redis Configuration
-      break;
-    default:
-      throw new Error("Unsupported database.");
-  }
-}
-
-async function setupMongoDB(inputs) {
-  logInfo("Configuring MongoDB...");
-  await setupMongoose(inputs);
-}
-
-async function setupSQLite(inputs) {
-  logInfo("Configuring SQLite..."); // Calls a SQLite-specific script
-  await setupSQLiteConfig(inputs);
-}
-
-async function setupMySQL(inputs) {
-  logInfo("Configuring MySQL..."); // Calls a MySQL-specific script
-  await setupMySQLConfig(inputs);
-}
-
-async function setupFirebase(inputs) {
-  logInfo("Configuring Firebase..."); // Calls a Firebase-specific script
-  await setupFirebaseConfig(inputs);
-}
-
-async function setupPostgres(inputs) {
-  // Checks which ORM was chosen and calls the corresponding function
-  if (inputs.dbConfig.orm === "prisma") {
-    await setupPrisma(inputs);
-  } else if (inputs.dbConfig.orm === "typeorm") {
-    await setupTypeORM(inputs);
-  } else {
-    throw new Error("Unsupported ORM: " + inputs.dbConfig.orm);
-  }
-}
-
-async function setupRedis(inputs) {
-  logInfo("Configuring Redis..."); // Calls a Redis-specific script
-  await setupRedisConfig(inputs);
-}
-
-module.exports = { setupDatabase };
+const { logInfo } = require("../loggers/logInfo");
+const { runCommand } = require("../shell");
+const { setupTypeORM } = require("./orms/typeOrmSetup");
+const { setupMongoose } = require("./setupMongoose");
+const { setupPrisma } = require("./setupPrisma");
+
+async function setupDatabase(inputs) {
+  logInfo("🚀 Configuring the database...");
+
+  await runCommand(
+    "npm install dotenv",
+    "Error installing dotenv automatically, please run it manually now",
+    { critical: false },
+  );
+
+  switch (inputs.selectedDB) {
+    case "postgresql":
+      await setupPostgres(inputs); // PostgreSQL Configuration
+      break;
+    case "mysql":
+      await setupMySQL(inputs); // MySQL Configuration
+      break;
+    case "mongodb":
+      await setupMongoDB(inputs); // MongoDB Configuration
+      break;
+    case "sqlite":
+      await setupSQLite(inputs); // SQLite Configuration
+      break;
+    case "firebase":
+      await setupFirebase(inputs); // Firebase Configuration
+      break;
+    case "redis":
+      await setupRedis(inputs); // Redis Configuration
+      break;
+    default:
+      throw new Error("Unsupported database.");
+  }
+}
+
+async function setupMongoDB(inputs) {
+  logInfo("Configuring MongoDB...");
+  await setupMongoose(inputs);
+}
+
+async function setupSQLite(inputs) {
+  logInfo("Configuring SQLite..."); // Calls a SQLite-specific script
+  await setupSQLiteConfig(inputs);
+}
+
+async function setupMySQL(inputs) {
+  logInfo("Configuring MySQL..."); // Calls a MySQL-specific script
+  await setupMySQLConfig(inputs);
+}
+
+async function setupFirebase(inputs) {
+  logInfo("Configuring Firebase..."); // Calls a Firebase-specific script
+  await setupFirebaseConfig(inputs);
+}
+
+async function setupPostgres(inputs) {
+  // Checks which ORM was chosen and calls the corresponding function
+  if (inputs.dbConfig.orm === "prisma") {
+    await setupPrisma(inputs);
+  } else if (inputs.dbConfig.orm === "typeorm") {
+    await setupTypeORM(inputs);
+  } else {
+    throw new Error("Unsupported ORM: " + inputs.dbConfig.orm);
+  }
+}
+
+async function setupRedis(inputs) {
+  logInfo("Configuring Redis..."); // Calls a Redis-specific script
+  await setupRedisConfig(inputs);
+}
+
+module.exports = { setupDatabase };

package/utils/setups/setupMongoose.js

@@ -1,5 +1,6 @@
 const { runCommand } = require("../shell");
 const path = require("path");
+const fs = require("fs");
 const {
   createFile,
   updateFile,
@@ -68,11 +69,27 @@ async function setupMongoose(inputs) {
   );
 
   // --- Base Configuration (app.module.ts and .env) --- // Generating the .env file
-  const envContent = `
-  MONGO_URI=${inputs.dbConfig.MONGO_URI}
-  MONGO_DB=${inputs.dbConfig.MONGO_DB}
-   `.trim();
-  await createFile({ path: ".env", contente: envContent });
+  const envPath = ".env";
+  const mongoUriLine = `MONGO_URI=${inputs.dbConfig.MONGO_URI}`;
+  const mongoDbLine = `MONGO_DB=${inputs.dbConfig.MONGO_DB}`;
+
+  if (!fs.existsSync(envPath)) {
+    const envContent = `${mongoUriLine}\n${mongoDbLine}\n`;
+    await createFile({ path: envPath, contente: envContent });
+  } else {
+    let content = fs.readFileSync(envPath, "utf8");
+    if (content.includes("MONGO_URI=")) {
+      content = content.replace(/MONGO_URI=.*/g, mongoUriLine);
+    } else {
+      content += `\n${mongoUriLine}`;
+    }
+    if (content.includes("MONGO_DB=")) {
+      content = content.replace(/MONGO_DB=.*/g, mongoDbLine);
+    } else {
+      content += `\n${mongoDbLine}`;
+    }
+    fs.writeFileSync(envPath, content, "utf8");
+  }
 
   const appModulePath = path.join("src", "app.module.ts");
   const mongooseImport = `import { MongooseModule } from '@nestjs/mongoose';`;