Merge pull request #38 from Brints/update-user

feat: refactoring login attempts provider
Brints · Sep 29, 2024 · b4fb21d · b4fb21d
2 parents a2204c2 + b4630ff
commit b4fb21d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 19 deletions.
diff --git a/brints-estate-api/src/auth/providers/login-user.provider.ts b/brints-estate-api/src/auth/providers/login-user.provider.ts
@@ -9,13 +9,17 @@ import { CustomException } from '../../exceptions/custom.exception';
 import { GenerateTokensProvider } from './generate-tokens.provider';
 import { AccountStatus } from '../../enums/account-status.enum';
 import { LoginAttemptsProvider } from '../../login-attempts/providers/login-attempts.provider';
+import { LoginAttempts } from 'src/login-attempts/entities/login-attempt.entity';
 
 @Injectable()
 export class LoginUserProvider {
   constructor(
     @InjectRepository(User)
     private readonly userRepository: Repository<User>,
 
+    @InjectRepository(LoginAttempts)
+    private readonly loginAttemptsRepository: Repository<LoginAttempts>,
+
     @Inject(forwardRef(() => HashingProvider))
     private readonly hashingProvider: HashingProvider,
 
@@ -34,20 +38,34 @@ export class LoginUserProvider {
       throw new CustomException(HttpStatus.NOT_FOUND, 'User not found');
     }
 
+    const loginAttempts = await this.loginAttemptsRepository.findOne({
+      where: { id: user.login_attempts.id },
+    });
+
+    if (!loginAttempts) {
+      throw new CustomException(
+        HttpStatus.NOT_FOUND,
+        'Login attempts does not exist.',
+      );
+    }
+
     if (
-      user.login_attempts.isBlocked &&
-      user.login_attempts.blockedUntil &&
-      user.login_attempts.blockedUntil < new Date()
+      loginAttempts.isBlocked &&
+      loginAttempts.blockedUntil &&
+      loginAttempts.blockedUntil > new Date()
     ) {
-      await this.loginAttemptsProvider.resetLoginAttempts(user);
+      await this.loginAttemptsProvider.attemptedLoginWhileBlocked(user);
     }
 
     if (
-      user.login_attempts.isBlocked &&
-      user.login_attempts.blockedUntil &&
-      user.login_attempts.blockedUntil < new Date()
+      loginAttempts.isBlocked &&
+      loginAttempts.blockedUntil &&
+      loginAttempts.blockedUntil < new Date()
     ) {
-      await this.loginAttemptsProvider.attemptedLoginWhileBlocked(user);
+      await this.loginAttemptsProvider.resetLoginAttempts(
+        user,
+        user.login_attempts,
+      );
     }
 
     const passwordMatch: boolean = await this.hashingProvider.comparePassword(

diff --git a/brints-estate-api/src/login-attempts/providers/login-attempts.provider.ts b/brints-estate-api/src/login-attempts/providers/login-attempts.provider.ts
@@ -22,17 +22,10 @@ export class LoginAttemptsProvider {
     return false;
   }
 
-  public async resetLoginAttempts(user: User): Promise<void> {
-    const loginAttempts = await this.loginAttemptsRepository.findOne({
-      where: { id: user.login_attempts.id },
-    });
-
-    if (!loginAttempts)
-      throw new CustomException(
-        HttpStatus.NOT_FOUND,
-        'Login attempts does not exist.',
-      );
-
+  public async resetLoginAttempts(
+    user: User,
+    loginAttempts: LoginAttempts,
+  ): Promise<void> {
     loginAttempts.isBlocked = false;
     loginAttempts.blockedUntil = null;
     await this.loginAttemptsRepository.save(loginAttempts);