Respect tenant in url in UI app. Reject tenant and session mismatch
This commit is contained in:
parent
f2c2308fdc
commit
a299e30556
|
@ -9,10 +9,31 @@
|
|||
$: hasAdminUser = $admin?.checklist?.adminUser?.checked
|
||||
$: tenantSet = $auth.tenantSet
|
||||
$: cloud = $admin.cloud
|
||||
$: user = $auth.user
|
||||
|
||||
const validateTenantId = async () => {
|
||||
// set the tenant from the url in the cloud
|
||||
const tenantId = window.location.host.split(".")[0]
|
||||
|
||||
if (!tenantId.includes("localhost:")) {
|
||||
// user doesn't have permission to access this tenant - kick them out
|
||||
if (user && user.tenantId && user.tenantId !== tenantId) {
|
||||
await auth.logout()
|
||||
await auth.setOrganisation(null)
|
||||
} else {
|
||||
await auth.setOrganisation(tenantId)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
onMount(async () => {
|
||||
await auth.checkAuth()
|
||||
await admin.init()
|
||||
|
||||
if (cloud && multiTenancyEnabled) {
|
||||
await validateTenantId()
|
||||
}
|
||||
|
||||
loaded = true
|
||||
})
|
||||
|
||||
|
|
|
@ -80,6 +80,7 @@ export function createAuthStore() {
|
|||
|
||||
return {
|
||||
subscribe: store.subscribe,
|
||||
setOrganisation: setOrganisation,
|
||||
checkQueryString: async () => {
|
||||
const urlParams = new URLSearchParams(window.location.search)
|
||||
if (urlParams.has("tenantId")) {
|
||||
|
|
Loading…
Reference in New Issue