feat: social login redirect

Author: Yessenia-d

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

@@ -19,7 +19,7 @@ import {
 } from '@remixicon/react'
 
 export const OAUTH_AUTHORIZE_PENDING_KEY = 'oauth_authorize_pending'
-export const REDIRECT_URL_KEY = 'redirect_url'
+export const REDIRECT_URL_KEY = 'oauth_redirect_url'
 
 function buildReturnUrl(pathname: string, search: string) {
   try {

web/app/components/swr-initializer.tsx

@@ -9,6 +9,7 @@ import {
   EDUCATION_VERIFYING_LOCALSTORAGE_ITEM,
   EDUCATION_VERIFY_URL_SEARCHPARAMS_ACTION,
 } from '@/app/education-apply/constants'
+import { resolvePostLoginRedirect } from '../signin/utils/post-login-redirect'
 
 type SwrInitializerProps = {
   children: ReactNode
@@ -63,7 +64,8 @@ const SwrInitializer = ({
         if (searchParams.has('access_token') || searchParams.has('refresh_token')) {
           consoleToken && localStorage.setItem('console_token', consoleToken)
           refreshToken && localStorage.setItem('refresh_token', refreshToken)
-          router.replace(pathname)
+          const redirectUrl = resolvePostLoginRedirect(searchParams)
+          router.replace(redirectUrl || pathname)
         }
 
         setInit(true)

web/app/signin/utils/post-login-redirect.ts

@@ -3,17 +3,28 @@ import type { ReadonlyURLSearchParams } from 'next/navigation'
 
 export const resolvePostLoginRedirect = (searchParams: ReadonlyURLSearchParams) => {
   const redirectUrl = searchParams.get(REDIRECT_URL_KEY)
-  if (redirectUrl)
-    return decodeURIComponent(redirectUrl)
+  if (redirectUrl) {
+    try {
+      localStorage.removeItem(OAUTH_AUTHORIZE_PENDING_KEY)
+      return decodeURIComponent(redirectUrl)
+    }
+    catch (e) {
+      console.error('Failed to decode redirect URL:', e)
+      return redirectUrl
+    }
+  }
 
   try {
     const pendingStr = localStorage.getItem(OAUTH_AUTHORIZE_PENDING_KEY)
     if (pendingStr) {
       const pending = JSON.parse(pendingStr)
       localStorage.removeItem(OAUTH_AUTHORIZE_PENDING_KEY)
-      return pending?.returnUrl
+      return pending?.returnUrl || null
     }
   }
-  catch { }
+  catch (e) {
+    console.error('Failed to parse pending redirect info:', e)
+  }
+
   return null
 }