From 8a38cd59e24d9b0a3742832981c7da7889fe3598 Mon Sep 17 00:00:00 2001 From: NFish Date: Thu, 29 May 2025 17:50:35 +0800 Subject: [PATCH] fix: add 'back to home' link when webapp sign in failed --- web/app/(shareLayout)/webapp-signin/page.tsx | 13 +++++++++++-- web/i18n/en-US/share-app.ts | 3 +++ web/i18n/ja-JP/share-app.ts | 3 +++ web/i18n/zh-Hans/share-app.ts | 3 +++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/web/app/(shareLayout)/webapp-signin/page.tsx b/web/app/(shareLayout)/webapp-signin/page.tsx index 2e3c82d33d..e7609f1de0 100644 --- a/web/app/(shareLayout)/webapp-signin/page.tsx +++ b/web/app/(shareLayout)/webapp-signin/page.tsx @@ -11,6 +11,7 @@ import AppUnavailable from '@/app/components/base/app-unavailable' import NormalForm from './normalForm' import { AccessMode } from '@/models/access-control' import ExternalMemberSsoAuth from './components/external-member-sso-auth' +import Link from 'next/link' const WebSSOForm: FC = () => { const { t } = useTranslation() @@ -23,10 +24,16 @@ const WebSSOForm: FC = () => { const tokenFromUrl = searchParams.get('web_sso_token') const message = searchParams.get('message') - const showErrorToast = (message: string) => { + const getSigninUrl = useCallback(() => { + const params = new URLSearchParams(searchParams) + params.delete('message') + return `/webapp-signin?${params.toString()}` + }, [searchParams]) + + const showErrorToast = (msg: string) => { Toast.notify({ type: 'error', - message, + message: msg, }) } @@ -63,6 +70,7 @@ const WebSSOForm: FC = () => { if (message) { return
+ {t('share.login.backToHome')}
} if (!redirectUrl) { @@ -92,6 +100,7 @@ const WebSSOForm: FC = () => { return
+ {t('share.login.backToHome')}
} diff --git a/web/i18n/en-US/share-app.ts b/web/i18n/en-US/share-app.ts index bf99005d71..ab589ffb76 100644 --- a/web/i18n/en-US/share-app.ts +++ b/web/i18n/en-US/share-app.ts @@ -77,6 +77,9 @@ const translation = { atLeastOne: 'Please input at least one row in the uploaded file.', }, }, + login: { + backToHome: 'Back to Home', + }, } export default translation diff --git a/web/i18n/ja-JP/share-app.ts b/web/i18n/ja-JP/share-app.ts index 9db8926394..e4eeced979 100644 --- a/web/i18n/ja-JP/share-app.ts +++ b/web/i18n/ja-JP/share-app.ts @@ -73,6 +73,9 @@ const translation = { atLeastOne: '1行以上のデータが必要です', }, }, + login: { + backToHome: 'ホームに戻る', + }, } export default translation diff --git a/web/i18n/zh-Hans/share-app.ts b/web/i18n/zh-Hans/share-app.ts index 3e89aec041..a7d1cb92bc 100644 --- a/web/i18n/zh-Hans/share-app.ts +++ b/web/i18n/zh-Hans/share-app.ts @@ -73,6 +73,9 @@ const translation = { atLeastOne: '上传文件的内容不能少于一条', }, }, + login: { + backToHome: '返回首页', + }, } export default translation