Merge pull request #13004 from Budibase/fix/custom-branding-issue

Fix for custom branding not appearing on login

packages/account-portal

@@ -1 +1 @@
-Subproject commit 8cbe73c9dc39d0bda3dbca3dac345a4a1f916f18
+Subproject commit 1ba8414bed14439512153cf851086146a80560f5

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,6 +10,15 @@
     $redirect("../")
   }
 
+  if ($admin?.checklist?.branding) {
+    let url = new URL(window.location.href)
+    let hostname = url.hostname
+    let parts = hostname.split(".")
+    let tenantId = parts[0]
+    let domain = parts.slice(-2).join(".")
+    CookieUtils.setCookie("tenantId", tenantId, domain)
+  }
+
   if (
     !$auth.user &&
     $admin.cloud &&

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) {

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