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] 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,
         }
       }
     )