From 8673ed1dae81f96372ca2b45d28f0a3483624ddd Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Fri, 31 Mar 2023 14:03:34 +0100
Subject: [PATCH] Minor improvement - opening the google authorization in the
 same tab as onboarding rather than creating a dead tab.

---
 .../_components/GoogleButton.svelte                   | 11 +++++++----
 .../_components/DatasourceConfigPanel.svelte          |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
index 0cf92dde2b..b7d70d88b7 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte
@@ -6,6 +6,7 @@
   export let preAuthStep
   export let datasource
   export let disabled
+  export let samePage
 
   $: tenantId = $auth.tenantId
 </script>
@@ -25,10 +26,12 @@
         ds = resp
       }
     }
-    window.open(
-      `/api/global/auth/${tenantId}/datasource/google?datasourceId=${ds._id}&appId=${appId}`,
-      "_blank"
-    )
+    const url = `/api/global/auth/${tenantId}/datasource/google?datasourceId=${ds._id}&appId=${appId}`
+    if (samePage) {
+      window.location = url
+    } else {
+      window.open(url, "_blank")
+    }
   }}
 >
   <img src={GoogleLogo} alt="google icon" />
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte
index 333cfdb0c6..2b44648279 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte
@@ -107,7 +107,7 @@
     </FancyForm>
   </div>
   {#if isGoogle}
-    <GoogleButton disabled={!isValid} preAuthStep={handleNext} />
+    <GoogleButton disabled={!isValid} preAuthStep={handleNext} samePage />
   {:else}
     <Button cta disabled={!isValid} on:click={handleNext}>Connect</Button>
   {/if}