Merge pull request #2771 from Budibase/feature/subdomain-tenantid

adding subdomain checking to tenancy middleware
2021-09-29 09:56:53 +01:00 · 2021-09-29 09:56:53 +01:00 · 3c40444b33
parent 2657a685f9 6e2508797a
commit 3c40444b33
1 changed files with 5 additions and 0 deletions
--- a/packages/auth/src/tenancy/context.js
+++ b/packages/auth/src/tenancy/context.js
@ -53,6 +53,11 @@ exports.setTenantId = (
  // processed later in the chain
  tenantId = user.tenantId || header || tenantId

+  // Set the tenantId from the subdomain
+  if (!tenantId) {
+    tenantId = ctx.subdomains && ctx.subdomains[0]
+  }
+
  if (!tenantId && !allowNoTenant) {
    ctx.throw(403, "Tenant id not set")
  }