This commit is contained in:
parent
593058a385
commit
558adbb84f
|
|
@ -35,7 +35,6 @@ export default async function Login({
|
||||||
// console.log("...............localeString: ", {localeString});
|
// console.log("...............localeString: ", {localeString});
|
||||||
// console.log("Translation for login.email: ", t("login.email"));
|
// console.log("Translation for login.email: ", t("login.email"));
|
||||||
|
|
||||||
|
|
||||||
const supabase = createServerClient<Database>(
|
const supabase = createServerClient<Database>(
|
||||||
process.env.NEXT_PUBLIC_SUPABASE_URL!,
|
process.env.NEXT_PUBLIC_SUPABASE_URL!,
|
||||||
process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
|
process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
|
||||||
|
|
@ -49,6 +48,8 @@ export default async function Login({
|
||||||
)
|
)
|
||||||
const session = (await supabase.auth.getSession()).data.session
|
const session = (await supabase.auth.getSession()).data.session
|
||||||
|
|
||||||
|
console.log("[login page]Login session==>:", session)
|
||||||
|
|
||||||
if (session) {
|
if (session) {
|
||||||
const { data: homeWorkspace, error } = await supabase
|
const { data: homeWorkspace, error } = await supabase
|
||||||
.from("workspaces")
|
.from("workspaces")
|
||||||
|
|
@ -61,7 +62,7 @@ export default async function Login({
|
||||||
throw new Error(error.message)
|
throw new Error(error.message)
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("1======>Redirecting to workspace:", homeWorkspace.id)
|
console.log("[login page]======>Redirecting to workspace:", homeWorkspace.id)
|
||||||
return redirect(`/${localeString}/${homeWorkspace.id}/chat`)
|
return redirect(`/${localeString}/${homeWorkspace.id}/chat`)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -80,7 +81,7 @@ export default async function Login({
|
||||||
})
|
})
|
||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
console.log(`==================> ${localeString}/login?message=${error.message}`);
|
console.log(`[login page]==================> ${localeString}/login?message=${error.message}`);
|
||||||
return redirect(`/${localeString}/login?message=${error.message}`)
|
return redirect(`/${localeString}/login?message=${error.message}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -97,7 +98,7 @@ export default async function Login({
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("2======>Redirecting to workspace:", homeWorkspace.id)
|
console.log("[login page] SignIn======>Redirecting to workspace:", homeWorkspace.id)
|
||||||
return redirect(`/${localeString}/${homeWorkspace.id}/chat`)
|
return redirect(`/${localeString}/${homeWorkspace.id}/chat`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -113,6 +114,7 @@ export default async function Login({
|
||||||
const signUp = async (formData: FormData) => {
|
const signUp = async (formData: FormData) => {
|
||||||
"use server"
|
"use server"
|
||||||
|
|
||||||
|
|
||||||
const email = formData.get("email") as string
|
const email = formData.get("email") as string
|
||||||
const password = formData.get("password") as string
|
const password = formData.get("password") as string
|
||||||
|
|
||||||
|
|
@ -134,6 +136,7 @@ export default async function Login({
|
||||||
const emailMatch = emailWhitelist?.includes(email)
|
const emailMatch = emailWhitelist?.includes(email)
|
||||||
if (!domainMatch && !emailMatch) {
|
if (!domainMatch && !emailMatch) {
|
||||||
const errorMessage = t("login.signupNotAllowed", { email }) // ← 这是字符串
|
const errorMessage = t("login.signupNotAllowed", { email }) // ← 这是字符串
|
||||||
|
console.log(`[login page] SignUp======>Redirecting to workspace:, ${errorMessage}`)
|
||||||
return redirect(
|
return redirect(
|
||||||
// `/${localeString}/login?message=Email ${email} is not allowed to sign up.`
|
// `/${localeString}/login?message=Email ${email} is not allowed to sign up.`
|
||||||
`/${localeString}/login?message=${errorMessage}`
|
`/${localeString}/login?message=${errorMessage}`
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue