cca-auth-module 0.1.66 → 0.1.68

package/dist/application/dtos/UserDTO.d.ts

@@ -4,4 +4,5 @@ export declare class UserDTO {
     name: string;
     email: string;
     role: UserRole;
+    profileImageUrl?: string;
 }

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

@@ -6,5 +6,4 @@ export declare class LoginAdminUseCase implements IBaseService {
     constructor(repository: AuthRepository);
     initialize(): Promise<void>;
     execute(loginDTO: LoginDTO, adminPassword: string): Promise<string>;
-    private validateLogin;
 }

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

@@ -11,5 +11,4 @@ export declare class LoginUseCase implements IBaseService {
         id: string;
         accessToken: string;
     }>;
-    private validateLogin;
 }

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

@@ -3,12 +3,12 @@ import { AuthEntity, UserRole } from "cca-entities";
 import { AuthRepository } from "../../infrastructure/repository/AuthRepository";
 export declare class RegisterUseCase implements IBaseService {
     private readonly repository;
-    private static readonly SALT_ROUNDS;
+    private readonly SALT_ROUNDS;
     constructor(repository: AuthRepository);
     initialize(): Promise<void>;
     execute(email: string, name: string, password: string, role?: UserRole, adminPassword?: string): Promise<AuthEntity | undefined>;
     private _normalizeInput;
     private _hashPassword;
     private _validateAdminRegistration;
-    private _buildAuthEntity;
+    private _buildMappedAuthEntity;
 }

package/dist/index.d.mts

