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

Fix tenant subdomain parsing

This commit is contained in:
Rory Powell 2021-09-30 15:56:33 +01:00
parent 0f4cb52618
commit 89c9118337
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/src/pages/builder/_layout.svelte
View File

@ -20,7 +20,7 @@
if (!tenantId.includes("localhost:")) { if (!tenantId.includes("localhost:")) {
// user doesn't have permission to access this tenant - kick them out // user doesn't have permission to access this tenant - kick them out
if (user?.tenantId !== tenantId) { if (user && user.tenantId !== tenantId) {
await auth.logout() await auth.logout()
await auth.setOrganisation(null) await auth.setOrganisation(null)
} else { } else {

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

@ -22,6 +22,7 @@
$: company = $organisation.company || "Budibase" $: company = $organisation.company || "Budibase"
$: multiTenancyEnabled = $admin.multiTenancy $: multiTenancyEnabled = $admin.multiTenancy
$: cloud = $admin.cloud
async function login() { async function login() {
try { try {
@ -84,7 +85,7 @@
<ActionButton quiet on:click={() => $goto("./forgot")}> <ActionButton quiet on:click={() => $goto("./forgot")}>
Forgot password? Forgot password?
</ActionButton> </ActionButton>
{#if multiTenancyEnabled} {#if multiTenancyEnabled && !cloud}
<ActionButton <ActionButton
quiet quiet
on:click={() => { on:click={() => {