fix: redirect to callback when the user is logged in

interledger · Jan 29, 2025 · 6cca08f · 6cca08f
1 parent 4b9fe09
commit 6cca08f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/packages/wallet/frontend/src/middleware.ts b/packages/wallet/frontend/src/middleware.ts
@@ -11,6 +11,7 @@ const isPublicPath = (path: string) => {
 const publicPaths = ['/auth*']
 
 export async function middleware(req: NextRequest) {
+  const callbackUrl = req.nextUrl.searchParams.get('callbackUrl')
   const isPublic = isPublicPath(req.nextUrl.pathname)
   const cookieName = process.env.COOKIE_NAME || 'testnet.cookie'
 
@@ -39,7 +40,7 @@ export async function middleware(req: NextRequest) {
     }
 
     if (isPublic) {
-      return NextResponse.redirect(new URL('/', req.url))
+      return NextResponse.redirect(new URL(callbackUrl ?? '/', req.url))
     }
   } else {
     // If the user is not logged in and tries to access a private resource,

diff --git a/packages/wallet/frontend/src/pages/auth/login.tsx b/packages/wallet/frontend/src/pages/auth/login.tsx
@@ -91,6 +91,7 @@ const LoginPage: NextPageWithLayout = () => {
       setCallbackPath(urlFromStorage ?? '/');
     } else {
       sessionStorage.setItem(SessionStorageKeys.CallbackUrl, callbackUrl)
+      setCallbackPath(callbackUrl)
     }
 
   }, [callbackUrl])