@@ -35,14 +35,14 @@ declare class AuthRepository extends BaseRepository<AuthEntity> implements IExte
 
 declare class RegisterUseCase implements IBaseService {
     private readonly repository;
-    private static readonly SALT_ROUNDS;
+    private readonly SALT_ROUNDS;
     constructor(repository: AuthRepository);
     initialize(): Promise<void>;
     execute(email: string, name: string, password: string, role?: UserRole, adminPassword?: string): Promise<AuthEntity | undefined>;
     private _normalizeInput;
     private _hashPassword;
     private _validateAdminRegistration;
-    private _buildAuthEntity;
+    private _buildMappedAuthEntity;
 }
 
 declare class LoginDTO {
@@ -98,7 +98,6 @@ declare class LoginUseCase implements IBaseService {
         id: string;
         accessToken: string;
     }>;
-    private validateLogin;
 }
 
 declare class LoginAdminUseCase implements IBaseService {
@@ -106,7 +105,6 @@ declare class LoginAdminUseCase implements IBaseService {
     constructor(repository: AuthRepository);
     initialize(): Promise<void>;
     execute(loginDTO: LoginDTO, adminPassword: string): Promise<string>;
-    private validateLogin;
 }
 
 declare class LogoutUseCase implements IBaseService {
@@ -192,6 +190,7 @@ declare class UserDTO {
     name: string;
     email: string;
     role: UserRole;
+    profileImageUrl?: string;
 }
 
 declare class TwoFactorVerifyUseCase implements IBaseService {

package/dist/index.d.ts

@@ -35,14 +35,14 @@ declare class AuthRepository extends BaseRepository<AuthEntity> implements IExte
 
 declare class RegisterUseCase implements IBaseService {
     private readonly repository;
-    private static readonly SALT_ROUNDS;
+    private readonly SALT_ROUNDS;
     constructor(repository: AuthRepository);
     initialize(): Promise<void>;
     execute(email: string, name: string, password: string, role?: UserRole, adminPassword?: string): Promise<AuthEntity | undefined>;
     private _normalizeInput;
     private _hashPassword;
     private _validateAdminRegistration;
-    private _buildAuthEntity;
+    private _buildMappedAuthEntity;
 }
 
 declare class LoginDTO {
@@ -98,7 +98,6 @@ declare class LoginUseCase implements IBaseService {
         id: string;
         accessToken: string;
     }>;
-    private validateLogin;
 }
 
 declare class LoginAdminUseCase implements IBaseService {
@@ -106,7 +105,6 @@ declare class LoginAdminUseCase implements IBaseService {
     constructor(repository: AuthRepository);
     initialize(): Promise<void>;
     execute(loginDTO: LoginDTO, adminPassword: string): Promise<string>;
-    private validateLogin;
 }
 
 declare class LogoutUseCase implements IBaseService {
@@ -192,6 +190,7 @@ declare class UserDTO {
     name: string;
     email: string;
     role: UserRole;
+    profileImageUrl?: string;
 }
 
 declare class TwoFactorVerifyUseCase implements IBaseService {

package/dist/index.js

@@ -181,7 +181,7 @@ var schemas = {
     /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]/,
     "Password must contain uppercase, lowercase, number and special character"
   ),
-  role: yup.string().required("Role is required").oneOf(Object.values(import_cca_entities.UserRole), "Invalid role specified")
+  role: yup.string().oneOf(Object.values(import_cca_entities.UserRole), "Invalid role specified")
 };
 var validateEmail = /* @__PURE__ */ __name(async (email, repository) => {
   try {
@@ -231,7 +231,10 @@ var validateRegisterDTO = /* @__PURE__ */ __name(async (auth, repository) => {
 }, "validateRegisterDTO");
 var validateLoginDTO = /* @__PURE__ */ __name(async (data, repository) => {
   const { email, role, password } = data;
-  await Promise.all([schemas.role.validate(role), schemas.password.validate(password)]);
+  if (role) {
+    await schemas.role.validate(role);
+  }
+  await schemas.password.validate(password);
   const auth = await validateEmail(email, repository);
   if (!auth || !auth.password) {
     throw new NotFoundError("Invalid credentials");
@@ -272,14 +275,10 @@ var _LoginUseCase = class _LoginUseCase {
     await (0, import_cca_core.validateRepository)(this.repository, (repo) => repo.getAll());
   }
   async execute(loginDTO) {
-    const auth = await this.validateLogin(loginDTO);
+    const auth = await validateLoginDTO(loginDTO, this.repository);
     const accessToken = this.jwtService.generateAccessToken(auth.user, auth.role);
     return { id: auth.user.id, accessToken };
   }
-  async validateLogin(loginDTO) {
-    const auth = await validateLoginDTO(loginDTO, this.repository);
-    return auth;
-  }
 };
 __name(_LoginUseCase, "LoginUseCase");
 var LoginUseCase = _LoginUseCase;
@@ -294,13 +293,9 @@ var _LoginAdminUseCase = class _LoginAdminUseCase {
     await (0, import_cca_core2.validateRepository)(this.repository, (repo) => repo.getAll());
   }
   async execute(loginDTO, adminPassword) {
-    const auth = await this.validateLogin(loginDTO, adminPassword);
-    return auth.user.id;
-  }
-  async validateLogin(loginDTO, adminPassword) {
     const auth = await validateLoginDTO(loginDTO, this.repository);
     await validateAdminSecret(adminPassword);
-    return auth;
+    return auth.user.id;
   }
 };
 __name(_LoginAdminUseCase, "LoginAdminUseCase");
@@ -362,6 +357,9 @@ __decorateClass([
 __decorateClass([
   (0, import_classes.AutoMap)()
 ], _UserDTO.prototype, "role", 2);
+__decorateClass([
+  (0, import_classes.AutoMap)()
+], _UserDTO.prototype, "profileImageUrl", 2);
 var UserDTO = _UserDTO;
 
 // src/application/dtos/AdminDTO.ts
@@ -413,7 +411,8 @@ function createUserMappings(mapper2) {
     UserDTO,
     (0, import_core.forMember)((dest) => dest.id, (0, import_core.mapFrom)((src) => src.id)),
     (0, import_core.forMember)((dest) => dest.name, (0, import_core.mapFrom)((src) => src.name)),
-    (0, import_core.forMember)((dest) => dest.email, (0, import_core.mapFrom)((src) => src.email))
+    (0, import_core.forMember)((dest) => dest.email, (0, import_core.mapFrom)((src) => src.email)),
+    (0, import_core.forMember)((dest) => dest.profileImageUrl, (0, import_core.mapFrom)((src) => getProfileImageUrl(src)))
   );
   (0, import_core.createMap)(
     mapper2,
@@ -423,6 +422,11 @@ function createUserMappings(mapper2) {
     (0, import_core.forMember)((dest) => dest.name, (0, import_core.mapFrom)((src) => src.name)),
     (0, import_core.forMember)((dest) => dest.email, (0, import_core.mapFrom)((src) => src.email))
   );
+  const getProfileImageUrl = /* @__PURE__ */ __name((src) => {
+    const image = src.images?.[0];
+    if (!image) return void 0;
+    return image.mdUrl ?? image.smUrl ?? image.lgUrl ?? image.thumbUrl ?? image.originalUrl ?? image.xlUrl;
+  }, "getProfileImageUrl");
 }
 __name(createUserMappings, "createUserMappings");
 
@@ -436,26 +440,21 @@ createUserMappings(mapper);
 var _RegisterUseCase = class _RegisterUseCase {
   constructor(repository) {
     this.repository = repository;
+    this.SALT_ROUNDS = 10;
   }
   async initialize() {
     await (0, import_cca_core4.validateRepository)(this.repository, (repo) => repo.getAll());
   }
   async execute(email, name, password, role = import_cca_entities3.UserRole.GUEST, adminPassword) {
     try {
-      const normalizedDTO = this._normalizeInput({
-        email,
-        name,
-        password,
-        role,
-        adminPassword
-      });
+      const normalizedDTO = this._normalizeInput({ email, name, password, role, adminPassword });
       const isAdminUser = await this._validateAdminRegistration(
         normalizedDTO.role,
         normalizedDTO.adminPassword
       );
       await validateRegisterDTO(normalizedDTO, this.repository);
       const hashedPassword = await this._hashPassword(normalizedDTO.password);
-      const authEntity = await this._buildAuthEntity(normalizedDTO, hashedPassword, isAdminUser);
+      const authEntity = this._buildMappedAuthEntity(normalizedDTO, hashedPassword, isAdminUser);
       return this.repository.create(authEntity);
     } catch (error) {
       throw new RegistrationError(
@@ -467,36 +466,30 @@ var _RegisterUseCase = class _RegisterUseCase {
     return {
       name: dto.name.trim(),
       email: dto.email.trim().toLowerCase(),
-      role: dto.role,
       password: dto.password.trim(),
+      role: dto.role,
       adminPassword: dto.adminPassword?.trim()
     };
   }
   async _hashPassword(password) {
-    return bcrypt2.hash(password, _RegisterUseCase.SALT_ROUNDS);
+    return bcrypt2.hash(password, this.SALT_ROUNDS);
   }
   async _validateAdminRegistration(role, adminPassword) {
-    if (role !== import_cca_entities3.UserRole.ADMIN) {
-      return false;
-    }
+    if (role !== import_cca_entities3.UserRole.ADMIN) return false;
     if (!adminPassword) {
       throw new UnauthorizedError("Admin password is required for admin registration");
     }
     await validateAdminSecret(adminPassword);
     return true;
   }
-  async _buildAuthEntity(dto, hashedPassword, isAdmin) {
-    let authEntity;
+  _buildMappedAuthEntity(dto, hashedPassword, isAdmin) {
+    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 = mapper.map(dto, RegisterDTO, import_cca_entities3.AuthEntity);
-      const adminEntity = mapper.map(dto, RegisterDTO, import_cca_entities3.AdminEntity);
-      adminEntity.updatedAt = void 0;
-      authEntity.admin = adminEntity;
+      authEntity.admin = userOrAdminEntity;
     } else {
-      authEntity = mapper.map(dto, RegisterDTO, import_cca_entities3.AuthEntity);
-      const userEntity = mapper.map(dto, RegisterDTO, import_cca_entities3.UserEntity);
-      userEntity.updatedAt = void 0;
-      authEntity.user = userEntity;
+      authEntity.user = userOrAdminEntity;
     }
     authEntity.password = hashedPassword;
     authEntity.refreshToken = "";
@@ -504,7 +497,6 @@ var _RegisterUseCase = class _RegisterUseCase {
   }
 };
 __name(_RegisterUseCase, "RegisterUseCase");
-_RegisterUseCase.SALT_ROUNDS = 10;
 var RegisterUseCase = _RegisterUseCase;
 
 // src/application/useCase/RefreshTokenUseCase.ts
@@ -743,7 +735,7 @@ var _AuthController = class _AuthController {
   constructor(loginUseCase, adminLoginUseCase, logoutUseCase, registerUseCase, refreshTokenUseCase, twoFactorSetupUseCase, twoFactorEnableUseCase, twoFactorVerifyUseCase, twoFactorDisableUseCase) {
     this.login = /* @__PURE__ */ __name(async (req, res, next) => {
       try {
-        const { adminPassword, ...loginDTO } = req.body;
+        const loginDTO = req.body;
         const result = await this.loginUseCase.execute(loginDTO);
         res.status(201).json(
           {