feat(utilities/multi_tenant): add parent tenant support

PlaceOS · Jan 21, 2025 · b9623f7 · b9623f7
1 parent e13df4c
commit b9623f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/shard.lock b/shard.lock
@@ -131,7 +131,7 @@ shards:
 
   placeos-models:
     git: https://github.com/placeos/models.git
-    version: 9.62.1
+    version: 9.62.2
 
   pool:
     git: https://github.com/ysbaddaden/pool.git

diff --git a/src/controllers/utilities/multi_tenant.cr b/src/controllers/utilities/multi_tenant.cr
@@ -54,7 +54,9 @@ module Utils::MultiTenant
     begin
       user_email_domain = token.user.email.split('@', 2)[1]
       tenants = Tenant.where("domain = ? AND (email_domain = ? OR email_domain IS NULL)", authority_domain_host, user_email_domain).to_a
-      @tenant = tenants.find(tenants.first) { |t| t.email_domain == user_email_domain } unless tenants.empty?
+      if !tenants.empty? && (found = tenants.find(tenants.first) { |t| t.email_domain == user_email_domain })
+        @tenant = found.parent || found
+      end
       Log.context.set(domain: authority_domain_host, tenant_id: @tenant.try &.id)
     rescue error
       respond_with(:not_found) do