cca-auth-module 0.1.96 → 0.1.98

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

@@ -18,7 +18,6 @@ export declare class TwoFactorVerifyUseCase implements IBaseService {
         data?: AdminDTO | UserDTO;
     } | null>;
     private mapAdminToDTO;
-    private mapUserToDTO;
     private updateUserStatus;
     private updateUserRefreshToken;
     private generateTokens;

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, isAdmin: boolean) => Promise<AuthEntity>;
+export declare const validateEmail: (email: string, repository: AuthRepository) => 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, isAdmin: boolean) => Promise<AuthEntity>;
+export declare const validateLoginDTO: (data: LoginDTO, repository: AuthRepository) => Promise<AuthEntity>;
 export declare const validateAdminSecret: (secretPassword?: string) => Promise<void>;

package/dist/index.d.mts

@@ -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, isAdmin?: boolean): Promise<AuthEntity | null>;
+    findByEmail(email: string): Promise<AuthEntity | null>;
     create(entity: Omit<AuthEntity, "createdAt">): Promise<AuthEntity>;
     findByUserId(userId: string): Promise<AuthEntity | null>;
     findByUseAdminId(userId: string, isAdmin?: boolean): Promise<AuthEntity | null>;
@@ -198,7 +198,6 @@ declare class TwoFactorVerifyUseCase implements IBaseService {
         data?: AdminDTO | UserDTO;
     } | null>;
     private mapAdminToDTO;
-    private mapUserToDTO;
     private updateUserStatus;
     private updateUserRefreshToken;
     private generateTokens;

package/dist/index.d.ts

@@ -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, isAdmin?: boolean): Promise<AuthEntity | null>;
+    findByEmail(email: string): Promise<AuthEntity | null>;
     create(entity: Omit<AuthEntity, "createdAt">): Promise<AuthEntity>;
     findByUserId(userId: string): Promise<AuthEntity | null>;
     findByUseAdminId(userId: string, isAdmin?: boolean): Promise<AuthEntity | null>;
@@ -198,7 +198,6 @@ declare class TwoFactorVerifyUseCase implements IBaseService {
         data?: AdminDTO | UserDTO;
     } | null>;
     private mapAdminToDTO;
