Merge pull request #1676 from appwrite/fix-redirects

Fix: Redirects
appwrite · Feb 18, 2025 · 31ad83e · 31ad83e
2 parents 8aa34e2 + c613ab9
commit 31ad83e
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 42 deletions.
diff --git a/package.json b/package.json
@@ -73,7 +73,7 @@
         "tslib": "^2.8.1",
         "typescript": "^5.6.3",
         "vite": "^5.4.11",
-        "vitest": "^1.6.0"
+        "vitest": "^1.6.1"
     },
     "type": "module",
     "packageManager": "pnpm@9.7.0+sha512.dc09430156b427f5ecfc79888899e1c39d2d690f004be70e05230b72cb173d96839587545d09429b55ac3c429c801b4dc3c0e002f653830a420fa2dd4e3cf9cf"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
@@ -58,7 +58,18 @@ export const load: LayoutLoad = async ({ depends, url, route }) => {
     }
 };
 
-function withParams(pathname: string, searchParams: URLSearchParams) {
-    if (searchParams.size > 0) return `${pathname}?${searchParams.toString()}`;
-    return pathname;
+function withParams(pathname: string, searchParams: URLSearchParams): string {
+    const redirect = searchParams.get('redirect');
+
+    if (redirect) {
+        const extras = new URLSearchParams(searchParams);
+        extras.delete('redirect');
+        const extraQuery = extras.toString();
+        const finalRedirect = extraQuery
+            ? `${redirect}${redirect.includes('?') ? '&' : '?'}${extraQuery}`
+            : redirect;
+        return `${pathname}?redirect=${encodeURIComponent(finalRedirect)}`;
+    }
+    const query = searchParams.toString();
+    return query ? `${pathname}?${query}` : pathname;
 }