Refactor findAllForUserEntity and findOneByCredentialId methods

The methods findAllForUserEntity and findOneByCredentialId in DoctrineCredentialSourceRepository have been refactored to use the QueryBuilder instead of previous findBy/findOneBy methods for better readability and control over SQL queries. The findOneByCredentialId now also sets a limit to the query results.
web-auth · Jul 12, 2024 · 180f4f2 · 180f4f2
1 parent 611f380
commit 180f4f2
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -295,6 +295,16 @@ parameters:
 			count: 1
 			path: src/symfony/src/Doctrine/Type/TrustPathDataType.php
 
+		-
+			message: "#^Method Webauthn\\\\Bundle\\\\Repository\\\\DoctrineCredentialSourceRepository\\:\\:findAllForUserEntity\\(\\) should return array\\<Webauthn\\\\PublicKeyCredentialSource\\> but returns mixed\\.$#"
+			count: 1
+			path: src/symfony/src/Repository/DoctrineCredentialSourceRepository.php
+
+		-
+			message: "#^Method Webauthn\\\\Bundle\\\\Repository\\\\DoctrineCredentialSourceRepository\\:\\:findOneByCredentialId\\(\\) should return Webauthn\\\\PublicKeyCredentialSource\\|null but returns mixed\\.$#"
+			count: 1
+			path: src/symfony/src/Repository/DoctrineCredentialSourceRepository.php
+
 		-
 			message: "#^Property Webauthn\\\\Bundle\\\\Security\\\\Authentication\\\\Token\\\\WebauthnToken\\:\\:\\$extensions \\(Webauthn\\\\AuthenticationExtensions\\\\AuthenticationExtensions\\|null\\) does not accept mixed\\.$#"
 			count: 1

diff --git a/src/symfony/src/Repository/DoctrineCredentialSourceRepository.php b/src/symfony/src/Repository/DoctrineCredentialSourceRepository.php
@@ -42,20 +42,28 @@ public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredent
             ->flush();
     }
 
-    /**
-     * @return array<T>
-     */
     public function findAllForUserEntity(PublicKeyCredentialUserEntity $publicKeyCredentialUserEntity): array
     {
-        return $this->findBy([
-            'userHandle' => $publicKeyCredentialUserEntity->id,
-        ]);
+        return $this->getEntityManager()
+            ->createQueryBuilder()
+            ->from($this->class, 'c')
+            ->select('c')
+            ->where('c.userHandle = :userHandle')
+            ->setParameter(':userHandle', $publicKeyCredentialUserEntity->id)
+            ->getQuery()
+            ->execute();
     }
 
     public function findOneByCredentialId(string $publicKeyCredentialId): ?PublicKeyCredentialSource
     {
-        return $this->findOneBy([
-            'publicKeyCredentialId' => base64_encode($publicKeyCredentialId),
-        ]);
+        return $this->getEntityManager()
+            ->createQueryBuilder()
+            ->from($this->class, 'c')
+            ->select('c')
+            ->where('c.publicKeyCredentialId = :publicKeyCredentialId')
+            ->setParameter(':publicKeyCredentialId', base64_encode($publicKeyCredentialId))
+            ->setMaxResults(1)
+            ->getQuery()
+            ->getOneOrNullResult();
     }
 }