Merge pull request #539 from DirectoryTree/bug-538

Don't query when model `guid` is null
DirectoryTree · Jun 13, 2023 · d4024f4 · d4024f4
2 parents 259b56c + 00b21d0
commit d4024f4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/LdapUserRepository.php b/src/LdapUserRepository.php
@@ -50,7 +50,11 @@ public function findBy(string $attribute, mixed $value): ?Model
      */
     public function findByModel(LdapAuthenticatable $model): ?Model
     {
-        return $this->findByGuid($model->getLdapGuid());
+        if (empty($guid = $model->getLdapGuid())) {
+            return null;
+        }
+
+        return $this->findByGuid($guid);
     }
 
     /**

diff --git a/src/Testing/EmulatesQueries.php b/src/Testing/EmulatesQueries.php
@@ -13,7 +13,6 @@
 use LdapRecord\Models\BatchModification;
 use LdapRecord\Models\Model as LdapRecord;
 use LdapRecord\Query\Collection;
-use LdapRecord\Query\Model\Builder;
 use Ramsey\Uuid\Uuid;
 
 trait EmulatesQueries

diff --git a/tests/Unit/LdapUserRepositoryTest.php b/tests/Unit/LdapUserRepositoryTest.php
@@ -121,6 +121,19 @@ public function test_find_by_model_returns_model()
         $this->assertSame($model, $repository->findByModel($authenticatable));
     }
 
+    public function test_find_by_model_returns_null_when_no_guid_is_present()
+    {
+        $repository = m::mock(LdapUserRepository::class, function ($repository) {
+            $repository->makePartial()->shouldAllowMockingProtectedMethods();
+            $repository->shouldNotReceive('newModelQuery');
+        });
+
+        $authenticatable = m::mock(LdapAuthenticatable::class);
+        $authenticatable->shouldReceive('getLdapGuid')->once()->andReturnNull();
+
+        $this->assertNull($repository->findByModel($authenticatable));
+    }
+
     public function test_find_by_guid_returns_model()
     {
         $model = new Entry();