From e4a3211b3404a30ae2cc57befa779fa78c538696 Mon Sep 17 00:00:00 2001
From: Ralfs <ralfs221@gmail.com>
Date: Mon, 12 Apr 2021 23:53:15 +0300
Subject: [PATCH] Fixed tenant()->domains showing incorrect data. Renamed
 tenantIdentifiedFromCache() method and removed duplicate code, when setting
 current domain.

---
 src/Resolvers/Contracts/CachedTenantResolver.php |  4 ++--
 src/Resolvers/DomainTenantResolver.php           | 12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Resolvers/Contracts/CachedTenantResolver.php b/src/Resolvers/Contracts/CachedTenantResolver.php
index 986f3832..675625ce 100644
--- a/src/Resolvers/Contracts/CachedTenantResolver.php
+++ b/src/Resolvers/Contracts/CachedTenantResolver.php
@@ -38,7 +38,7 @@ abstract class CachedTenantResolver implements TenantResolver
 
         if ($this->cache->has($key)) {
             $tenant = $this->cache->get($key);
-            $this->tenantIdentifiedFromCache($tenant, ...$args);
+            $this->tenantIdentified($tenant, ...$args);
 
             return $tenant;
         }
@@ -67,7 +67,7 @@ abstract class CachedTenantResolver implements TenantResolver
 
     abstract public function resolveWithoutCache(...$args): Tenant;
 
-    public function tenantIdentifiedFromCache(Tenant $tenant, ...$args): void
+    public function tenantIdentified(Tenant $tenant, ...$args): void
     {
     }
 
diff --git a/src/Resolvers/DomainTenantResolver.php b/src/Resolvers/DomainTenantResolver.php
index c4bfd382..524acf27 100644
--- a/src/Resolvers/DomainTenantResolver.php
+++ b/src/Resolvers/DomainTenantResolver.php
@@ -35,15 +35,11 @@ class DomainTenantResolver extends Contracts\CachedTenantResolver
             ->whereHas('domains', function ($query) use ($domain) {
                 $query->select(['tenant_id', 'domain'])->where('domain', $domain);
             })
-            ->with([
-                'domains' => function ($query) use ($domain) {
-                    $query->where('domain', $domain);
-                },
-            ])
+            ->with('domains')
             ->first();
 
         if ($tenant) {
-            static::$currentDomain = $tenant->domains->first();
+            $this->tenantIdentified($tenant, ...$args);
 
             return $tenant;
         }
@@ -51,9 +47,9 @@ class DomainTenantResolver extends Contracts\CachedTenantResolver
         throw new TenantCouldNotBeIdentifiedOnDomainException($args[0]);
     }
 
-    public function tenantIdentifiedFromCache(Tenant $tenant, ...$args): void
+    public function tenantIdentified(Tenant $tenant, ...$args): void
     {
-        static::$currentDomain = $tenant->domains->first();
+        static::$currentDomain = $tenant->domains->where('domain', $args[0])->first();
     }
 
     public function getArgsForTenant(Tenant $tenant): array