redirect to siginin with callback URL

app/(public)/signin/page.tsx

@@ -1,16 +1,12 @@
-"use client";
-import { signIn } from "next-auth/react";
-import Image from "next/image";
+import { LoginButtons } from "@/components/login/login-buttons";
 
-import { Button } from "@/components/ui/button";
-import HFLogo from "@/assets/hf-logo.svg";
-
-export default function SignInPage({
+export default async function SignInPage({
   searchParams,
 }: {
-  searchParams: { callbackUrl: string };
+  searchParams: Promise<{ callbackUrl: string }>;
 }) {
-  const { callbackUrl } = searchParams;
+  const { callbackUrl } = await searchParams;
+  console.log(callbackUrl);
   return (
     <section className="min-h-screen font-sans">
       <div className="px-6 py-16 max-w-5xl mx-auto text-center">
@@ -18,14 +14,7 @@ export default function SignInPage({
         <p className="text-lg text-muted-foreground mb-8">
           You can&apos;t access this resource without being signed in.
         </p>
-        <Button
-          onClick={() =>
-            signIn("huggingface", { callbackUrl: callbackUrl ?? "/deepsite" })
-          }
-        >
-          <Image src={HFLogo} alt="Hugging Face" width={20} height={20} />
-          Sign in with Hugging Face
-        </Button>
+        <LoginButtons callbackUrl={callbackUrl ?? "/deepsite"} />
       </div>
     </section>
   );

app/[owner]/[repoId]/page.tsx

@@ -12,12 +12,15 @@ export default async function ProjectPage({
 }) {
   const session = await auth();
 
-  if (!session) {
-    redirect("/api/auth/signin");
-  }
-
   const { owner, repoId } = await params;
   const { commit } = await searchParams;
+  if (!session) {
+    redirect(
+      `/api/auth/signin?callbackUrl=/deepsite/${owner}/${repoId}${
+        commit ? `?commit=${commit}` : ""
+      }`
+    );
+  }
   const datas = await getProject(`${owner}/${repoId}`, commit);
   if (!datas?.project) {
     return notFound();

app/new/page.tsx

@@ -10,7 +10,7 @@ export default async function NewProjectPage({
   const session = await auth();
 
   if (!session) {
-    redirect("/api/auth/signin");
+    redirect("/api/auth/signin?callbackUrl=/deepsite/new");
   }
 
   const { prompt } = await searchParams;

components/login/login-buttons.tsx

@@ -0,0 +1,15 @@
+"use client";
+import { signIn } from "next-auth/react";
+import Image from "next/image";
+
+import { Button } from "@/components/ui/button";
+import HFLogo from "@/assets/hf-logo.svg";
+
+export const LoginButtons = ({ callbackUrl }: { callbackUrl: string }) => {
+  return (
+    <Button onClick={() => signIn("huggingface", { callbackUrl })}>
+      <Image src={HFLogo} alt="Hugging Face" width={20} height={20} />
+      Sign in with Hugging Face
+    </Button>
+  );
+};