diff --git a/web/app/account/oauth/authorize/constants.ts b/web/app/account/oauth/authorize/constants.ts deleted file mode 100644 index f1d8b98ef4..0000000000 --- a/web/app/account/oauth/authorize/constants.ts +++ /dev/null @@ -1,3 +0,0 @@ -export const OAUTH_AUTHORIZE_PENDING_KEY = 'oauth_authorize_pending' -export const REDIRECT_URL_KEY = 'oauth_redirect_url' -export const OAUTH_AUTHORIZE_PENDING_TTL = 60 * 3 diff --git a/web/app/account/oauth/authorize/page.tsx b/web/app/account/oauth/authorize/page.tsx index c923d6457a..d718e0941d 100644 --- a/web/app/account/oauth/authorize/page.tsx +++ b/web/app/account/oauth/authorize/page.tsx @@ -7,7 +7,6 @@ import { RiMailLine, RiTranslate2, } from '@remixicon/react' -import dayjs from 'dayjs' import { useRouter, useSearchParams } from 'next/navigation' import * as React from 'react' import { useEffect, useRef } from 'react' @@ -17,22 +16,10 @@ import Button from '@/app/components/base/button' import Loading from '@/app/components/base/loading' import Toast from '@/app/components/base/toast' import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks' +import { setPostLoginRedirect } from '@/app/signin/utils/post-login-redirect' import { useAppContext } from '@/context/app-context' import { useIsLogin } from '@/service/use-common' import { useAuthorizeOAuthApp, useOAuthAppInfo } from '@/service/use-oauth' -import { - OAUTH_AUTHORIZE_PENDING_KEY, - OAUTH_AUTHORIZE_PENDING_TTL, - REDIRECT_URL_KEY, -} from './constants' - -function setItemWithExpiry(key: string, value: string, ttl: number) { - const item = { - value, - expiry: dayjs().add(ttl, 'seconds').unix(), - } - localStorage.setItem(key, JSON.stringify(item)) -} function buildReturnUrl(pathname: string, search: string) { try { @@ -86,8 +73,8 @@ export default function OAuthAuthorize() { const onLoginSwitchClick = () => { try { const returnUrl = buildReturnUrl('/account/oauth/authorize', `?client_id=${encodeURIComponent(client_id)}&redirect_uri=${encodeURIComponent(redirect_uri)}`) - setItemWithExpiry(OAUTH_AUTHORIZE_PENDING_KEY, returnUrl, OAUTH_AUTHORIZE_PENDING_TTL) - router.push(`/signin?${REDIRECT_URL_KEY}=${encodeURIComponent(returnUrl)}`) + setPostLoginRedirect(returnUrl) + router.push('/signin') } catch { router.push('/signin') @@ -145,7 +132,7 @@ export default function OAuthAuthorize() {
+
{t('checkCode.tipsPrefix', { ns: 'login' })} {email} @@ -107,7 +107,7 @@ export default function CheckCode() {