Skip to content

Commit 333cf31

Browse files
committed
feat: social login redirect
1 parent f4471a4 commit 333cf31

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

web/app/account/oauth/authorize/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
} from '@remixicon/react'
2020

2121
export const OAUTH_AUTHORIZE_PENDING_KEY = 'oauth_authorize_pending'
22-
export const REDIRECT_URL_KEY = 'redirect_url'
22+
export const REDIRECT_URL_KEY = 'oauth_redirect_url'
2323

2424
function buildReturnUrl(pathname: string, search: string) {
2525
try {

web/app/components/swr-initializer.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
EDUCATION_VERIFYING_LOCALSTORAGE_ITEM,
1010
EDUCATION_VERIFY_URL_SEARCHPARAMS_ACTION,
1111
} from '@/app/education-apply/constants'
12+
import { resolvePostLoginRedirect } from '../signin/utils/post-login-redirect'
1213

1314
type SwrInitializerProps = {
1415
children: ReactNode
@@ -63,7 +64,8 @@ const SwrInitializer = ({
6364
if (searchParams.has('access_token') || searchParams.has('refresh_token')) {
6465
consoleToken && localStorage.setItem('console_token', consoleToken)
6566
refreshToken && localStorage.setItem('refresh_token', refreshToken)
66-
router.replace(pathname)
67+
const redirectUrl = resolvePostLoginRedirect(searchParams)
68+
router.replace(redirectUrl || pathname)
6769
}
6870

6971
setInit(true)

0 commit comments

Comments
 (0)