chore: improve code

sasjs · Sep 21, 2022 · d93470d · d93470d
1 parent 330c020
commit d93470d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git 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
@@ -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 }
   }
 }