From f2743c992f4c53df294ada1ef564c9b1dd5769ff Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Thu, 5 Dec 2019 13:18:06 +0100
Subject: [PATCH] Use transaction function jwt/decode

---
 backend/src/jwt/decode.js | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/backend/src/jwt/decode.js b/backend/src/jwt/decode.js
index 5b7881d20..3b0efea57 100644
--- a/backend/src/jwt/decode.js
+++ b/backend/src/jwt/decode.js
@@ -11,27 +11,30 @@ export default async (driver, authorizationHeader) => {
   } catch (err) {
     return null
   }
-  const query = `
-    MATCH (user:User {id: $id, deleted: false, disabled: false })
-    SET user.lastActiveAt = toString(datetime())
-    RETURN user {.id, .slug, .name, .avatar, .email, .role, .disabled, .actorId}
-    LIMIT 1
-  `
   const session = driver.session()
-  let result
 
+  const writeTxResultPromise = session.writeTransaction(async txc => {
+    const updateUserLastActiveTransactionResponse = await txc.run(
+      ` 
+        MATCH (user:User {id: $id, deleted: false, disabled: false })
+        SET user.lastActiveAt = toString(datetime())
+        RETURN user {.id, .slug, .name, .avatar, .email, .role, .disabled, .actorId}
+        LIMIT 1
+      `,
+      { id },
+    )
+    return updateUserLastActiveTransactionResponse.records.map(
+      record => record.get('user'),
+    )
+  })
   try {
-    result = await session.run(query, { id })
+    const [currentUser] = await writeTxResultPromise
+     if (!currentUser) return null
+     return {
+      token,
+      ...currentUser,
+    }
   } finally {
     session.close()
   }
-
-  const [currentUser] = await result.records.map(record => {
-    return record.get('user')
-  })
-  if (!currentUser) return null
-  return {
-    token,
-    ...currentUser,
-  }
 }