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

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

@@ -28,11 +28,18 @@ interface SignInFormInputs {
   password: string;
 }
 
-export default function SignInForm({ params }: { params?: { amt: string } }) {
+export default function SignInForm({
+  params,
+  searchParams,
+}: {
+  params?: { amt: string };
+  searchParams: { [key: string]: string | string[] | undefined };
+}) {
   console.log("Init SignInForm");
   const [providers, setProviders] = useState<Providers | null>(null);
   const [isRedirecting, setIsRedirecting] = useState(false);
   const router = useRouter();
+
   const {
     register,
     handleSubmit,
@@ -71,7 +78,9 @@ export default function SignInForm({ params }: { params?: { amt: string } }) {
         providers.credentials &&
         providers.credentials.name == "NoAuth"
       ) {
-        signIn("credentials", { callbackUrl: "/" });
+        signIn("credentials", {
+          callbackUrl: (searchParams["callbackUrl"] as string) || "/",
+        });
       }
     }
   }, [providers, params]);

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

@@ -1,6 +1,12 @@
 "use client";
 import SignInForm from "./SignInForm";
 
-export default function SignInPage({ params }: { params: { amt: string } }) {
-  return <SignInForm params={params} />;
+export default function SignInPage({
+  params,
+  searchParams,
+}: {
+  params: { amt: string };
+  searchParams: { [key: string]: string | string[] | undefined };
+}) {
+  return <SignInForm params={params} searchParams={searchParams} />;
 }

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