fix: returnTo on login redirect (#1508)

ThatConference · Jan 6, 2024 · a3fc2d7 · a3fc2d7
2 parents d7eb8e9 + 531759b
commit a3fc2d7
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/routes/login/+server.js b/src/routes/login/+server.js
@@ -2,7 +2,17 @@ import { redirect, error } from '@sveltejs/kit';
 import * as Sentry from '@sentry/sveltekit';
 
 export async function GET({ fetch, locals, url }) {
-	const returnTo = url.searchParams?.get('returnTo') || '/';
+	const { searchParams } = url;
+
+	let returnTo = url.searchParams?.get('returnTo') || '/';
+
+	if (searchParams.size > 1) {
+		if (returnTo.length > 1) {
+			searchParams.delete('returnTo');
+			returnTo = `${returnTo}?${searchParams.toString()}`;
+		}
+	}
+
 	let _url = '/';
 	try {
 		const session = await locals.getSession();