From 7dc9c403d86ec7ef282e8ec9d6e6f5e5770beb0b Mon Sep 17 00:00:00 2001
From: m5r <mokht@rmi.al>
Date: Wed, 18 May 2022 01:49:31 +0200
Subject: [PATCH] fix redirect on `requireLoggedIn()`

---
 app/utils/auth.server.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/utils/auth.server.ts b/app/utils/auth.server.ts
index b941a35..fe2b59a 100644
--- a/app/utils/auth.server.ts
+++ b/app/utils/auth.server.ts
@@ -136,11 +136,11 @@ export async function requireLoggedOut(request: Request) {
 
 export async function requireLoggedIn(request: Request) {
 	const user = await authenticator.isAuthenticated(request);
-	const signInUrl = new URL("/sign-in");
+	const signInUrl = "/sign-in";
 	const redirectTo = buildRedirectTo(new URL(request.url));
-	signInUrl.searchParams.set("redirectTo", redirectTo);
+	const searchParams = new URLSearchParams({ redirectTo });
 	if (!user) {
-		throw redirect(signInUrl.toString(), {
+		throw redirect(`${signInUrl}?${searchParams.toString()}`, {
 			headers: { "Set-Cookie": await destroySession(await getSession(request)) },
 		});
 	}
@@ -148,7 +148,7 @@ export async function requireLoggedIn(request: Request) {
 	return user;
 }
 
-function buildRedirectTo(url: URL): string {
+function buildRedirectTo(url: URL) {
 	let redirectTo = url.pathname;
 	const searchParams = url.searchParams.toString();
 	if (searchParams.length > 0) {