From 1f02ad8486bc70200200cd856de3c2bced4b085c 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 11:35:57 +0800
Subject: [PATCH 1/3] Try & fix?

---
 server/api/user/validateUserToken.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/api/user/validateUserToken.ts b/server/api/user/validateUserToken.ts
index f147a86..76a0fa3 100644
--- a/server/api/user/validateUserToken.ts
+++ b/server/api/user/validateUserToken.ts
@@ -43,7 +43,7 @@ export default defineEventHandler(async (event) => {
   }
   return {
     userAccount: fetchViaSQL[0].username,
-    firstName: "",
+    firstName: fetchViaSQL[0].firstName,
     requested_action: "CONTINUE",
     current_spot: "KEEP_LOGIN",
     email: fetchViaSQL[0].email,

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 2/3] 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 || "",
   };
 });

From a000a080edab555b17149e218091e94265916628 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:46:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=AF=AB=E9=8C=AF?=
 =?UTF-8?q?=E4=BA=86=EF=BC=8C=E5=85=A8=E9=8C=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/api/user/validateUserToken.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/api/user/validateUserToken.ts b/server/api/user/validateUserToken.ts
index 387cdd5..7451f89 100644
--- a/server/api/user/validateUserToken.ts
+++ b/server/api/user/validateUserToken.ts
@@ -48,7 +48,7 @@ export default defineEventHandler(async (event) => {
   }
   return {
     userAccount: fetchViaSQL[0].username,
-    firstName: getUserInfo[0].firstName || "",
+    firstName: getUserInfo[0].firstname || "",
     requested_action: "CONTINUE",
     current_spot: "KEEP_LOGIN",
     email: getUserInfo[0].email || "",