Preserve requested URL through Google sign-in

services/hackbot-ui/app/login/page.tsx

@@ -1,31 +1,43 @@
 "use client";
 
-import { useState } from "react";
+import { use, useState } from "react";
 
 import { signIn } from "@/lib/auth-client";
 
-export default function LoginPage() {
+type LoginPageProps = {
+  searchParams: Promise<{
+    callbackURL?: string | string[];
+    error?: string | string[];
+  }>;
+};
+
+export default function LoginPage({ searchParams }: LoginPageProps) {
+  const params = use(searchParams);
+  const callbackURL =
+    typeof params.callbackURL === "string" ? params.callbackURL : "/";
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
   async function onGoogle() {
     setError(null);
     setLoading(true);
+
+    // Keep the target across a denied sign-in so a retry still lands on it.
+    const errorParams = new URLSearchParams({ error: "denied", callbackURL });
+
     try {
       await signIn.social({
         provider: "google",
-        callbackURL: "/",
-        errorCallbackURL: "/login?error=denied",
+        callbackURL,
+        errorCallbackURL: `/login?${errorParams.toString()}`,
       });
     } catch (err) {
       setError((err as Error).message);
       setLoading(false);
     }
   }
 
-  const denied =
-    typeof window !== "undefined" &&
-    new URLSearchParams(window.location.search).get("error");
+  const denied = params.error === "denied";
 
   return (
     <div style={{ maxWidth: 420, margin: "64px auto" }}>

services/hackbot-ui/middleware.ts

@@ -16,7 +16,9 @@ export function middleware(req: NextRequest) {
     return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
   }
 
+  // Remember the requested URL so the login page can send the user back here
   const loginUrl = new URL("/login", req.url);
+  loginUrl.searchParams.set("callbackURL", req.nextUrl.toString());
   return NextResponse.redirect(loginUrl);
 }