From f6256bfbd5d2b1d690c6f724965de4d9aeb92e78 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 28 Sep 2021 17:54:54 +0100
Subject: [PATCH 1/2] prevent SSO configured tenants being redirected to
 account portal

---
 packages/builder/src/pages/builder/auth/_layout.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index ce4e6015da..2613b96986 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -12,7 +12,7 @@
     }
 
     // redirect to account portal for authentication in the cloud
-    if (!$auth.user && $admin.cloud && $admin.accountPortalUrl) {
+    if (!$auth.user && $admin.cloud && $admin.accountPortalUrl && !$admin?.checklist?.sso?.checked) {
       window.location.href = $admin.accountPortalUrl
     }
   })

From 0edd6ffabde34c186baf28d1c6cf5d4f1dd7d09f Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Wed, 29 Sep 2021 09:55:38 +0100
Subject: [PATCH 2/2] lint

---
 packages/builder/src/pages/builder/auth/_layout.svelte | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index 2613b96986..7e8c41d2c5 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -12,7 +12,12 @@
     }
 
     // redirect to account portal for authentication in the cloud
-    if (!$auth.user && $admin.cloud && $admin.accountPortalUrl && !$admin?.checklist?.sso?.checked) {
+    if (
+      !$auth.user &&
+      $admin.cloud &&
+      $admin.accountPortalUrl &&
+      !$admin?.checklist?.sso?.checked
+    ) {
       window.location.href = $admin.accountPortalUrl
     }
   })