Refactor and enhance user authentication in AuthService

libs/common/src/auth/services/auth.service.ts

@@ -33,33 +33,34 @@ export class AuthService {
     const user = await this.userRepository.findOne({
       where: {
         email,
-        region: regionUuid
+        region: regionUuid ? { uuid: regionUuid } : undefined,
-          ? {
-              uuid: regionUuid,
-            }
-          : undefined,
       },
       relations: ['roleType'],
     });
 
+    if (!user) {
+      throw new BadRequestException('Invalid credentials');
+    }
+
     if (!user.isUserVerified) {
       throw new BadRequestException('User is not verified');
     }
     if (!user.isActive) {
       throw new BadRequestException('User is not active');
     }
-    if (user) {
+
-      const passwordMatch = this.helperHashService.bcryptCompare(
+    const passwordMatch = await this.helperHashService.bcryptCompare(
       pass,
       user.password,
     );
-      if (passwordMatch) {
+    if (!passwordMatch) {
-        const { ...result } = user;
+      throw new BadRequestException('Invalid credentials');
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { password, ...result } = user;
     return result;
   }
-    }
-    return null;
-  }
 
   async createSession(data): Promise<UserSessionEntity> {
     return await this.sessionRepository.save(data);