From b7bbd9e44f6bbb7e11c55e88410a07fbe2bf4b7a Mon Sep 17 00:00:00 2001 From: hailin Date: Tue, 22 Apr 2025 17:29:26 +0800 Subject: [PATCH] . --- app/[locale]/login/page.tsx | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/app/[locale]/login/page.tsx b/app/[locale]/login/page.tsx index 5c5ddd4..4fc6a24 100644 --- a/app/[locale]/login/page.tsx +++ b/app/[locale]/login/page.tsx @@ -76,8 +76,8 @@ export default async function Login({ if (error) { // console.log(`[login page]==================> ${localeString}/login?message=${error.message}`); - // return redirect(`/${localeString}/login?message=${error.message}`) - return redirect(`/${localeString}/login?message=signupNotAllowed&email=${encodeURIComponent(email)}`) + return redirect(`/${localeString}/login?message=${error.message}`) + // return redirect(`/${localeString}/login?message=signupNotAllowed&email=${encodeURIComponent(email)}`) } const { data: homeWorkspace, error: homeWorkspaceError } = await supabase @@ -90,12 +90,11 @@ export default async function Login({ if (!homeWorkspace) { //const fallbackMessage = String(t("login.unexpectedError")) throw new Error( - // homeWorkspaceError?.message || "An unexpected error occurred" - homeWorkspaceError?.message || t("login.unexpectedError") + homeWorkspaceError?.message || "An unexpected error occurred" + // homeWorkspaceError?.message || t("login.unexpectedError") ) } - // console.log("[login page] SignIn======>Redirecting to workspace:", homeWorkspace.id) return redirect(`/${localeString}/${homeWorkspace.id}/chat`) } @@ -133,9 +132,8 @@ export default async function Login({ const emailMatch = emailWhitelist?.includes(email) if (!domainMatch && !emailMatch) { return redirect( - // `/${localeString}/login?message=Email ${email} is not allowed to sign up.` - `/${localeString}/login?message=signupNotAllowed&email=${encodeURIComponent(email)}` - + `/${localeString}/login?message=Email ${email} is not allowed to sign up.` + // `/${localeString}/login?message=signupNotAllowed&email=${encodeURIComponent(email)}` ) } } @@ -157,7 +155,6 @@ export default async function Login({ return redirect(`/${localeString}/login?message=${error.message}`) } - console.log("2..................Redirecting with locale:", localeString) return redirect(`/${localeString}/setup`) // USE IF YOU WANT TO SEND EMAIL VERIFICATION, ALSO CHANGE TOML FILE