From 8f63733236d65c5bc4a2ea32efa2b10ca625bead Mon Sep 17 00:00:00 2001
From: Tom <20648924+moT01@users.noreply.github.com>
Date: Thu, 23 Feb 2023 06:20:04 -0600
Subject: [PATCH] refactor(api): user token db query (#49406)

---
 api-server/src/server/boot/user.js | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/api-server/src/server/boot/user.js b/api-server/src/server/boot/user.js
index 81071912c57..ee65b472ddb 100644
--- a/api-server/src/server/boot/user.js
+++ b/api-server/src/server/boot/user.js
@@ -93,22 +93,21 @@ function deleteUserTokenResponse(req, res) {
 }
 
 function createReadSessionUser(app) {
-  const { Donation } = app.models;
+  const { Donation, UserToken } = app.models;
 
   return async function getSessionUser(req, res, next) {
     const queryUser = req.user;
 
-    const userTokenArr = await queryUser.userTokens({
-      userId: queryUser.id
-    });
+    const userId = queryUser?.id;
+    const userToken = userId
+      ? await UserToken.findOne({
+          where: { userId }
+        })
+      : null;
 
-    const userToken = userTokenArr[0]?.id;
-    let encodedUserToken;
-
-    // only encode if a userToken was found
-    if (userToken) {
-      encodedUserToken = encodeUserToken(userToken);
-    }
+    const encodedUserToken = userToken
+      ? encodeUserToken(userToken.id)
+      : undefined;
 
     const source =
       queryUser &&