From c80504ca93d9afd54bc91a78d2bb2575aceb7711 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 18 Dec 2023 10:59:33 +0100
Subject: [PATCH] Use ?params

---
 packages/builder/src/api.js                                | 2 +-
 .../src/pages/builder/app/[application]/updating.svelte    | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/api.js b/packages/builder/src/api.js
index 9130c60dea..febf6603bb 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.js
@@ -53,7 +53,7 @@ export const API = createAPIClient({
     }
 
     get(navigation).goto(
-      `${updatingUrl}?returnUrl=${encodeURIComponent(window.location)}`
+      `${updatingUrl}?returnUrl=${encodeURIComponent(window.location.pathname)}`
     )
   },
 })
diff --git a/packages/builder/src/pages/builder/app/[application]/updating.svelte b/packages/builder/src/pages/builder/app/[application]/updating.svelte
index dca01e3495..0ea9de2ee3 100644
--- a/packages/builder/src/pages/builder/app/[application]/updating.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/updating.svelte
@@ -1,6 +1,6 @@
 <script>
   import Spinner from "components/common/Spinner.svelte"
-  import { redirect } from "@roxi/routify"
+  import { redirect, params } from "@roxi/routify"
 
   import { API } from "api"
 
@@ -18,9 +18,8 @@
         return migrationTimeout()
       }
 
-      const urlParams = new URLSearchParams(window.location.search)
-      const returnUrl = urlParams.get("returnUrl")
-
+      // For some reason routify params is not stripping the ? properly, so we need to check both with and without ?
+      const returnUrl = $params.returnUrl || $params["?returnUrl"]
       $redirect(returnUrl)
     }, 1000)
   }