From f1da6d5f875b168001d4b62ffc4eca7c245b2ec7 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 9 Feb 2024 15:26:57 +0000
Subject: [PATCH 01/11] Fix for custom branding not appearing on login

---
 packages/builder/src/pages/builder/auth/_layout.svelte | 3 ++-
 packages/worker/src/api/controllers/global/configs.ts  | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index a76ddfc329..d1bf623e1a 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -14,7 +14,8 @@
     $admin.cloud &&
     !$admin.disableAccountPortal &&
     $admin.accountPortalUrl &&
-    !$admin?.checklist?.sso?.checked
+    !$admin?.checklist?.sso?.checked &&
+    !$admin.checklist.branding
   ) {
     window.location.href = $admin.accountPortalUrl
   }
diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts
index 462aa3060d..a44b173869 100644
--- a/packages/worker/src/api/controllers/global/configs.ts
+++ b/packages/worker/src/api/controllers/global/configs.ts
@@ -498,6 +498,12 @@ export async function configChecklist(ctx: Ctx) {
 
         // They have set up a global user
         const userExists = await checkAnyUserExists()
+
+        // They have set up branding
+        const configDoc = await configs.getSettingsConfigDoc()
+        const config = configDoc.config
+        const branding = await pro.branding.getBrandingConfig(config)
+
         return {
           apps: {
             checked: apps.length > 0,
@@ -519,6 +525,7 @@ export async function configChecklist(ctx: Ctx) {
             label: "Set up single sign-on",
             link: "/builder/portal/settings/auth",
           },
+          branding,
         }
       }
     )

From 353ab4b1be97df56449058fdc8417fbc8282fe32 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Fri, 9 Feb 2024 20:27:13 +0000
Subject: [PATCH 02/11] update account-portal

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index cc12291732..aaf64dd002 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit cc12291732ee902dc832bc7d93cf2086ffdf0cff
+Subproject commit aaf64dd002a7d2b9ff37f989e03d444c9b9f2b36

From d508e8f01b3c4f13d6a56c305734aa3c37958a58 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 13 Feb 2024 15:26:22 +0000
Subject: [PATCH 03/11] store tenant in cookie for use in account portal

---
 packages/account-portal                              |  2 +-
 .../builder/src/pages/builder/auth/_layout.svelte    | 12 ++++++++++--
 packages/frontend-core/src/utils/cookies.js          |  8 ++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/account-portal b/packages/account-portal
index aaf64dd002..50864c77a7 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit aaf64dd002a7d2b9ff37f989e03d444c9b9f2b36
+Subproject commit 50864c77a7c82e7b3f0d1dcfe6ac29d4a0173726
diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index d1bf623e1a..d66b1bebbf 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -1,6 +1,7 @@
 <script>
   import { auth, admin } from "stores/portal"
   import { redirect } from "@roxi/routify"
+  import { CookieUtils } from "@budibase/frontend-core"
 
   // If already authenticated, redirect away from the auth section.
   // Check this onMount rather than a reactive statement to avoid trumping
@@ -9,13 +10,20 @@
     $redirect("../")
   }
 
+  if ($admin.checklist?.branding) {
+    let url = new URL("http://hello.petertest.com:10001/auth/login")
+    let hostname = url.hostname
+    let parts = hostname.split(".")
+    let tenantId = parts[0]
+    CookieUtils.setCookie("tenantId", tenantId, "petertest.com")
+  }
+
   if (
     !$auth.user &&
     $admin.cloud &&
     !$admin.disableAccountPortal &&
     $admin.accountPortalUrl &&
-    !$admin?.checklist?.sso?.checked &&
-    !$admin.checklist.branding
+    !$admin?.checklist?.sso?.checked
   ) {
     window.location.href = $admin.accountPortalUrl
   }
