feat: support redirect query parameter

src/components/AfterLogin/index.tsx

@@ -1,13 +1,15 @@
 'use client'
 
 import { Link, useConfig } from '@payloadcms/ui'
+import { useSearchParams } from 'next/navigation.js'
 import React from 'react'
 
 import './index.scss'
 
 const baseClass = 'after-login-otp'
 
 export const AfterLoginOTP: React.FC = () => {
+  const redirect = useSearchParams().get('redirect')
   const {
     config: {
       routes: { admin },
@@ -16,7 +18,9 @@ export const AfterLoginOTP: React.FC = () => {
 
   return (
     <div className={baseClass}>
-      <Link href={`${admin}/otp/request`}>Request a one-time password</Link>
+      <Link href={`${admin}/otp/request${redirect ? '?redirect=' + redirect : ''}`}>
+        Request a one-time password
+      </Link>
     </div>
   )
 }

src/components/LoginOTP/index.tsx

@@ -12,7 +12,7 @@ import {
   useConfig,
   useTranslation,
 } from '@payloadcms/ui'
-import { useRouter } from 'next/navigation.js'
+import { useRouter, useSearchParams } from 'next/navigation.js'
 import React from 'react'
 
 import { getLoginOptions } from '../../utilities/getLoginOptions.js'
@@ -21,6 +21,7 @@ import { localStorageKey } from '../shared.js'
 const baseClass = 'login-otp'
 
 export const LoginOTP: React.FC<AdminViewClientProps> = () => {
+  const redirect = useSearchParams().get('redirect')
   const { config, getEntityConfig } = useConfig()
   const { t } = useTranslation()
   const router = useRouter()
@@ -57,9 +58,9 @@ export const LoginOTP: React.FC<AdminViewClientProps> = () => {
   })
 
   const handleRedirect = React.useCallback(() => {
-    router.push(admin)
+    router.push(redirect ?? admin)
     window.localStorage.removeItem(localStorageKey)
-  }, [router, admin])
+  }, [router, admin, redirect])
 
   return (
     <MinimalTemplate>

src/components/RequestOTP/index.tsx

@@ -13,7 +13,7 @@ import {
   useConfig,
   useTranslation,
 } from '@payloadcms/ui'
-import { useRouter } from 'next/navigation.js'
+import { useRouter, useSearchParams } from 'next/navigation.js'
 import { email, username } from 'payload/shared'
 import React from 'react'
 
@@ -23,6 +23,7 @@ import { localStorageKey } from '../shared.js'
 const baseClass = 'request-otp'
 
 export const RequestOTP: React.FC<AdminViewClientProps> = () => {
+  const redirect = useSearchParams().get('redirect')
   const { config, getEntityConfig } = useConfig()
   const { t } = useTranslation()
   const router = useRouter()
@@ -50,10 +51,10 @@ export const RequestOTP: React.FC<AdminViewClientProps> = () => {
   const onSuccess = React.useCallback(
     (args: unknown) => {
       const { value } = args as { value: string }
-      router.push(`${admin}/otp/login`)
+      router.push(`${admin}/otp/login${redirect ? '?redirect=' + redirect : ''}`)
       window.localStorage.setItem(localStorageKey, value)
     },
-    [router, admin],
+    [router, admin, redirect],
   )
 
   return (