From d93470d183717bb0c2a3b6a2afcd86a7b6a636b4 Mon Sep 17 00:00:00 2001
From: Sabir Hassan <sabirbk06@gmail.com>
Date: Wed, 21 Sep 2022 22:27:27 +0500
Subject: [PATCH] chore: improve code

---
 api/src/controllers/auth.ts      |  2 +-
 api/src/utils/getTokensFromDB.ts | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/api/src/controllers/auth.ts b/api/src/controllers/auth.ts
index 8d01d7b..737468e 100644
--- a/api/src/controllers/auth.ts
+++ b/api/src/controllers/auth.ts
@@ -74,7 +74,7 @@ const token = async (data: any): Promise<TokenResponse> => {
 
   AuthController.deleteCode(userInfo.userId, clientId)
 
-  // // get tokens from DB
+  // get tokens from DB
   const existingTokens = await getTokensFromDB(userInfo.userId, clientId)
   if (existingTokens) {
     return {
diff --git a/api/src/utils/getTokensFromDB.ts b/api/src/utils/getTokensFromDB.ts
index 68a47e6..7b3d3db 100644
--- a/api/src/utils/getTokensFromDB.ts
+++ b/api/src/utils/getTokensFromDB.ts
@@ -24,17 +24,11 @@ export const getTokensFromDB = async (userId: number, clientId: string) => {
     )
 
     if (
-      verifiedAccessToken?.userId !== userId ||
-      verifiedAccessToken?.clientId !== clientId
+      verifiedAccessToken?.userId === userId &&
+      verifiedAccessToken?.clientId === clientId &&
+      verifiedRefreshToken?.userId === userId &&
+      verifiedRefreshToken?.clientId === clientId
     )
-      return
-
-    if (
-      verifiedRefreshToken?.userId !== userId ||
-      verifiedRefreshToken?.clientId !== clientId
-    )
-      return
-
-    return { accessToken, refreshToken }
+      return { accessToken, refreshToken }
   }
 }