From ea2d7688b1cb11ca6a0181fe6b4da86129628553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B3=E5=85=83=E7=9A=93?= <hw@yuanhau.com>
Date: Tue, 17 Jun 2025 14:30:49 +0800
Subject: [PATCH] Fix validateUserToken w/ fetching data from the main users
 table.

---
 server/api/user/validateUserToken.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/server/api/user/validateUserToken.ts b/server/api/user/validateUserToken.ts
index 76a0fa3..387cdd5 100644
--- a/server/api/user/validateUserToken.ts
+++ b/server/api/user/validateUserToken.ts
@@ -30,6 +30,11 @@ export default defineEventHandler(async (event) => {
     };
   }
 
+  const getUserInfo = await sql`
+    SELECT * FROM users
+    WHERE username = ${fetchViaSQL[0].username}
+    `;
+
   const tokenDate = new Date(fetchViaSQL[0].created_at);
   const now = new Date();
   const dayInMilliseconds = 24 * 60 * 60 * 1000;
@@ -43,10 +48,10 @@ export default defineEventHandler(async (event) => {
   }
   return {
     userAccount: fetchViaSQL[0].username,
-    firstName: fetchViaSQL[0].firstName,
+    firstName: getUserInfo[0].firstName || "",
     requested_action: "CONTINUE",
     current_spot: "KEEP_LOGIN",
-    email: fetchViaSQL[0].email,
-    avatarURL: fetchViaSQL[0].avatarurl,
+    email: getUserInfo[0].email || "",
+    avatarURL: getUserInfo[0].avatarurl || "",
   };
 });