services/api/src/api/v1/services/auth-token-handler.js

@@ -10,7 +10,7 @@ module.exports = ({ services: { sortRolesByLevel, signJwt } }) => {
 
   const { claimsNamespace, jwtExpirationInHours } = config
 
-  function validateAuthToken(authTokenJwt) {
+  async function validateAuthToken(authTokenJwt) {
     try {
       const { authToken } = jwtDecode(authTokenJwt)
       return authToken
@@ -28,6 +28,7 @@ module.exports = ({ services: { sortRolesByLevel, signJwt } }) => {
     let deviceId
     let roles
 
+    try {
       const [row] = await sql`
         SELECT
           "user_id" as "userId",
@@ -37,12 +38,11 @@ module.exports = ({ services: { sortRolesByLevel, signJwt } }) => {
         WHERE
           "auth_token" = ${authToken}
         `
-    if (!row) {
-      throw httpError(410, "Auth token not found")
-    }
-
       userId = row.userId
       deviceId = row.deviceId
+    } catch (e) {
+      throw httpError(410, "Auth token not found")
+    }
 
     if (!userId) {
       await sql.begin(async (sql) => {