-    private mapUserToDTO;
     private updateUserStatus;
     private updateUserRefreshToken;
     private generateTokens;

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, isAdmin) => {
+var validateEmail = /* @__PURE__ */ __name(async (email, repository) => {
   try {
     await schemas.email.validate(email?.trim().toLowerCase());
-    const user = await repository.findByEmail(email, isAdmin);
+    const user = await repository.findByEmail(email);
     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, isAdmin) => {
+var validateLoginDTO = /* @__PURE__ */ __name(async (data, repository) => {
   const { email, role, password } = data;
   if (role) {
     await schemas.role.validate(role);
   }
   await schemas.password.validate(password);
-  const auth = await validateEmail(email, repository, isAdmin);
+  const auth = await validateEmail(email, repository);
   if (!auth || !auth.password) {
     throw new NotFoundError("Invalid credentials");
   }
@@ -276,17 +276,18 @@ var _LoginUseCase = class _LoginUseCase {
     await (0, import_cca_core.validateRepository)(this.repository, (repo) => repo.getAll());
   }
   async execute(loginDTO, providedAdminPassword) {
-    if (providedAdminPassword) {
+    const isAdmin = !!providedAdminPassword;
+    if (isAdmin) {
       await validateAdminSecret(providedAdminPassword);
     }
-    const isAdmin = !!providedAdminPassword;
-    const auth = await validateLoginDTO(loginDTO, this.repository, isAdmin);
-    if (!auth.user) {
-      throw new NotFoundError("User account not found or inactive");
+    const auth = await validateLoginDTO(loginDTO, this.repository);
+    const account = isAdmin ? auth.admin : auth.user;
+    if (!account) {
+      throw new NotFoundError(`${isAdmin ? "Admin" : "User"} account not found or inactive`);
     }
-    const accessToken = this.jwtService.generateAccessToken(auth.user, auth.role);
+    const accessToken = this.jwtService.generateAccessToken(account, auth.role);
     const expiresAt = (0, import_jwt_decode.jwtDecode)(accessToken).exp;
-    return { id: auth.user.id, accessToken, expiresAt, enabled: auth.twoFactorEnabled };
+    return { id: account.id, accessToken, expiresAt, enabled: auth.twoFactorEnabled };
   }
 };
 __name(_LoginUseCase, "LoginUseCase");
@@ -499,27 +500,17 @@ var _RefreshTokenUseCase = class _RefreshTokenUseCase {
   async execute(refreshToken) {
     try {
       const decoded = await this.service.verifyRefreshToken(refreshToken);
-      if (!decoded.userId) {
-        return null;
-      }
-      let authEntity = await this.repository.findByUseAdminId(decoded.userId);
-      if (!authEntity) {
-        authEntity = await this.repository.findByUseAdminId(decoded.userId, true);
-      }
-      if (!authEntity) {
-        return null;
-      }
-      const user = authEntity.user;
-      const accessToken = this.service.generateAccessToken(user, authEntity.role);
-      const newRefreshToken = this.service.generateRefreshToken(user);
-      await this.repository.update(authEntity.id, {
-        refreshToken: newRefreshToken
-      });
-      return {
-        accessToken,
-        refreshToken: newRefreshToken
-      };
+      if (!decoded.userId) return null;
+      const authEntity = await this.repository.findByUseAdminId(decoded.userId);
+      if (!authEntity) return null;
+      const account = authEntity.user ?? authEntity.admin;
+      if (!account) return null;
+      const accessToken = this.service.generateAccessToken(account, authEntity.role);
+      const newRefreshToken = this.service.generateRefreshToken(account);
+      await this.repository.update(authEntity.id, { refreshToken: newRefreshToken });
+      return { accessToken, refreshToken: newRefreshToken };
     } catch (error) {
+      console.error("Refresh token failed:", error);
       return null;
     }
   }
@@ -652,12 +643,17 @@ var _TwoFactorVerifyUseCase = class _TwoFactorVerifyUseCase {
   mapAdminToDTO(admin) {
     return mapper.map(admin, import_cca_entities4.AdminEntity, AdminDTO);
   }
-  mapUserToDTO(user) {
-    return mapper.map(user, import_cca_entities4.UserEntity, UserDTO);
-  }
+  // private mapUserToDTO(user: UserEntity): UserDTO {
+  //     return mapper.map(user, UserEntity, UserDTO);
+  // }
   async updateUserStatus(auth) {
-    auth.user.lastLoginAt = /* @__PURE__ */ new Date();
-    auth.user.isActive = true;
+    const account = auth.user ?? auth.admin;
+    if (account) {
+      account.lastLoginAt = /* @__PURE__ */ new Date();
+      account.isActive = true;
+    } else {
+      throw new NotFoundError("User or Admin account not found for AuthEntity");
+    }
     await this.authRepository.update(auth.id, auth);
   }
   async updateUserRefreshToken(auth, refreshToken) {
@@ -665,10 +661,15 @@ var _TwoFactorVerifyUseCase = class _TwoFactorVerifyUseCase {
     await this.authRepository.update(auth.id, { refreshToken });
   }
   generateTokens(auth) {
-    return {
-      accessToken: this.jwtService.generateAccessToken(auth.user, auth.role),
-      refreshToken: this.jwtService.generateRefreshToken(auth.user)
-    };
+    const account = auth.user ?? auth.admin;
+    if (account) {
+      return {
+        accessToken: this.jwtService.generateAccessToken(account, auth.role),
+        refreshToken: this.jwtService.generateRefreshToken(account)
+      };
+    } else {
+      throw new NotFoundError("User or Admin account not found for AuthEntity");
+    }
   }
 };
 __name(_TwoFactorVerifyUseCase, "TwoFactorVerifyUseCase");
@@ -994,24 +995,15 @@ var _AuthRepository = class _AuthRepository extends import_cca_core8.BaseReposit
   constructor(repository) {
     super(repository);
   }
-  async findByEmail(email, isAdmin) {
+  async findByEmail(email) {
     const result = await this.repository.createQueryBuilder("auth").leftJoinAndSelect("auth.user", "user").leftJoinAndSelect("auth.admin", "admin").addSelect("auth.password").where("auth.email = :email", { email }).getOne();
-    console.log("findByEmail result:", {
-      found: !!result,
-      hasPassword: !!result?.password,
-      hasUser: !!result?.user,
-      hasAdmin: !!result?.admin,
-      email: result?.email
-    });
     return result;
   }
   async create(entity) {
     return super.create(entity);
   }
   async findByUserId(userId) {
-    const query = this.repository.createQueryBuilder("auth").leftJoinAndSelect("auth.user", "user").addSelect("auth.twoFactorSecret").where("user.id = :userId", { userId });
-    return await query.getOne();
-    ;
+    return await this.repository.createQueryBuilder("auth").leftJoinAndSelect("auth.user", "user").leftJoinAndSelect("auth.admin", "admin").addSelect("auth.twoFactorSecret").where("user.id = :id OR admin.id = :id", { userId }).getOne();
   }
   async findByUseAdminId(userId, isAdmin = false) {
     const query = this.repository.createQueryBuilder("auth").addSelect("auth.twoFactorSecret");
@@ -1027,8 +1019,11 @@ var _AuthRepository = class _AuthRepository extends import_cca_core8.BaseReposit
     if (!auth) {
       throw new NotFoundError("Auth not found");
     }
-    auth.refreshToken = "";
-    auth.user.isActive = false;
+    const account = auth.user ?? auth.admin;
+    if (account) {
+      auth.refreshToken = "";
+      account.isActive = false;
+    }
     await this.update(auth.id, auth);
   }
   async updateTwoFactorSecret(userId, secret) {