MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for custom branding not appearing on login

This commit is contained in:
Peter Clement 2024-02-09 15:26:57 +00:00
parent 1c29620c9a
commit f1da6d5f87
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/builder/src/pages/builder/auth/_layout.svelte
View File

@ -14,7 +14,8 @@
$admin.cloud && $admin.cloud &&
!$admin.disableAccountPortal && !$admin.disableAccountPortal &&
$admin.accountPortalUrl && $admin.accountPortalUrl &&
!$admin?.checklist?.sso?.checked !$admin?.checklist?.sso?.checked &&
!$admin.checklist.branding
) { ) {
window.location.href = $admin.accountPortalUrl window.location.href = $admin.accountPortalUrl
} }

7
packages/worker/src/api/controllers/global/configs.ts
View File

@ -498,6 +498,12 @@ export async function configChecklist(ctx: Ctx) {
// They have set up a global user // They have set up a global user
const userExists = await checkAnyUserExists() 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 { return {
apps: { apps: {
checked: apps.length > 0, checked: apps.length > 0,
@ -519,6 +525,7 @@ export async function configChecklist(ctx: Ctx) {
label: "Set up single sign-on", label: "Set up single sign-on",
link: "/builder/portal/settings/auth", link: "/builder/portal/settings/auth",
}, },
branding,
} }
} }
) )