fix: move code into try

didx-xyz · Dec 14, 2023 · 1d9e98c · 1d9e98c
1 parent ade5d9e
commit 1d9e98c
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/packages/backend/src/auth/middleware.ts b/packages/backend/src/auth/middleware.ts
@@ -22,6 +22,17 @@ export function authenticate(
 
     try {
       verification = jwt.verify(token, secretKey)
+
+      if (typeof verification === 'string') {
+        next(
+          new Error(
+            `Malformed JWT token: received 'string', expected 'object'`,
+          ),
+        )
+      } else {
+        ;(req as RequestWithToken).jwtPayload = verification
+        next()
+      }
     } catch (error) {
       if (error instanceof TokenExpiredError) {
         res.status(403).json({ error: 'Your token has expired.' })
@@ -33,15 +44,6 @@ export function authenticate(
         res.status(403).json({ error: 'Unknown token error.' })
       }
     }
-
-    if (typeof verification === 'string') {
-      next(
-        new Error(`Malformed JWT token: received 'string', expected 'object'`),
-      )
-    } else {
-      ;(req as RequestWithToken).jwtPayload = verification
-      next()
-    }
   } else {
     res.status(403).json({ error: 'You are not logged in.' })
   }