From c613ab94acea1f01febeb502f7c3938e3891c1fb Mon Sep 17 00:00:00 2001 From: Darshan Date: Tue, 18 Feb 2025 19:51:16 +0530 Subject: [PATCH] address comment. --- src/routes/+layout.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index feba46892..c5063ee9f 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -46,7 +46,7 @@ export const load: LayoutLoad = async ({ depends, url, route }) => { return { mfaRequired: true }; - redirect(303, withParams(`${base}/mfa`, url)); + redirect(303, withParams(`${base}/mfa`, url.searchParams)); } if (!isPublicRoute) { @@ -54,13 +54,13 @@ export const load: LayoutLoad = async ({ depends, url, route }) => { checkPricingRefAndRedirect(url.searchParams, true); } - redirect(303, withParams(`${base}/login`, url)); + redirect(303, withParams(`${base}/login`, url.searchParams)); } }; -function withParams(pathname: string, url: URL): string { - const { searchParams } = url; +function withParams(pathname: string, searchParams: URLSearchParams): string { const redirect = searchParams.get('redirect'); + if (redirect) { const extras = new URLSearchParams(searchParams); extras.delete('redirect');