Setup sign in page to redirect back to the page that linked it

src/app/setup/page.tsx

@@ -18,7 +18,7 @@ import { z } from "zod";
 import { useForm } from "react-hook-form";
 import { Dispatch, SetStateAction } from "react";
 import { useUser } from "@clerk/nextjs";
-import { redirect } from "next/navigation";
+import { redirect, usePathname } from "next/navigation";
 import { LoaderCircle } from "lucide-react";
 
 function FullName({
@@ -27,6 +27,7 @@ function FullName({
   setActiveTab: Dispatch<SetStateAction<number>>;
 }) {
   const { user, isLoaded } = useUser();
+  const pathname = usePathname();
 
   if (!isLoaded) {
     // Handle loading state however you like
@@ -39,7 +40,7 @@ function FullName({
   }
 
   if (!user) {
-    return redirect("/sign-in");
+    return redirect("/sign-in?redirect=" + pathname);
   }
 
   const formSchema = z.object({

src/app/sign-in/page.tsx

@@ -1,12 +1,18 @@
+"use client";
+
 import { RedirectToSignIn, SignedIn, SignedOut } from "@clerk/nextjs";
 import Link from "next/link";
+import { useSearchParams } from "next/navigation";
 
 export default function SignIn() {
+  const searchParams = useSearchParams();
+  const redirect = searchParams.get("redirect");
+
   return (
     <div className="text-xl">
       <SignedOut>
         Signing you in...
-        <RedirectToSignIn />
+        <RedirectToSignIn signInForceRedirectUrl={redirect} />
       </SignedOut>
       <SignedIn>
         You are already signed in