fix: encode URI components for redirectTo search params

kizivat · Aug 10, 2024 · 6aaa20d · 6aaa20d
1 parent b0252ac
commit 6aaa20d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/routes/(marketing)/(auth)/forgot-password/forgot-password-form.svelte b/src/routes/(marketing)/(auth)/forgot-password/forgot-password-form.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { page } from '$app/stores';
 	import * as Form from '$lib/components/ui/form';
 	import { Input } from '$lib/components/ui/input';
 	import {
@@ -9,7 +10,6 @@
 	import { zodClient } from 'sveltekit-superforms/adapters';
 	import LoaderCircle from '~icons/lucide/loader-circle';
 	import { formSchema, type FormSchema } from './schema';
-	import { page } from '$app/stores';
 
 	export let data: SuperValidated<Infer<FormSchema>>;
 
@@ -22,8 +22,9 @@
 
 <form
 	method="POST"
-	action="/?redirectTo={$page.url
-		.origin}/auth/callback?next={encodeURIComponent('/settings/security')}"
+	action="/?redirectTo={encodeURIComponent(
+		`${$page.url.origin}/auth/callback?next=/settings/security`,
+	)}"
 	use:enhance
 	class="grid gap-4"
 >

diff --git a/src/routes/(marketing)/(auth)/login/login-form.svelte b/src/routes/(marketing)/(auth)/login/login-form.svelte
@@ -22,7 +22,9 @@
 
 <form
 	method="POST"
-	action="/?redirectTo={$page.url.origin}/auth/callback{$page.url.search}"
+	action="/?redirectTo={encodeURIComponent(
+		`${$page.url.origin}/auth/callback${$page.url.search}`,
+	)}"
 	use:enhance
 	class="grid gap-4"
 >