cca-auth-module 0.1.90 → 0.1.92

package/dist/index.mjs

@@ -149,10 +149,10 @@ var schemas = {
   ),
   role: yup.string().oneOf(Object.values(UserRole), "Invalid role specified")
 };
-var validateEmail = /* @__PURE__ */ __name(async (email, repository) => {
+var validateEmail = /* @__PURE__ */ __name(async (email, repository, isAdmin) => {
   try {
     await schemas.email.validate(email?.trim().toLowerCase());
-    const user = await repository.findByEmail(email);
+    const user = await repository.findByEmail(email, isAdmin);
     if (!user) {
       throw new NotFoundError(
         "The email address or password is incorrect. Please retry"
@@ -195,13 +195,13 @@ var validateRegisterDTO = /* @__PURE__ */ __name(async (auth, repository) => {
     validatePassword(password)
   ]);
 }, "validateRegisterDTO");
-var validateLoginDTO = /* @__PURE__ */ __name(async (data, repository) => {
+var validateLoginDTO = /* @__PURE__ */ __name(async (data, repository, isAdmin) => {
   const { email, role, password } = data;
   if (role) {
     await schemas.role.validate(role);
   }
   await schemas.password.validate(password);
-  const auth = await validateEmail(email, repository);
+  const auth = await validateEmail(email, repository, isAdmin);
   if (!auth || !auth.password) {
     throw new NotFoundError("Invalid credentials");
   }
@@ -240,8 +240,12 @@ var _LoginUseCase = class _LoginUseCase {
   async initialize() {
     await validateRepository(this.repository, (repo) => repo.getAll());
   }
-  async execute(loginDTO) {
-    const auth = await validateLoginDTO(loginDTO, this.repository);
+  async execute(loginDTO, providedAdminPassword) {
+    if (providedAdminPassword) {
+      await validateAdminSecret(providedAdminPassword);
+    }
+    const isAdmin = !!providedAdminPassword;
+    const auth = await validateLoginDTO(loginDTO, this.repository, isAdmin);
     const accessToken = this.jwtService.generateAccessToken(auth.user, auth.role);
     const expiresAt = jwtDecode(accessToken).exp;
     return { id: auth.user.id, accessToken, expiresAt, enabled: auth.twoFactorEnabled };
@@ -250,32 +254,14 @@ var _LoginUseCase = class _LoginUseCase {
 __name(_LoginUseCase, "LoginUseCase");
 var LoginUseCase = _LoginUseCase;
 
-// src/application/useCase/LoginAdminUseCase.ts
-import { validateRepository as validateRepository2 } from "cca-core";
-var _LoginAdminUseCase = class _LoginAdminUseCase {
-  constructor(repository) {
-    this.repository = repository;
-  }
-  async initialize() {
-    await validateRepository2(this.repository, (repo) => repo.getAll());
-  }
-  async execute(loginDTO, adminPassword) {
-    const auth = await validateLoginDTO(loginDTO, this.repository);
-    await validateAdminSecret(adminPassword);
-    return auth.user.id;
-  }
-};
-__name(_LoginAdminUseCase, "LoginAdminUseCase");
-var LoginAdminUseCase = _LoginAdminUseCase;
-
 // src/application/useCase/LogoutUseCase.ts
-import { validateRepository as validateRepository3 } from "cca-core";
+import { validateRepository as validateRepository2 } from "cca-core";
 var _LogoutUseCase = class _LogoutUseCase {
   constructor(repository) {
     this.repository = repository;
   }
   async initialize() {
-    await validateRepository3(this.repository, (repo) => repo.getAll());
+    await validateRepository2(this.repository, (repo) => repo.getAll());
   }
   async execute(authId) {
     try {
@@ -289,7 +275,7 @@ __name(_LogoutUseCase, "LogoutUseCase");
 var LogoutUseCase = _LogoutUseCase;
 
 // src/application/useCase/RegisterUseCase.ts
-import { validateRepository as validateRepository4 } from "cca-core";
+import { validateRepository as validateRepository3 } from "cca-core";
 import * as bcrypt2 from "bcrypt";
 import { AdminEntity as AdminEntity2, AuthEntity as AuthEntity3, UserEntity as UserEntity2, UserRole as UserRole2 } from "cca-entities";
 
@@ -410,7 +396,7 @@ var _RegisterUseCase = class _RegisterUseCase {
     this.SALT_ROUNDS = 10;
   }
   async initialize() {
-    await validateRepository4(this.repository, (repo) => repo.getAll());
+    await validateRepository3(this.repository, (repo) => repo.getAll());
   }
   async execute(email, name, password, role = UserRole2.GUEST, adminPassword) {
     try {
@@ -453,11 +439,7 @@ var _RegisterUseCase = class _RegisterUseCase {
     const authEntity = mapper.map(dto, RegisterDTO, AuthEntity3);
     const userOrAdminEntity = isAdmin ? mapper.map(dto, RegisterDTO, AdminEntity2) : mapper.map(dto, RegisterDTO, UserEntity2);
     userOrAdminEntity.updatedAt = void 0;
-    if (isAdmin) {
-      authEntity.admin = userOrAdminEntity;
-    } else {
-      authEntity.user = userOrAdminEntity;
-    }
+    authEntity.user = userOrAdminEntity;
     authEntity.password = hashedPassword;
     authEntity.refreshToken = "";
     return authEntity;
@@ -467,14 +449,14 @@ __name(_RegisterUseCase, "RegisterUseCase");
 var RegisterUseCase = _RegisterUseCase;
 
 // src/application/useCase/RefreshTokenUseCase.ts
-import { validateRepository as validateRepository5 } from "cca-core";
+import { validateRepository as validateRepository4 } from "cca-core";
 var _RefreshTokenUseCase = class _RefreshTokenUseCase {
   constructor(repository, service) {
     this.repository = repository;
     this.service = service;
   }
   async initialize() {
-    await validateRepository5(this.repository, (repo) => repo.getAll());
+    await validateRepository4(this.repository, (repo) => repo.getAll());
   }
   async execute(refreshToken) {
     try {
@@ -489,7 +471,7 @@ var _RefreshTokenUseCase = class _RefreshTokenUseCase {
       if (!authEntity) {
         return null;
       }
-      const user = authEntity.role === "admin" ? authEntity.admin : authEntity.user;
+      const user = authEntity.user;
       const accessToken = this.service.generateAccessToken(user, authEntity.role);
       const newRefreshToken = this.service.generateRefreshToken(user);
       await this.repository.update(authEntity.id, {
@@ -542,7 +524,7 @@ __name(_TwoFactorSetupUseCase, "TwoFactorSetupUseCase");
 var TwoFactorSetupUseCase = _TwoFactorSetupUseCase;
 
 // src/application/useCase/TwoFactorEnableUseCase.ts
-import { validateRepository as validateRepository6 } from "cca-core";
+import { validateRepository as validateRepository5 } from "cca-core";
 var _TwoFactorEnableUseCase = class _TwoFactorEnableUseCase {
   constructor(twoFactorService, authRepository) {
     this.isInitialized = false;
@@ -553,7 +535,7 @@ var _TwoFactorEnableUseCase = class _TwoFactorEnableUseCase {
     if (this.isInitialized) return;
     await Promise.all([
       this.twoFactorService.initialize(),
-      validateRepository6(this.authRepository, (repo) => repo.getAll())
+      validateRepository5(this.authRepository, (repo) => repo.getAll())
     ]);
     this.isInitialized = true;
   }
@@ -583,7 +565,7 @@ __name(_TwoFactorEnableUseCase, "TwoFactorEnableUseCase");
 var TwoFactorEnableUseCase = _TwoFactorEnableUseCase;
 
 // src/application/useCase/TwoFactorVerifyUseCase.ts
-import { validateRepository as validateRepository7 } from "cca-core";
+import { validateRepository as validateRepository6 } from "cca-core";
 import { AdminEntity as AdminEntity3, UserEntity as UserEntity3 } from "cca-entities";
 var _TwoFactorVerifyUseCase = class _TwoFactorVerifyUseCase {
   constructor(twoFactorService, authRepository, jwtService) {
@@ -597,7 +579,7 @@ var _TwoFactorVerifyUseCase = class _TwoFactorVerifyUseCase {
     await Promise.all([
       this.twoFactorService.initialize(),
       this.jwtService.initialize(),
-      validateRepository7(this.authRepository, (repo) => repo.getAll())
+      validateRepository6(this.authRepository, (repo) => repo.getAll())
     ]);
     this.isInitialized = true;
   }
@@ -620,18 +602,11 @@ var _TwoFactorVerifyUseCase = class _TwoFactorVerifyUseCase {
     const tokenPair = this.generateTokens(auth);
     await this.updateUserStatus(auth);
     await this.updateUserRefreshToken(auth, tokenPair.refreshToken);
-    if (auth.admin) {
-      return {
-        token: tokenPair.accessToken,
-        refreshToken: tokenPair.refreshToken,
-        data: this.mapAdminToDTO(auth.admin)
-      };
-    }
     if (auth.user) {
       return {
         token: tokenPair.accessToken,
         refreshToken: tokenPair.refreshToken,
-        data: this.mapUserToDTO(auth.user)
+        data: this.mapAdminToDTO(auth.user)
       };
     }
     return null;
@@ -662,7 +637,7 @@ __name(_TwoFactorVerifyUseCase, "TwoFactorVerifyUseCase");
 var TwoFactorVerifyUseCase = _TwoFactorVerifyUseCase;
 
 // src/application/useCase/TwoFactorDisableUseCase.ts
-import { validateRepository as validateRepository8 } from "cca-core";
+import { validateRepository as validateRepository7 } from "cca-core";
 var _TwoFactorDisableUseCase = class _TwoFactorDisableUseCase {
   constructor(twoFactorService, authRepository) {
     this.isInitialized = false;
@@ -673,7 +648,7 @@ var _TwoFactorDisableUseCase = class _TwoFactorDisableUseCase {
     if (this.isInitialized) return;
     await Promise.all([
       this.twoFactorService.initialize(),
-      validateRepository8(this.authRepository, (repo) => repo.getAll())
+      validateRepository7(this.authRepository, (repo) => repo.getAll())
     ]);
     4;
     this.isInitialized = true;
@@ -725,7 +700,7 @@ var MESSAGES = {
 
 // src/presentation/controller/AuthController.ts
 var _AuthController = class _AuthController {
-  constructor(loginUseCase, adminLoginUseCase, logoutUseCase, registerUseCase, refreshTokenUseCase, twoFactorSetupUseCase, twoFactorEnableUseCase, twoFactorVerifyUseCase, twoFactorDisableUseCase) {
+  constructor(loginUseCase, logoutUseCase, registerUseCase, refreshTokenUseCase, twoFactorSetupUseCase, twoFactorEnableUseCase, twoFactorVerifyUseCase, twoFactorDisableUseCase) {
     this.login = /* @__PURE__ */ __name(async (req, res, next) => {
       try {
         const loginDTO = req.body;
@@ -756,7 +731,7 @@ var _AuthController = class _AuthController {
         if (!adminPassword) {
           throw new ForbiddenError("Admin password is required");
         }
-        const result = await this.adminLoginUseCase.execute(loginDTO, adminPassword);
+        const result = await this.loginUseCase.execute(loginDTO, adminPassword);
         const adminLoginData = {
           message: result,
           auth: this.createAuthData(
@@ -911,7 +886,6 @@ var _AuthController = class _AuthController {
       }
     }, "disable2FA");
     this.loginUseCase = loginUseCase;
-    this.adminLoginUseCase = adminLoginUseCase;
     this.logoutUseCase = logoutUseCase;
     this.registerUseCase = registerUseCase;
     this.refreshTokenUseCase = refreshTokenUseCase;
@@ -982,9 +956,9 @@ var _AuthRepository = class _AuthRepository extends BaseRepository {
   constructor(repository) {
     super(repository);
   }
-  async findByEmail(email) {
-    const query = this.repository.createQueryBuilder("auth").leftJoinAndSelect("auth.user", "user").addSelect("auth.password").where("auth.email = :email", { email });
-    return await query.getOne();
+  async findByEmail(email, isAdmin) {
+    const alias = isAdmin ? "admin" : "user";
+    return await this.repository.createQueryBuilder("auth").leftJoinAndSelect("auth.user", alias).addSelect("auth.password").where("auth.email = :email", { email }).getOne();
   }
   async create(entity) {
     return super.create(entity);
@@ -1049,8 +1023,7 @@ var AuthRepository = _AuthRepository;
 
 // src/infrastructure/services/JwtAuthService.ts
 import * as jwt from "jsonwebtoken";
-import * as bcrypt3 from "bcrypt";
-import { validateRepository as validateRepository9 } from "cca-core";
+import { validateRepository as validateRepository8 } from "cca-core";
 var _JwtAuthService = class _JwtAuthService {
   constructor(repository, config) {
     this.repository = repository;
@@ -1068,24 +1041,13 @@ var _JwtAuthService = class _JwtAuthService {
     this.validateConfiguration();
   }
   async initialize() {
-    await validateRepository9(this.repository, (repo) => repo.getAll());
+    await validateRepository8(this.repository, (repo) => repo.getAll());
   }
   validateConfiguration() {
     if (!this.jwtConfig?.accessTokenSecret || !this.jwtConfig?.refreshTokenSecret) {
       throw new JwtError("JWT secrets required in config");
     }
   }
-  async validateUser(email, password) {
-    const user = await this.repository.findByEmail(email);
-    if (!user) {
-      throw new NotFoundError("Invalid credentials");
-    }
-    const validPassword = await bcrypt3.compare(password, user.password);
-    if (!validPassword) {
-      throw new ForbiddenError("Invalid credentials");
-    }
-    return user;
-  }
   verifyJwtConfig() {
     if (!this.jwtConfig) throw new JwtError("JWT config not loaded");
   }
@@ -1232,9 +1194,6 @@ async function createAuthContainer(database) {
   container.registerService("TwoFactorService", twoFactorService);
   const requireComplete2FA = new RequireComplete2FA(jwtAuthService);
   const loginUseCase = new LoginUseCase(authRepository, jwtAuthService);
-  const loginAdminUseCase = new LoginAdminUseCase(
-    authRepository
-  );
   const logoutUseCase = new LogoutUseCase(authRepository);
   const registerUseCase = new RegisterUseCase(authRepository);
   const refreshTokenUseCase = new RefreshTokenUseCase(
@@ -1250,7 +1209,6 @@ async function createAuthContainer(database) {
   );
   const twoFactorDisableUseCase = new TwoFactorDisableUseCase(twoFactorService, authRepository);
   container.registerService("LoginUseCase", loginUseCase);
-  container.registerService("LoginAdminUseCase", loginAdminUseCase);
   container.registerService("LogoutUseCase", logoutUseCase);
   container.registerService("RegisterUseCase", registerUseCase);
   container.registerService("RefreshTokenUseCase", refreshTokenUseCase);
@@ -1260,7 +1218,6 @@ async function createAuthContainer(database) {
   container.registerService("TwoFactorDisableUseCase", twoFactorDisableUseCase);
   const authController = new AuthController(
     loginUseCase,
-    loginAdminUseCase,
     logoutUseCase,
     registerUseCase,
     refreshTokenUseCase,