From 2fd444d7009e1b8cd598d68bd5b3127027fd80d4 Mon Sep 17 00:00:00 2001
From: Innei <i@innei.in>
Date: Sat, 27 Jul 2024 15:18:08 +0800
Subject: [PATCH] fix: update clerk auth

Signed-off-by: Innei <i@innei.in>
---
 apps/core/src/modules/auth/auth.service.ts | 40 ++++++++++------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/apps/core/src/modules/auth/auth.service.ts b/apps/core/src/modules/auth/auth.service.ts
index 6d23cea5..37887ecd 100644
--- a/apps/core/src/modules/auth/auth.service.ts
+++ b/apps/core/src/modules/auth/auth.service.ts
@@ -136,32 +136,30 @@ export class AuthService {
 
     if (!enable) return false
 
-    if (jwtToken === undefined) {
+    if (jwtToken === undefined || !jwtToken) {
       return false
     }
 
     try {
-      if (jwtToken) {
-        const { sub: userId } = jwt.verify(jwtToken, pemKey) as {
-          sub: string
-        }
-
-        let clerkClient: ClerkClient
-        if (this.clerkClientLRU.has(secretKey)) {
-          clerkClient = this.clerkClientLRU.get(secretKey)!
-        } else {
-          clerkClient = createClerkClient({
-            secretKey,
-          })
-
-          this.clerkClientLRU.set(secretKey, clerkClient, { size: 1 })
-        }
-
-        // 1. promise user is exist
-        const user = await clerkClient.users.getUser(userId)
-
-        return user.id === adminUserId
+      const { sub: userId } = jwt.verify(jwtToken, pemKey) as {
+        sub: string
       }
+
+      let clerkClient: ClerkClient
+      if (this.clerkClientLRU.has(secretKey)) {
+        clerkClient = this.clerkClientLRU.get(secretKey)!
+      } else {
+        clerkClient = createClerkClient({
+          secretKey,
+        })
+
+        this.clerkClientLRU.set(secretKey, clerkClient, { size: 1 })
+      }
+
+      // 1. promise user is exist
+      const user = await clerkClient.users.getUser(userId)
+
+      return user.id === adminUserId
     } catch (error) {
       this.logger.debug(`clerk jwt valid error: ${error.message}`)
       return false