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,22 +28,22 @@ module.exports = ({ services: { sortRolesByLevel, signJwt } }) => {
     let deviceId
     let roles
 
-    const [row] = await sql`
+    try {
-      SELECT
+      const [row] = await sql`
-        "user_id" as "userId",
+        SELECT
-        "device_id" as "deviceId"
+          "user_id" as "userId",
-      FROM
+          "device_id" as "deviceId"
-        "auth_token"
+        FROM
-      WHERE
+          "auth_token"
-        "auth_token" = ${authToken}
+        WHERE
-      `
+          "auth_token" = ${authToken}
-    if (!row) {
+        `
+      userId = row.userId
+      deviceId = row.deviceId
+    } catch (e) {
       throw httpError(410, "Auth token not found")
     }
 
-    userId = row.userId
-    deviceId = row.deviceId
-
     if (!userId) {
       await sql.begin(async (sql) => {
         await sql`set constraints all deferred`