archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-05 18:14:04 +00:00
Code Activity

Removed select() for better flexibility, added new method setCurrentDomain(), refactored the usage of tenantIdentified().

Browse source
This commit is contained in:
Ralfs 2021-04-13 22:18:53 +03:00
parent e4a3211b34
commit 643a64b5c8
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Resolvers/DomainTenantResolver.php
View file

@ -33,13 +33,13 @@ class DomainTenantResolver extends Contracts\CachedTenantResolver
/** @var Tenant|null $tenant */ /** @var Tenant|null $tenant */
$tenant = config('tenancy.tenant_model')::query() $tenant = config('tenancy.tenant_model')::query()
->whereHas('domains', function ($query) use ($domain) { ->whereHas('domains', function ($query) use ($domain) {
$query->select(['tenant_id', 'domain'])->where('domain', $domain); $query->where('domain', $domain);
}) })
->with('domains') ->with('domains')
->first(); ->first();
if ($tenant) { if ($tenant) {
$this->tenantIdentified($tenant, ...$args); $this->setCurrentDomain($tenant, ...$args);
return $tenant; return $tenant;
} }
@ -48,6 +48,11 @@ class DomainTenantResolver extends Contracts\CachedTenantResolver
} }
public function tenantIdentified(Tenant $tenant, ...$args): void public function tenantIdentified(Tenant $tenant, ...$args): void
{
$this->setCurrentDomain($tenant, ...$args);
}
protected function setCurrentDomain(Tenant $tenant, ...$args): void
{ {
static::$currentDomain = $tenant->domains->where('domain', $args[0])->first(); static::$currentDomain = $tenant->domains->where('domain', $args[0])->first();
} }