From 1eb15058d7931b7b8c5383995c085c8a2ffcc682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B3=E5=85=83=E7=9A=93?= Date: Sat, 7 Jun 2025 15:49:28 +0800 Subject: [PATCH] Spent a hour fixing the login & registing system & also finding errors in the custom groq api system (also a typo wasted way too much time) --- server/api/ai/summarize/[slug].ts | 1 + server/api/user/login.ts | 38 ++++++++++++++++----------- server/components/customgroqsystem.ts | 4 +-- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/server/api/ai/summarize/[slug].ts b/server/api/ai/summarize/[slug].ts index 8f372a6..db53687 100644 --- a/server/api/ai/summarize/[slug].ts +++ b/server/api/ai/summarize/[slug].ts @@ -11,6 +11,7 @@ export default defineEventHandler(async (event) => { const protocol = getRequestProtocol(event); const slug = getRouterParam(event, "slug"); const userToken = getCookie(event, "token") || ""; + console.log("Token: ", userToken); const doesTheUserHasACustomGroqApiAndWhatIsIt = await checkIfUserHasCustomGroqKey(userToken); let groqClient = groq; diff --git a/server/api/user/login.ts b/server/api/user/login.ts index 6d12a53..7ec6111 100644 --- a/server/api/user/login.ts +++ b/server/api/user/login.ts @@ -46,13 +46,18 @@ export default defineEventHandler(async (event) => { }; } const createOtherFields = await sql` - insert into user_other_data(user_id, user, translate_enabled, translate_provider, remove_translate_popup) - values (${userUUID}, ${username}, false, 'google', false) + insert into user_other_data(user_id, username, translate_enabled, translate_provider, remove_translate_popup, starred_news) + values (${userUUID}, ${username}, false, 'google', false, '{}'::JSON) `; const newToken = uuidv4(); + await sql` + INSERT INTO usertokens (username, token) + VALUES (${username}, ${newToken}) + `; + + setCookie(event, "token", newToken); return { - user: fetchUserInfo, - token: newToken, + user: fetchUserInfoAgain, }; } else { const isValid = await argon2.verify( @@ -64,19 +69,20 @@ export default defineEventHandler(async (event) => { error: "PASSWORD_NO_MATCH", }; } - } - const newToken = uuidv4(); - const fetchUserInfoAgain = await sql` - select * from users - where username = ${username}`; - await sql` - INSERT INTO usertokens (user, token) - VALUES ('${fetchUserInfo[0].username}', '${newToken}') + const newToken = uuidv4(); + const fetchUserInfoAgain = await sql` + select * from users + where username = ${username}`; + await sql` + INSERT INTO usertokens (username, token) + VALUES (${fetchUserInfoAgain[0].username}, ${newToken}) `; - setCookie(event, "token", newToken); - return { - user: fetchUserInfoAgain, - }; + + setCookie(event, "token", newToken); + return { + user: fetchUserInfoAgain, + }; + } } catch (e) { console.log(e); return { diff --git a/server/components/customgroqsystem.ts b/server/components/customgroqsystem.ts index 49c9484..6995d7f 100644 --- a/server/components/customgroqsystem.ts +++ b/server/components/customgroqsystem.ts @@ -9,7 +9,7 @@ export async function checkIfUserHasCustomGroqKey(token?: string) { } const checkRealToken = await sql` select * from usertokens - where tokens=${token} + where token = ${token} `; if (checkRealToken.length === 0) { return { @@ -28,6 +28,6 @@ export async function checkIfUserHasCustomGroqKey(token?: string) { } return { status: true, - customAPi: fetchUserToken[0].groq_api_key, + customApi: fetchUserToken[0].groq_api_key, }; }