Merge pull request #31 from metakgp/copilot/fix-2672d425-9df3-425c-a2b1-2d82bbcd69a4

Fix redirections to preserve user's intended destination after authentication

Author: saharsh-agrawal

app/authenticate/AuthForm.jsx

@@ -2,17 +2,19 @@
 import { useState, useEffect } from "react";
 import { useRouter } from "next/navigation";
 
-export default function AuthForm({ institutes }) {
+export default function AuthForm({ institutes, redirectUrl }) {
 	const router = useRouter();
 
 	const check = () => {
 		if (localStorage.getItem("travelbuddy")) {
-			router.push("/");
+			// Redirect to original destination or homepage if no redirect URL
+			router.push(redirectUrl ? decodeURIComponent(redirectUrl) : "/");
 			return;
 		}
 
 		if (institutes && institutes.length === 1) {
-			router.push("/register?instituteCode=" + institutes[0].code);
+			const redirectParam = redirectUrl ? `&redirect_url=${encodeURIComponent(redirectUrl)}` : '';
+			router.push("/register?instituteCode=" + institutes[0].code + redirectParam);
 			return;
 		}
 	};
@@ -33,7 +35,8 @@ export default function AuthForm({ institutes }) {
 			alert("Please select an institute");
 			return;
 		}
-		router.push("/register?instituteCode=" + institute);
+		const redirectParam = redirectUrl ? `&redirect_url=${encodeURIComponent(redirectUrl)}` : '';
+		router.push("/register?instituteCode=" + institute + redirectParam);
 		return;
 	};
 

app/authenticate/page.jsx

@@ -8,13 +8,13 @@ export const metadata = {
 	title: "Select Institute",
 };
 
-const Page = async () => {
+const Page = async ({ searchParams }) => {
 	await connectToDatabase();
 
 	// Return only names of Institues
 	const institutes = await Institute.find({}, { _id: 0, name: 1, code: 1 });
 
-	return <AuthForm institutes={JSON.parse(JSON.stringify(institutes))} />;
+	return <AuthForm institutes={JSON.parse(JSON.stringify(institutes))} redirectUrl={searchParams.redirect_url} />;
 };
 
 export default Page;

app/register/RegForm.jsx

@@ -5,7 +5,7 @@ import Loading from "@/app/utils/Loading";
 import { useRouter } from "next/navigation";
 import { checkUser } from "@/app/utils/auth";
 
-export default function RegForm({ email, instituteCode }) {
+export default function RegForm({ email, instituteCode, redirectUrl }) {
 	const router = useRouter();
 	const [loading, setLoading] = useState(true);
 	const [formData, setFormData] = useState({
@@ -17,14 +17,16 @@ export default function RegForm({ email, instituteCode }) {
 
 	const check = async () => {
 		if (localStorage.getItem("travelbuddy")) {
-			router.push("/");
+			// Redirect to original destination or homepage if no redirect URL
+			router.push(redirectUrl ? decodeURIComponent(redirectUrl) : "/");
 			return;
 		}
 
 		const user = await checkUser({ email });
 		if (user) {
 			localStorage.setItem("travelbuddy", user);
-			router.push("/");
+			// Redirect to original destination or homepage if no redirect URL
+			router.push(redirectUrl ? decodeURIComponent(redirectUrl) : "/");
 			return;
 		}
 
@@ -76,7 +78,8 @@ export default function RegForm({ email, instituteCode }) {
 			const json = await res.json();
 			alert(json.message);
 			localStorage.setItem("travelbuddy", json.user);
-			router.push("/");
+			// Redirect to original destination or homepage if no redirect URL
+			router.push(redirectUrl ? decodeURIComponent(redirectUrl) : "/");
 		} else {
 			const json = await res.json();
 			alert(json.message);

app/register/page.jsx

@@ -8,7 +8,7 @@ export const metadata = {
 };
 
 const Page = async ({ searchParams }) => {
-	const { instituteCode } = searchParams;
+	const { instituteCode, redirect_url } = searchParams;
 
 	const institute = await instituteDetails({ instituteCode });
 
@@ -17,22 +17,27 @@ const Page = async ({ searchParams }) => {
 	const cookieStore = cookies();
 	const cookie = cookieStore.get(authCookie);
 
+	// Build the redirect URL for Heimdall with proper fallback
+	const finalRedirectUrl = redirect_url ? 
+		`https://travel.metakgp.org/register?instituteCode=${instituteCode}&redirect_url=${encodeURIComponent(redirect_url)}` :
+		`https://travel.metakgp.org/register?instituteCode=${instituteCode}`;
+
 	if (!cookie) {
-		redirect(authLink + "?redirect_url=https://travel.metakgp.org/");
+		redirect(authLink + "?redirect_url=" + encodeURIComponent(finalRedirectUrl));
 	}
 
 	const token = cookie.value;
 	if (!token) {
-		redirect(authLink + "?redirect_url=https://travel.metakgp.org/");
+		redirect(authLink + "?redirect_url=" + encodeURIComponent(finalRedirectUrl));
 	}
 
 	const email = JSON.parse(atob(token.split(".")[1])).email; // get the user email from jwt
 
 	if (!email) {
-		redirect(authLink + "?redirect_url=https://travel.metakgp.org/");
+		redirect(authLink + "?redirect_url=" + encodeURIComponent(finalRedirectUrl));
 	}
 
-	return <RegForm email={email} instituteCode={instituteCode} />;
+	return <RegForm email={email} instituteCode={instituteCode} redirectUrl={redirect_url} />;
 };
 
 export default Page;

app/trains/create/TrainForm.jsx

@@ -15,14 +15,18 @@ const TrainForm = () => {
 
 	const check = async () => {
 		if (!localStorage.getItem("travelbuddy")) {
-			router.push("/authenticate");
+			// Preserve current URL for redirect after authentication
+			const currentUrl = encodeURIComponent(window.location.pathname + window.location.search);
+			router.push(`/authenticate?redirect_url=${currentUrl}`);
 			return;
 		}
 		const token = localStorage.getItem("travelbuddy");
 		const email = await verifyUser({ token });
 		if (!email) {
 			localStorage.removeItem("travelbuddy");
-			router.push("/authenticate");
+			// Preserve current URL for redirect after authentication
+			const currentUrl = encodeURIComponent(window.location.pathname + window.location.search);
+			router.push(`/authenticate?redirect_url=${currentUrl}`);
 			return;
 		}
 		setEmail(email);

app/trains/my-trains/MyTrains.jsx

@@ -12,7 +12,9 @@ const MyTrains = () => {
 
 	const getDetails = async () => {
 		if (!localStorage.getItem("travelbuddy")) {
-			router.push("/authenticate");
+			// Preserve current URL for redirect after authentication
+			const currentUrl = encodeURIComponent(window.location.pathname + window.location.search);
+			router.push(`/authenticate?redirect_url=${currentUrl}`);
 			return;
 		}
 		const res = await fetch("/api/trains/find", {

app/trains/train/[trainID]/TrainDetails.jsx

@@ -12,7 +12,9 @@ const TrainDetails = ({ trainID }) => {
 
 	const getDetails = async () => {
 		if (!localStorage.getItem("travelbuddy")) {
-			router.push("/authenticate");
+			// Preserve current URL for redirect after authentication
+			const currentUrl = encodeURIComponent(window.location.pathname + window.location.search);
+			router.push(`/authenticate?redirect_url=${currentUrl}`);
 			return;
 		}
 		const res = await fetch("/api/trains/find", {

app/trips/create/TripForm.jsx

@@ -16,14 +16,18 @@ const TripForm = () => {
 
 	const check = async () => {
 		if (!localStorage.getItem("travelbuddy")) {
-			router.push("/authenticate");
+			// Preserve current URL for redirect after authentication
+			const currentUrl = encodeURIComponent(window.location.pathname + window.location.search);
+			router.push(`/authenticate?redirect_url=${currentUrl}`);
 			return;
 		}
 		const token = localStorage.getItem("travelbuddy");
 		const email = await verifyUser({ token });
 		if (!email) {
 			localStorage.removeItem("travelbuddy");
-			router.push("/authenticate");
+			// Preserve current URL for redirect after authentication
+			const currentUrl = encodeURIComponent(window.location.pathname + window.location.search);
+			router.push(`/authenticate?redirect_url=${currentUrl}`);
 			return;
 		}
 		setEmail(email);

app/trips/my-trips/MyTrips.jsx

@@ -13,7 +13,9 @@ const MyTrips = () => {
 
 	const getDetails = async () => {
 		if (!localStorage.getItem("travelbuddy")) {
-			router.push("/authenticate");
+			// Preserve current URL for redirect after authentication
+			const currentUrl = encodeURIComponent(window.location.pathname + window.location.search);
+			router.push(`/authenticate?redirect_url=${currentUrl}`);
 			return;
 		}
 		const res = await fetch("/api/trips/find", {

app/trips/trip/[tripID]/TripDetails.jsx

@@ -12,7 +12,9 @@ const TripDetails = ({ tripID }) => {
 
 	const getDetails = async () => {
 		if (!localStorage.getItem("travelbuddy")) {
-			router.push("/authenticate");
+			// Preserve current URL for redirect after authentication
+			const currentUrl = encodeURIComponent(window.location.pathname + window.location.search);
+			router.push(`/authenticate?redirect_url=${currentUrl}`);
 			return;
 		}
 		const res = await fetch("/api/trips/find", {