diff --git a/packages/frontend-core/src/utils/cookies.js b/packages/frontend-core/src/utils/cookies.js
index 5ecaa3424f..35d6807a68 100644
--- a/packages/frontend-core/src/utils/cookies.js
+++ b/packages/frontend-core/src/utils/cookies.js
@@ -1,8 +1,12 @@
-export function setCookie(name, value) {
+export function setCookie(name, value, domain) {
   if (getCookie(name)) {
     removeCookie(name)
   }
-  window.document.cookie = `${name}=${value}; Path=/;`
+  let cookieString = `${name}=${value}; Path=/;`
+  if (domain) {
+    cookieString += ` Domain=${domain};`
+  }
+  window.document.cookie = cookieString
 }
 
 export function getCookie(cookieName) {

From 10035f5e57a1312ea6bca815b70017ee64db762d Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 13 Feb 2024 15:33:39 +0000
Subject: [PATCH 04/11] add null check

---
 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 d66b1bebbf..a66f029b16 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -10,7 +10,7 @@
     $redirect("../")
   }
 
-  if ($admin.checklist?.branding) {
+  if ($admin?.checklist?.branding) {
     let url = new URL("http://hello.petertest.com:10001/auth/login")
     let hostname = url.hostname
     let parts = hostname.split(".")

From 31fb8e34f1e2cc806019c7fbbe3ba837ea81eef2 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 13 Feb 2024 15:34:22 +0000
Subject: [PATCH 05/11] account portal ref

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index 50864c77a7..76af374def 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit 50864c77a7c82e7b3f0d1dcfe6ac29d4a0173726
+Subproject commit 76af374defa18cb4c1a96a6e3117513bb1f29ae2

From 3d1018e28c5047dc9d0c05d6c5ef545b86e88624 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 13 Feb 2024 15:36:01 +0000
Subject: [PATCH 06/11] account portal ref

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index 76af374def..935fe28f0f 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit 76af374defa18cb4c1a96a6e3117513bb1f29ae2
+Subproject commit 935fe28f0fac0eed70bddd64c69ed0a8ecf8e744

From 2cbd2e1ef314e7958faf1871ac3e9d168c4bdedf Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 13 Feb 2024 15:42:43 +0000
Subject: [PATCH 07/11] move hardcoded strings

---
 packages/builder/src/pages/builder/auth/_layout.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index a66f029b16..0a955d6604 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -11,11 +11,11 @@
   }
 
   if ($admin?.checklist?.branding) {
-    let url = new URL("http://hello.petertest.com:10001/auth/login")
+    let url = new URL(window.location.href)
     let hostname = url.hostname
     let parts = hostname.split(".")
     let tenantId = parts[0]
-    CookieUtils.setCookie("tenantId", tenantId, "petertest.com")
+    CookieUtils.setCookie("tenantId", tenantId, domain)
   }
 
   if (

From 9fbeda42b8b2b0c59ea43d656301436f82769645 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 13 Feb 2024 15:48:06 +0000
Subject: [PATCH 08/11] fix domain slipping

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

diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index 0a955d6604..6a88df4a5d 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -15,6 +15,8 @@
     let hostname = url.hostname
     let parts = hostname.split(".")
     let tenantId = parts[0]
+    let domain = parts.slice(-2).join(".")
+    console.log(domain)
     CookieUtils.setCookie("tenantId", tenantId, domain)
   }
 

From f68939fe17ed540fdf79ac472eac6b775c544c06 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Tue, 13 Feb 2024 16:10:22 +0000
Subject: [PATCH 09/11] remove log

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

diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index 6a88df4a5d..f5484182e8 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -16,7 +16,6 @@
     let parts = hostname.split(".")
     let tenantId = parts[0]
     let domain = parts.slice(-2).join(".")
-    console.log(domain)
     CookieUtils.setCookie("tenantId", tenantId, domain)
   }
 

From fc65e9a476a87f7449037762d4e41542da42c700 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 14 Feb 2024 08:29:17 +0000
Subject: [PATCH 10/11] ref

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index 935fe28f0f..00a4c25a7f 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit 935fe28f0fac0eed70bddd64c69ed0a8ecf8e744
+Subproject commit 00a4c25a7f68f73e96d4c3989f760d4ebcefb93c

From adb2c366f24936a8cccca4437ce2d12e258fa3d1 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 14 Feb 2024 10:21:45 +0000
Subject: [PATCH 11/11] ref

---
 packages/account-portal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/account-portal b/packages/account-portal
index 00a4c25a7f..1ba8414bed 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit 00a4c25a7f68f73e96d4c3989f760d4ebcefb93c
+Subproject commit 1ba8414bed14439512153cf851086146a80560f5