This commit is contained in:
parent
620b1b723b
commit
b7bbd9e44f
|
|
@ -76,8 +76,8 @@ export default async function Login({
|
||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
// console.log(`[login page]==================> ${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}`)
|
||||||
return redirect(`/${localeString}/login?message=signupNotAllowed&email=${encodeURIComponent(email)}`)
|
// return redirect(`/${localeString}/login?message=signupNotAllowed&email=${encodeURIComponent(email)}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
const { data: homeWorkspace, error: homeWorkspaceError } = await supabase
|
const { data: homeWorkspace, error: homeWorkspaceError } = await supabase
|
||||||
|
|
@ -90,12 +90,11 @@ export default async function Login({
|
||||||
if (!homeWorkspace) {
|
if (!homeWorkspace) {
|
||||||
//const fallbackMessage = String(t("login.unexpectedError"))
|
//const fallbackMessage = String(t("login.unexpectedError"))
|
||||||
throw new Error(
|
throw new Error(
|
||||||
// homeWorkspaceError?.message || "An unexpected error occurred"
|
homeWorkspaceError?.message || "An unexpected error occurred"
|
||||||
homeWorkspaceError?.message || t("login.unexpectedError")
|
// homeWorkspaceError?.message || t("login.unexpectedError")
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// console.log("[login page] SignIn======>Redirecting to workspace:", homeWorkspace.id)
|
|
||||||
return redirect(`/${localeString}/${homeWorkspace.id}/chat`)
|
return redirect(`/${localeString}/${homeWorkspace.id}/chat`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -133,9 +132,8 @@ export default async function Login({
|
||||||
const emailMatch = emailWhitelist?.includes(email)
|
const emailMatch = emailWhitelist?.includes(email)
|
||||||
if (!domainMatch && !emailMatch) {
|
if (!domainMatch && !emailMatch) {
|
||||||
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=signupNotAllowed&email=${encodeURIComponent(email)}`
|
// `/${localeString}/login?message=signupNotAllowed&email=${encodeURIComponent(email)}`
|
||||||
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -157,7 +155,6 @@ export default async function Login({
|
||||||
return redirect(`/${localeString}/login?message=${error.message}`)
|
return redirect(`/${localeString}/login?message=${error.message}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("2..................Redirecting with locale:", localeString)
|
|
||||||
return redirect(`/${localeString}/setup`)
|
return redirect(`/${localeString}/setup`)
|
||||||
|
|
||||||
// USE IF YOU WANT TO SEND EMAIL VERIFICATION, ALSO CHANGE TOML FILE
|
// USE IF YOU WANT TO SEND EMAIL VERIFICATION, ALSO CHANGE TOML FILE
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue