Implement validateClient in the ClientRepository

Author: Tsvetomir Lazarov

src/Repository/Pdo/ClientRepository.php

@@ -10,6 +10,7 @@
 
 namespace Zend\Expressive\Authentication\OAuth2\Repository\Pdo;
 
+use League\OAuth2\Server\Entities\ClientEntityInterface;
 use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
 use Zend\Expressive\Authentication\OAuth2\Entity\ClientEntity;
 
@@ -32,17 +33,17 @@ public function getClientEntity(
         $sth->bindParam(':clientIdentifier', $clientIdentifier);
 
         if (false === $sth->execute()) {
-            return;
+            return null;
         }
         $row = $sth->fetch();
         if (empty($row) || ! $this->isGranted($row, $grantType)) {
-            return;
+            return null;
         }
 
         if ($mustValidateSecret
             && (empty($row['secret']) || ! password_verify((string) $clientSecret, $row['secret']))
         ) {
-            return;
+            return null;
         }
 
         return new ClientEntity($clientIdentifier, $row['name'], $row['redirect']);
@@ -68,4 +69,18 @@ protected function isGranted(array $row, string $grantType = null) : bool
                 return true;
         }
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function validateClient($clientIdentifier, $clientSecret, $grantType) : bool
+    {
+        $client = $this->getClientEntity(
+            $clientIdentifier,
+            $grantType,
+            $clientSecret
+        );
+
+        return $client instanceof ClientEntityInterface;
+    }
 }