From efecdccf35beed86353287216fabd118796924c5 Mon Sep 17 00:00:00 2001 From: Joel Date: Thu, 6 Jun 2024 15:01:58 +0800 Subject: [PATCH 01/97] feat: support login by given mail (#4991) --- web/app/layout.tsx | 3 ++- web/app/signin/normalForm.tsx | 8 +++++--- web/config/index.ts | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/web/app/layout.tsx b/web/app/layout.tsx index ca665fb360a36..fedf66045adac 100644 --- a/web/app/layout.tsx +++ b/web/app/layout.tsx @@ -39,11 +39,12 @@ const LocaleLayout = ({ data-api-prefix={process.env.NEXT_PUBLIC_API_PREFIX} data-pubic-api-prefix={process.env.NEXT_PUBLIC_PUBLIC_API_PREFIX} data-public-edition={process.env.NEXT_PUBLIC_EDITION} + data-public-support-mail-login={process.env.NEXT_PUBLIC_SUPPORT_MAIL_LOGIN} data-public-sentry-dsn={process.env.NEXT_PUBLIC_SENTRY_DSN} data-public-maintenance-notice={process.env.NEXT_PUBLIC_MAINTENANCE_NOTICE} data-public-site-about={process.env.NEXT_PUBLIC_SITE_ABOUT} > - + {children} diff --git a/web/app/signin/normalForm.tsx b/web/app/signin/normalForm.tsx index aba658b3ce229..f6abf0d6c0f38 100644 --- a/web/app/signin/normalForm.tsx +++ b/web/app/signin/normalForm.tsx @@ -7,7 +7,7 @@ import useSWR from 'swr' import Link from 'next/link' import Toast from '../components/base/toast' import style from './page.module.css' -import { IS_CE_EDITION, apiPrefix } from '@/config' +import { IS_CE_EDITION, SUPPORT_MAIL_LOGIN, apiPrefix } from '@/config' import Button from '@/app/components/base/button' import { login, oauth } from '@/service/common' import { getPurifyHref } from '@/utils' @@ -62,6 +62,8 @@ function reducer(state: IState, action: IAction) { const NormalForm = () => { const { t } = useTranslation() + const useEmailLogin = IS_CE_EDITION || SUPPORT_MAIL_LOGIN + const router = useRouter() const [state, dispatch] = useReducer(reducer, { @@ -150,7 +152,7 @@ const NormalForm = () => {
- {!IS_CE_EDITION && ( + {!useEmailLogin && (
@@ -194,7 +196,7 @@ const NormalForm = () => { )} { - IS_CE_EDITION && <> + useEmailLogin && <> {/*