cca-auth-module 0.1.91 → 0.1.93

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, providedAdminPassword: string, admin: boolean): Promise<{
+    execute(loginDTO: LoginDTO, providedAdminPassword?: string): Promise<{
         id: string;
         accessToken: string;
         expiresAt: number;

package/dist/application/validators/authValidation.d.ts

@@ -2,9 +2,9 @@ import { AuthEntity } from "cca-entities";
 import { AuthRepository } from "../../infrastructure/repository/AuthRepository";
 import { RegisterDTO } from "../dtos/RegisterDTO";
 import { LoginDTO } from "../dtos/LoginDTO";
-export declare const validateEmail: (email: string, repository: AuthRepository) => Promise<AuthEntity>;
+export declare const validateEmail: (email: string, repository: AuthRepository, isAdmin: boolean) => Promise<AuthEntity>;
 export declare const validatePassword: (password?: string) => Promise<void>;
 export declare const validateEmailUniqueness: (repository: AuthRepository, email: string, excludeUserId?: string) => Promise<void>;
 export declare const validateRegisterDTO: (auth: RegisterDTO, repository: AuthRepository) => Promise<void>;
-export declare const validateLoginDTO: (data: LoginDTO, repository: AuthRepository) => Promise<AuthEntity>;
+export declare const validateLoginDTO: (data: LoginDTO, repository: AuthRepository, isAdmin: boolean) => Promise<AuthEntity>;
 export declare const validateAdminSecret: (secretPassword?: string) => Promise<void>;

package/dist/domain/interfaces/IAuthService.d.ts

@@ -1,9 +1,8 @@
-import { AuthEntity, UserEntity, UserRole } from "cca-entities";
+import { AdminEntity, UserEntity, UserRole } from "cca-entities";
 import { IDecodedToken } from "./IDecodedToken";
 export interface IAuthService {
-    validateUser(email: string, password: string): Promise<AuthEntity | null>;
-    generateAccessToken(user: UserEntity, role: UserRole): string;
-    generateRefreshToken(user: UserEntity): string;
+    generateAccessToken(user: UserEntity | AdminEntity, role: UserRole): string;
+    generateRefreshToken(user: UserEntity | AdminEntity): string;
     verifyAccessToken(token: string): Promise<IDecodedToken>;
     verifyRefreshToken(token: string): IDecodedToken;
 }

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { BaseRepository, IExtendedBaseRepository, IBaseService, BaseDatabase, BaseContainer } from 'cca-core';
 import { Request, Response, NextFunction } from 'express';
-import { AuthEntity, UserRole, UserEntity } from 'cca-entities';
+import { AuthEntity, UserRole, UserEntity, AdminEntity } from 'cca-entities';
 import { Repository } from 'typeorm';
 import * as jwt from 'jsonwebtoken';
 import { JwtPayload } from 'jsonwebtoken';
@@ -22,7 +22,7 @@ declare const authConfig: (configSource: ConfigSource) => void;
 
 declare class AuthRepository extends BaseRepository<AuthEntity> implements IExtendedBaseRepository<AuthEntity> {
     constructor(repository: Repository<AuthEntity>);
-    findByEmail(email: string): Promise<AuthEntity | null>;
+    findByEmail(email: string, isAdmin?: boolean): Promise<AuthEntity | null>;
     create(entity: Omit<AuthEntity, "createdAt">): Promise<AuthEntity>;
     findByUserId(userId: string): Promise<AuthEntity | null>;
     findByUseAdminId(userId: string, isAdmin?: boolean): Promise<AuthEntity | null>;
@@ -67,9 +67,8 @@ interface IDecodedToken extends JwtPayload {
 }
 
 interface IAuthService {
-    validateUser(email: string, password: string): Promise<AuthEntity | null>;
-    generateAccessToken(user: UserEntity, role: UserRole): string;
-    generateRefreshToken(user: UserEntity): string;
+    generateAccessToken(user: UserEntity | AdminEntity, role: UserRole): string;
+    generateRefreshToken(user: UserEntity | AdminEntity): string;
     verifyAccessToken(token: string): Promise<IDecodedToken>;
     verifyRefreshToken(token: string): IDecodedToken;
 }
@@ -81,10 +80,9 @@ declare class JwtAuthService implements IBaseService, IAuthService {
     private loadConfig;
     initialize(): Promise<void>;
     private validateConfiguration;
-    validateUser(email: string, password: string): Promise<AuthEntity | null>;
     private verifyJwtConfig;
-    generateAccessToken(user: UserEntity, role: UserRole): string;
-    generateRefreshToken(user: UserEntity): string;
+    generateAccessToken(user: UserEntity | AdminEntity, role: UserRole): string;
+    generateRefreshToken(user: UserEntity | AdminEntity): string;
     verifyToken(token: string, secret: string): Promise<IDecodedToken>;
     verifyAccessToken(token: string): Promise<IDecodedToken>;
     verifyRefreshToken(token: string): Promise<IDecodedToken>;
@@ -95,7 +93,7 @@ declare class LoginUseCase implements IBaseService {
     private readonly jwtService;
     constructor(repository: AuthRepository, jwtService: JwtAuthService);
     initialize(): Promise<void>;
-    execute(loginDTO: LoginDTO, providedAdminPassword: string, admin: boolean): Promise<{
+    execute(loginDTO: LoginDTO, providedAdminPassword?: string): Promise<{
         id: string;
         accessToken: string;
         expiresAt: number;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { BaseRepository, IExtendedBaseRepository, IBaseService, BaseDatabase, BaseContainer } from 'cca-core';
 import { Request, Response, NextFunction } from 'express';
-import { AuthEntity, UserRole, UserEntity } from 'cca-entities';
+import { AuthEntity, UserRole, UserEntity, AdminEntity } from 'cca-entities';
 import { Repository } from 'typeorm';
 import * as jwt from 'jsonwebtoken';
 import { JwtPayload } from 'jsonwebtoken';
@@ -22,7 +22,7 @@ declare const authConfig: (configSource: ConfigSource) => void;
 
 declare class AuthRepository extends BaseRepository<AuthEntity> implements IExtendedBaseRepository<AuthEntity> {
     constructor(repository: Repository<AuthEntity>);
-    findByEmail(email: string): Promise<AuthEntity | null>;
+    findByEmail(email: string, isAdmin?: boolean): Promise<AuthEntity | null>;
     create(entity: Omit<AuthEntity, "createdAt">): Promise<AuthEntity>;
     findByUserId(userId: string): Promise<AuthEntity | null>;
     findByUseAdminId(userId: string, isAdmin?: boolean): Promise<AuthEntity | null>;
@@ -67,9 +67,8 @@ interface IDecodedToken extends JwtPayload {
 }
 
 interface IAuthService {
-    validateUser(email: string, password: string): Promise<AuthEntity | null>;
-    generateAccessToken(user: UserEntity, role: UserRole): string;
-    generateRefreshToken(user: UserEntity): string;
+    generateAccessToken(user: UserEntity | AdminEntity, role: UserRole): string;
+    generateRefreshToken(user: UserEntity | AdminEntity): string;
     verifyAccessToken(token: string): Promise<IDecodedToken>;
     verifyRefreshToken(token: string): IDecodedToken;
 }
@@ -81,10 +80,9 @@ declare class JwtAuthService implements IBaseService, IAuthService {
     private loadConfig;
     initialize(): Promise<void>;
     private validateConfiguration;
-    validateUser(email: string, password: string): Promise<AuthEntity | null>;
     private verifyJwtConfig;
-    generateAccessToken(user: UserEntity, role: UserRole): string;
-    generateRefreshToken(user: UserEntity): string;
+    generateAccessToken(user: UserEntity | AdminEntity, role: UserRole): string;
+    generateRefreshToken(user: UserEntity | AdminEntity): string;
     verifyToken(token: string, secret: string): Promise<IDecodedToken>;
     verifyAccessToken(token: string): Promise<IDecodedToken>;
     verifyRefreshToken(token: string): Promise<IDecodedToken>;
@@ -95,7 +93,7 @@ declare class LoginUseCase implements IBaseService {
     private readonly jwtService;
     constructor(repository: AuthRepository, jwtService: JwtAuthService);
     initialize(): Promise<void>;
-    execute(loginDTO: LoginDTO, providedAdminPassword: string, admin: boolean): Promise<{
+    execute(loginDTO: LoginDTO, providedAdminPassword?: string): Promise<{
         id: string;
         accessToken: string;
         expiresAt: number;

package/dist/index.js

@@ -184,10 +184,10 @@ var schemas = {
   ),
   role: yup.string().oneOf(Object.values(import_cca_entities.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"
@@ -230,13 +230,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");
   }
@@ -275,11 +275,15 @@ var _LoginUseCase = class _LoginUseCase {
   async initialize() {
     await (0, import_cca_core.validateRepository)(this.repository, (repo) => repo.getAll());
   }
-  async execute(loginDTO, providedAdminPassword, admin) {
-    if (admin) {
+  async execute(loginDTO, providedAdminPassword) {
+    if (providedAdminPassword) {
       await validateAdminSecret(providedAdminPassword);
     }
-    const auth = await validateLoginDTO(loginDTO, this.repository);
+    const isAdmin = !!providedAdminPassword;
+    const auth = await validateLoginDTO(loginDTO, this.repository, isAdmin);
+    if (!auth.user) {
+      throw new NotFoundError("User account not found or inactive");
+    }
     const accessToken = this.jwtService.generateAccessToken(auth.user, auth.role);
     const expiresAt = (0, import_jwt_decode.jwtDecode)(accessToken).exp;
     return { id: auth.user.id, accessToken, expiresAt, enabled: auth.twoFactorEnabled };
@@ -473,11 +477,7 @@ var _RegisterUseCase = class _RegisterUseCase {
     const authEntity = mapper.map(dto, RegisterDTO, import_cca_entities3.AuthEntity);
     const userOrAdminEntity = isAdmin ? mapper.map(dto, RegisterDTO, import_cca_entities3.AdminEntity) : mapper.map(dto, RegisterDTO, import_cca_entities3.UserEntity);
     userOrAdminEntity.updatedAt = void 0;
-    if (isAdmin) {
-      authEntity.admin = userOrAdminEntity;
-    } else {
-      authEntity.user = userOrAdminEntity;
-    }
+    authEntity.user = userOrAdminEntity;
     authEntity.password = hashedPassword;
     authEntity.refreshToken = "";
     return authEntity;
@@ -509,7 +509,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, {
@@ -640,18 +640,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;
@@ -749,7 +742,7 @@ var _AuthController = class _AuthController {
     this.login = /* @__PURE__ */ __name(async (req, res, next) => {
       try {
         const loginDTO = req.body;
-        const result = await this.loginUseCase.execute(loginDTO, "", false);
+        const result = await this.loginUseCase.execute(loginDTO);
         const twoFactorEnabled = result.enabled ?? false;
         const loginData = {
           accessToken: result.accessToken,
@@ -776,7 +769,7 @@ var _AuthController = class _AuthController {
         if (!adminPassword) {
           throw new ForbiddenError("Admin password is required");
         }
-        const result = await this.loginUseCase.execute(loginDTO, adminPassword, true);
+        const result = await this.loginUseCase.execute(loginDTO, adminPassword);
         const adminLoginData = {
           message: result,
           auth: this.createAuthData(
@@ -1001,9 +994,14 @@ var _AuthRepository = class _AuthRepository extends import_cca_core8.BaseReposit
   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 queryBuilder = this.repository.createQueryBuilder("auth").addSelect("auth.password").where("auth.email = :email", { email });
+    if (isAdmin) {
+      queryBuilder.leftJoinAndSelect("auth.admin", "admin");
+    } else {
+      queryBuilder.leftJoinAndSelect("auth.user", "user");
+    }
+    return await queryBuilder.getOne();
   }
   async create(entity) {
     return super.create(entity);
@@ -1068,7 +1066,6 @@ var AuthRepository = _AuthRepository;
 
 // src/infrastructure/services/JwtAuthService.ts
 var jwt = __toESM(require("jsonwebtoken"));
-var bcrypt3 = __toESM(require("bcrypt"));
 var import_cca_core9 = require("cca-core");
 var _JwtAuthService = class _JwtAuthService {
   constructor(repository, config) {
@@ -1094,17 +1091,6 @@ var _JwtAuthService = class _JwtAuthService {
       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");
   }