cca-auth-module 0.1.90 → 0.1.91

package/dist/application/useCase/LoginUseCase.d.ts

@@ -7,7 +7,7 @@ export declare class LoginUseCase implements IBaseService {
     private readonly jwtService;
     constructor(repository: AuthRepository, jwtService: JwtAuthService);
     initialize(): Promise<void>;
-    execute(loginDTO: LoginDTO): Promise<{
+    execute(loginDTO: LoginDTO, providedAdminPassword: string, admin: boolean): Promise<{
         id: string;
         accessToken: string;
         expiresAt: number;

package/dist/index.d.mts

@@ -95,7 +95,7 @@ declare class LoginUseCase implements IBaseService {
     private readonly jwtService;
     constructor(repository: AuthRepository, jwtService: JwtAuthService);
     initialize(): Promise<void>;
-    execute(loginDTO: LoginDTO): Promise<{
+    execute(loginDTO: LoginDTO, providedAdminPassword: string, admin: boolean): Promise<{
         id: string;
         accessToken: string;
         expiresAt: number;
@@ -103,13 +103,6 @@ declare class LoginUseCase implements IBaseService {
     }>;
 }
 
-declare class LoginAdminUseCase implements IBaseService {
-    private readonly repository;
-    constructor(repository: AuthRepository);
-    initialize(): Promise<void>;
-    execute(loginDTO: LoginDTO, adminPassword: string): Promise<string>;
-}
-
 declare class LogoutUseCase implements IBaseService {
     private readonly repository;
     constructor(repository: AuthRepository);
@@ -224,7 +217,6 @@ declare class TwoFactorDisableUseCase implements IBaseService {
 
 declare class AuthController {
     private readonly loginUseCase;
-    private readonly adminLoginUseCase;
     private readonly logoutUseCase;
     private readonly registerUseCase;
     private readonly refreshTokenUseCase;
@@ -232,7 +224,7 @@ declare class AuthController {
     private readonly twoFactorEnableUseCase;
     private readonly twoFactorVerifyUseCase;
     private readonly twoFactorDisableUseCase;
-    constructor(loginUseCase: LoginUseCase, adminLoginUseCase: LoginAdminUseCase, logoutUseCase: LogoutUseCase, registerUseCase: RegisterUseCase, refreshTokenUseCase: RefreshTokenUseCase, twoFactorSetupUseCase: TwoFactorSetupUseCase, twoFactorEnableUseCase: TwoFactorEnableUseCase, twoFactorVerifyUseCase: TwoFactorVerifyUseCase, twoFactorDisableUseCase: TwoFactorDisableUseCase);
+    constructor(loginUseCase: LoginUseCase, logoutUseCase: LogoutUseCase, registerUseCase: RegisterUseCase, refreshTokenUseCase: RefreshTokenUseCase, twoFactorSetupUseCase: TwoFactorSetupUseCase, twoFactorEnableUseCase: TwoFactorEnableUseCase, twoFactorVerifyUseCase: TwoFactorVerifyUseCase, twoFactorDisableUseCase: TwoFactorDisableUseCase);
     private createResponse;
     private createAuthData;
     private sendResponse;

package/dist/index.d.ts

@@ -95,7 +95,7 @@ declare class LoginUseCase implements IBaseService {
     private readonly jwtService;
     constructor(repository: AuthRepository, jwtService: JwtAuthService);
     initialize(): Promise<void>;
-    execute(loginDTO: LoginDTO): Promise<{
+    execute(loginDTO: LoginDTO, providedAdminPassword: string, admin: boolean): Promise<{
         id: string;
         accessToken: string;
         expiresAt: number;
@@ -103,13 +103,6 @@ declare class LoginUseCase implements IBaseService {
     }>;
 }
 
-declare class LoginAdminUseCase implements IBaseService {
-    private readonly repository;
-    constructor(repository: AuthRepository);
-    initialize(): Promise<void>;
-    execute(loginDTO: LoginDTO, adminPassword: string): Promise<string>;
-}
-
 declare class LogoutUseCase implements IBaseService {
     private readonly repository;
     constructor(repository: AuthRepository);
@@ -224,7 +217,6 @@ declare class TwoFactorDisableUseCase implements IBaseService {
 
 declare class AuthController {
     private readonly loginUseCase;
-    private readonly adminLoginUseCase;
     private readonly logoutUseCase;
     private readonly registerUseCase;
     private readonly refreshTokenUseCase;
@@ -232,7 +224,7 @@ declare class AuthController {
     private readonly twoFactorEnableUseCase;
     private readonly twoFactorVerifyUseCase;
     private readonly twoFactorDisableUseCase;
-    constructor(loginUseCase: LoginUseCase, adminLoginUseCase: LoginAdminUseCase, logoutUseCase: LogoutUseCase, registerUseCase: RegisterUseCase, refreshTokenUseCase: RefreshTokenUseCase, twoFactorSetupUseCase: TwoFactorSetupUseCase, twoFactorEnableUseCase: TwoFactorEnableUseCase, twoFactorVerifyUseCase: TwoFactorVerifyUseCase, twoFactorDisableUseCase: TwoFactorDisableUseCase);
+    constructor(loginUseCase: LoginUseCase, logoutUseCase: LogoutUseCase, registerUseCase: RegisterUseCase, refreshTokenUseCase: RefreshTokenUseCase, twoFactorSetupUseCase: TwoFactorSetupUseCase, twoFactorEnableUseCase: TwoFactorEnableUseCase, twoFactorVerifyUseCase: TwoFactorVerifyUseCase, twoFactorDisableUseCase: TwoFactorDisableUseCase);
     private createResponse;
     private createAuthData;
     private sendResponse;

package/dist/index.js

@@ -163,7 +163,7 @@ var createConfigInstance = /* @__PURE__ */ __name(async () => {
 }, "createConfigInstance");
 
 // src/infrastructure/container/createAuthContainer.ts
-var import_cca_core11 = require("cca-core");
+var import_cca_core10 = require("cca-core");
 var import_cca_entities5 = require("cca-entities");
 
 // src/application/useCase/LoginUseCase.ts
@@ -275,7 +275,10 @@ var _LoginUseCase = class _LoginUseCase {
   async initialize() {
     await (0, import_cca_core.validateRepository)(this.repository, (repo) => repo.getAll());
   }
-  async execute(loginDTO) {
+  async execute(loginDTO, providedAdminPassword, admin) {
+    if (admin) {
+      await validateAdminSecret(providedAdminPassword);
+    }
     const auth = await validateLoginDTO(loginDTO, this.repository);
     const accessToken = this.jwtService.generateAccessToken(auth.user, auth.role);
     const expiresAt = (0, import_jwt_decode.jwtDecode)(accessToken).exp;
@@ -285,32 +288,14 @@ var _LoginUseCase = class _LoginUseCase {
 __name(_LoginUseCase, "LoginUseCase");
 var LoginUseCase = _LoginUseCase;
 
-// src/application/useCase/LoginAdminUseCase.ts
-var import_cca_core2 = require("cca-core");
-var _LoginAdminUseCase = class _LoginAdminUseCase {
-  constructor(repository) {
-    this.repository = repository;
-  }
-  async initialize() {
-    await (0, import_cca_core2.validateRepository)(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
-var import_cca_core3 = require("cca-core");
+var import_cca_core2 = require("cca-core");
 var _LogoutUseCase = class _LogoutUseCase {
   constructor(repository) {
     this.repository = repository;
   }
   async initialize() {
-    await (0, import_cca_core3.validateRepository)(this.repository, (repo) => repo.getAll());
+    await (0, import_cca_core2.validateRepository)(this.repository, (repo) => repo.getAll());
   }
   async execute(authId) {
     try {
@@ -324,7 +309,7 @@ __name(_LogoutUseCase, "LogoutUseCase");
 var LogoutUseCase = _LogoutUseCase;
 
 // src/application/useCase/RegisterUseCase.ts
-var import_cca_core4 = require("cca-core");
+var import_cca_core3 = require("cca-core");
 var bcrypt2 = __toESM(require("bcrypt"));
 var import_cca_entities3 = require("cca-entities");
 
@@ -445,7 +430,7 @@ var _RegisterUseCase = class _RegisterUseCase {
     this.SALT_ROUNDS = 10;
   }
   async initialize() {
-    await (0, import_cca_core4.validateRepository)(this.repository, (repo) => repo.getAll());
+    await (0, import_cca_core3.validateRepository)(this.repository, (repo) => repo.getAll());
   }
   async execute(email, name, password, role = import_cca_entities3.UserRole.GUEST, adminPassword) {
     try {
@@ -502,14 +487,14 @@ __name(_RegisterUseCase, "RegisterUseCase");
 var RegisterUseCase = _RegisterUseCase;
 
 // src/application/useCase/RefreshTokenUseCase.ts
-var import_cca_core5 = require("cca-core");
+var import_cca_core4 = require("cca-core");
 var _RefreshTokenUseCase = class _RefreshTokenUseCase {
   constructor(repository, service) {
     this.repository = repository;
     this.service = service;
   }
   async initialize() {
-    await (0, import_cca_core5.validateRepository)(this.repository, (repo) => repo.getAll());
+    await (0, import_cca_core4.validateRepository)(this.repository, (repo) => repo.getAll());
   }
   async execute(refreshToken) {
     try {
@@ -577,7 +562,7 @@ __name(_TwoFactorSetupUseCase, "TwoFactorSetupUseCase");
 var TwoFactorSetupUseCase = _TwoFactorSetupUseCase;
 
 // src/application/useCase/TwoFactorEnableUseCase.ts
-var import_cca_core6 = require("cca-core");
+var import_cca_core5 = require("cca-core");
 var _TwoFactorEnableUseCase = class _TwoFactorEnableUseCase {
   constructor(twoFactorService, authRepository) {
     this.isInitialized = false;
@@ -588,7 +573,7 @@ var _TwoFactorEnableUseCase = class _TwoFactorEnableUseCase {
     if (this.isInitialized) return;
     await Promise.all([
       this.twoFactorService.initialize(),
-      (0, import_cca_core6.validateRepository)(this.authRepository, (repo) => repo.getAll())
+      (0, import_cca_core5.validateRepository)(this.authRepository, (repo) => repo.getAll())
     ]);
     this.isInitialized = true;
   }
@@ -618,7 +603,7 @@ __name(_TwoFactorEnableUseCase, "TwoFactorEnableUseCase");
 var TwoFactorEnableUseCase = _TwoFactorEnableUseCase;
 
 // src/application/useCase/TwoFactorVerifyUseCase.ts
-var import_cca_core7 = require("cca-core");
+var import_cca_core6 = require("cca-core");
 var import_cca_entities4 = require("cca-entities");
 var _TwoFactorVerifyUseCase = class _TwoFactorVerifyUseCase {
   constructor(twoFactorService, authRepository, jwtService) {
@@ -632,7 +617,7 @@ var _TwoFactorVerifyUseCase = class _TwoFactorVerifyUseCase {
     await Promise.all([
       this.twoFactorService.initialize(),
       this.jwtService.initialize(),
-      (0, import_cca_core7.validateRepository)(this.authRepository, (repo) => repo.getAll())
+      (0, import_cca_core6.validateRepository)(this.authRepository, (repo) => repo.getAll())
     ]);
     this.isInitialized = true;
   }
@@ -697,7 +682,7 @@ __name(_TwoFactorVerifyUseCase, "TwoFactorVerifyUseCase");
 var TwoFactorVerifyUseCase = _TwoFactorVerifyUseCase;
 
 // src/application/useCase/TwoFactorDisableUseCase.ts
-var import_cca_core8 = require("cca-core");
+var import_cca_core7 = require("cca-core");
 var _TwoFactorDisableUseCase = class _TwoFactorDisableUseCase {
   constructor(twoFactorService, authRepository) {
     this.isInitialized = false;
@@ -708,7 +693,7 @@ var _TwoFactorDisableUseCase = class _TwoFactorDisableUseCase {
     if (this.isInitialized) return;
     await Promise.all([
       this.twoFactorService.initialize(),
-      (0, import_cca_core8.validateRepository)(this.authRepository, (repo) => repo.getAll())
+      (0, import_cca_core7.validateRepository)(this.authRepository, (repo) => repo.getAll())
     ]);
     4;
     this.isInitialized = true;
@@ -760,11 +745,11 @@ 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;
-        const result = await this.loginUseCase.execute(loginDTO);
+        const result = await this.loginUseCase.execute(loginDTO, "", false);
         const twoFactorEnabled = result.enabled ?? false;
         const loginData = {
           accessToken: result.accessToken,
@@ -791,7 +776,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, true);
         const adminLoginData = {
           message: result,
           auth: this.createAuthData(
@@ -946,7 +931,6 @@ var _AuthController = class _AuthController {
       }
     }, "disable2FA");
     this.loginUseCase = loginUseCase;
-    this.adminLoginUseCase = adminLoginUseCase;
     this.logoutUseCase = logoutUseCase;
     this.registerUseCase = registerUseCase;
     this.refreshTokenUseCase = refreshTokenUseCase;
@@ -1012,8 +996,8 @@ __name(_RequireComplete2FA, "RequireComplete2FA");
 var RequireComplete2FA = _RequireComplete2FA;
 
 // src/infrastructure/repository/AuthRepository.ts
-var import_cca_core9 = require("cca-core");
-var _AuthRepository = class _AuthRepository extends import_cca_core9.BaseRepository {
+var import_cca_core8 = require("cca-core");
+var _AuthRepository = class _AuthRepository extends import_cca_core8.BaseRepository {
   constructor(repository) {
     super(repository);
   }
@@ -1085,7 +1069,7 @@ var AuthRepository = _AuthRepository;
 // src/infrastructure/services/JwtAuthService.ts
 var jwt = __toESM(require("jsonwebtoken"));
 var bcrypt3 = __toESM(require("bcrypt"));
-var import_cca_core10 = require("cca-core");
+var import_cca_core9 = require("cca-core");
 var _JwtAuthService = class _JwtAuthService {
   constructor(repository, config) {
     this.repository = repository;
@@ -1103,7 +1087,7 @@ var _JwtAuthService = class _JwtAuthService {
     this.validateConfiguration();
   }
   async initialize() {
-    await (0, import_cca_core10.validateRepository)(this.repository, (repo) => repo.getAll());
+    await (0, import_cca_core9.validateRepository)(this.repository, (repo) => repo.getAll());
   }
   validateConfiguration() {
     if (!this.jwtConfig?.accessTokenSecret || !this.jwtConfig?.refreshTokenSecret) {
@@ -1255,7 +1239,7 @@ var TwoFactorService = _TwoFactorService;
 
 // src/infrastructure/container/createAuthContainer.ts
 async function createAuthContainer(database) {
-  const container = new import_cca_core11.BaseContainer({ database });
+  const container = new import_cca_core10.BaseContainer({ database });
   const authRepository = new AuthRepository(
     database.getRepository(import_cca_entities5.AuthEntity)
   );
@@ -1267,9 +1251,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(
@@ -1285,7 +1266,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);
@@ -1295,7 +1275,6 @@ async function createAuthContainer(database) {
   container.registerService("TwoFactorDisableUseCase", twoFactorDisableUseCase);
   const authController = new AuthController(
     loginUseCase,
-    loginAdminUseCase,
     logoutUseCase,
     registerUseCase,
     refreshTokenUseCase,