fix(auth): add callbackUrl parameter for redirect after sign-in

keep-ui/app/(signin)/signin/SignInForm.tsx

@@ -5,7 +5,7 @@ import { Text, TextInput, Button } from "@tremor/react";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { authenticate, revalidateAfterAuth } from "@/app/actions/authactions";
-import { useRouter } from "next/navigation";
+import { useRouter, useSearchParams } from "next/navigation";
 import "../../globals.css";
 
 export interface Provider {
@@ -33,6 +33,7 @@ export default function SignInForm({ params }: { params?: { amt: string } }) {
   const [providers, setProviders] = useState<Providers | null>(null);
   const [isRedirecting, setIsRedirecting] = useState(false);
   const router = useRouter();
+  const searchParams = useSearchParams();
   const {
     register,
     handleSubmit,
@@ -71,7 +72,9 @@ export default function SignInForm({ params }: { params?: { amt: string } }) {
         providers.credentials &&
         providers.credentials.name == "NoAuth"
       ) {
-        signIn("credentials", { callbackUrl: "/" });
+        signIn("credentials", {
+          callbackUrl: searchParams.get("callbackUrl") || "/",
+        });
       }
     }
   }, [providers, params]);

keep-ui/middleware.ts

@@ -49,8 +49,11 @@ export const middleware = auth(async (request) => {
 
   // If not authenticated and not on signin page, redirect to signin
   if (!isAuthenticated && !pathname.startsWith("/signin") && !pathname.startsWith("/health")) {
+    const redirectTo = request.nextUrl.href || "/incidents";
     console.log("Redirecting to signin page because user is not authenticated");
-    return NextResponse.redirect(new URL("/signin", request.url));
+    return NextResponse.redirect(
+      new URL(`/signin?callbackUrl=${redirectTo}`, request.url)
+    );
   }
 
   // If authenticated and on signin page, redirect to incidents