From 9ef24864b85e91eec98a0d52a16e74be97dc4cc1 Mon Sep 17 00:00:00 2001
From: Morgan Vernay <morgan@cal.com>
Date: Wed, 20 Dec 2023 19:13:56 +0100
Subject: [PATCH] fixup! chore(platform): OAuth Flow (#12798)

---
 apps/api/v2/src/modules/oauth/flow/oauth-flow.service.ts | 6 +++---
 apps/api/v2/src/modules/tokens/tokens.repository.ts      | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/api/v2/src/modules/oauth/flow/oauth-flow.service.ts b/apps/api/v2/src/modules/oauth/flow/oauth-flow.service.ts
index 28a38c8d0d..803ab4ce08 100644
--- a/apps/api/v2/src/modules/oauth/flow/oauth-flow.service.ts
+++ b/apps/api/v2/src/modules/oauth/flow/oauth-flow.service.ts
@@ -27,13 +27,13 @@ export class OAuthFlowService {
       return true;
     }
 
-    const token = await this.tokensRepository.getAccessTokenBySecret(secret);
+    const tokenExpiresAt = await this.tokensRepository.getAccessTokenExpiryDate(secret);
 
-    if (!token) {
+    if (!tokenExpiresAt) {
       throw new UnauthorizedException();
     }
 
-    if (new Date() > token?.expiresAt) {
+    if (new Date() > tokenExpiresAt) {
       throw new BadRequestException("Token is expired");
     }
 
diff --git a/apps/api/v2/src/modules/tokens/tokens.repository.ts b/apps/api/v2/src/modules/tokens/tokens.repository.ts
index e72ed06e3b..2126e8213d 100644
--- a/apps/api/v2/src/modules/tokens/tokens.repository.ts
+++ b/apps/api/v2/src/modules/tokens/tokens.repository.ts
@@ -59,8 +59,8 @@ export class TokensRepository {
     };
   }
 
-  async getAccessTokenBySecret(secret: string) {
-    return this.dbRead.prisma.accessToken.findFirst({
+  async getAccessTokenExpiryDate(secret: string) {
+    const accessToken = await this.dbRead.prisma.accessToken.findFirst({
       where: {
         secret,
       },
@@ -68,6 +68,7 @@ export class TokensRepository {
         expiresAt: true,
       },
     });
+    return accessToken?.expiresAt;
   }
 
   async refreshOAuthTokens(clientId: string, refreshTokenSecret: string, tokenUserId: number) {