From c9a8e9967af7c39c1f205fb8db3a2d50b94bc915 Mon Sep 17 00:00:00 2001
From: Igor Propisnov <info@igor-propisnov.com>
Date: Mon, 9 Sep 2024 09:32:43 +0200
Subject: [PATCH] fix token issue

---
 .../services/email-verification.service.ts    | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/backend/src/modules/verify-module/services/email-verification.service.ts b/backend/src/modules/verify-module/services/email-verification.service.ts
index 1a7b603..9d5ca88 100644
--- a/backend/src/modules/verify-module/services/email-verification.service.ts
+++ b/backend/src/modules/verify-module/services/email-verification.service.ts
@@ -88,24 +88,19 @@ export class EmailVerificationService {
     emailToVerify: string
   ): Promise<SuccessDto> {
     try {
-      const findTokenAndEmail: EmailVerification | null =
-        await this.emailVerifyRepository.findValidVerification(
-          tokenToVerify,
-          emailToVerify
-        );
+      const token = await this.emailVerifyRepository.findByTokenAndEmail(
+        tokenToVerify,
+        emailToVerify
+      );
 
-      if (!findTokenAndEmail) {
-        const expiredToken =
-          await this.emailVerifyRepository.findByTokenAndEmail(
-            tokenToVerify,
-            emailToVerify
-          );
+      if (!token) {
+        throw new TokenExpiredException();
+      }
 
-        if (expiredToken) {
-          throw new TokenExpiredException();
-        }
+      const currentDate = new Date();
 
-        return { success: false };
+      if (token.expiresAt.getTime() < currentDate.getTime()) {
+        throw new TokenExpiredException();
       }
 
       await this.emailVerifyRepository.removeEmailVerificationByTokenAndEmail(