feat: redirect to original path after sign in

app/(auth)/auth/callback/route.ts

@@ -14,6 +14,7 @@ import { ZodError } from 'zod';
 export async function GET(request: NextRequest) {
   const requestUrl = new URL(request.url);
   const code = requestUrl.searchParams.get('code');
+  const redirect = requestUrl.searchParams.get('redirect');
 
   if (!code) {
     return new HttpBadRequestError({
@@ -35,6 +36,7 @@ export async function GET(request: NextRequest) {
 
   try {
     const { isNewAccount } = await saveUserInfo({ session, user });
+
     if (isNewAccount) {
       return NextResponse.redirect(
         new URL('/onboarding/start', request.url).toString(),
@@ -43,7 +45,8 @@ export async function GET(request: NextRequest) {
         },
       );
     }
-    return NextResponse.redirect(requestUrl.origin);
+
+    return NextResponse.redirect(new URL(redirect || '/shows', request.url));
   } catch (error) {
     switch (true) {
       case error instanceof DatabaseError:

app/(auth)/auth/sign-in/route.ts

@@ -7,7 +7,12 @@ import { NextResponse } from 'next/server';
 
 export async function POST(request: NextRequest) {
   const supabase = createSupabaseServerClient(cookies());
+
+  const formData = await request.formData();
+  const redirect = String(formData.get('redirect'));
+
   const redirectURL = new URL('/auth/callback', request.url);
+  redirectURL.searchParams.set('redirect', redirect);
 
   const scopes =
     'user-read-email user-read-playback-position user-library-read';

app/(auth)/sign-in/page.tsx

@@ -1,7 +1,13 @@
 import { Button, Flex, Heading, Link, Text } from '@radix-ui/themes';
 import { FaSpotify } from 'react-icons/fa';
 
-export default function Page() {
+type Props = {
+  searchParams: {
+    redirect?: string;
+  };
+};
+
+export default function Page(props: Props) {
   return (
     <Flex direction="column" gap="4">
       <Heading trim="both">Welcome to beecast</Heading>
@@ -11,6 +17,12 @@ export default function Page() {
       </Text>
 
       <form action="/auth/sign-in" method="POST">
+        <input
+          name="redirect"
+          type="hidden"
+          value={props.searchParams.redirect}
+        />
+
         <Flex direction="column">
           <Button highContrast size="3" type="submit">
             <FaSpotify />

middleware.ts

@@ -27,7 +27,11 @@ export async function middleware(request: NextRequest) {
     return response;
   }
 
-  return NextResponse.redirect(new URL('/sign-in', request.url));
+  const nextURL = new URL(request.url);
+  nextURL.pathname = '/sign-in';
+  nextURL.searchParams.set('redirect', pathname);
+
+  return NextResponse.redirect(nextURL);
 }
 
 export const config = {