refactor: preserve prev link after sign in

uigywnkiub · Dec 26, 2024 · d058e91 · d058e91
1 parent 91cb5b7
commit d058e91
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/ui/sign-in/sign-in.tsx b/app/ui/sign-in/sign-in.tsx
@@ -25,7 +25,6 @@ import {
   APP_TITLE,
   DEFAULT_ICON_SIZE,
 } from '@/config/constants/main'
-import { ROUTE } from '@/config/constants/routes'
 
 import {
   TAuthProvider,
@@ -69,7 +68,8 @@ function SignIn() {
     setIsLoading((prev) => ({ ...prev, [provider]: true }))
     try {
       await signIn(provider, {
-        callbackUrl: ROUTE.HOME,
+        // If no callbackUrl is provided, the user will be redirected to the previous page.
+        // callbackUrl: ROUTE.HOME,
       })
     } catch (err) {
       if (err instanceof AuthError) {

diff --git a/middleware.ts b/middleware.ts
@@ -17,7 +17,7 @@ export default auth((req: NextRequest & { auth: TSession }) => {
   if (req.nextUrl.pathname === ROUTE.SIGNIN) {
     url.pathname = ROUTE.HOME
 
-    return NextResponse.rewrite(url)
+    return NextResponse.redirect(url)
   }
 
   return NextResponse.next()