Move consent queries to existing repository

The consent queries added to the ConsentRepository.php file (deleted)
should have been added to the existing DbalConsentRepository. While at
it, naming conventions have been applied to the query names. And the
service config was updated.

Author: MKodde

src/OpenConext/EngineBlock/Authentication/Repository/ConsentRepository.php

@@ -37,4 +37,10 @@ public function findAllFor($userId);
     public function deleteAllFor($userId);
 
     public function deleteOneFor(string $userId, string $serviceProviderEntityId): bool;
+
+    public function hasConsentHash(array $parameters): bool;
+
+    public function storeConsentHash(array $parameters): bool;
+
+    public function countTotalConsent($consentUid): int;
 }

src/OpenConext/EngineBlock/Service/Consent/ConsentHashRepository.php

@@ -18,7 +18,7 @@
 
 namespace OpenConext\EngineBlock\Service\Consent;
 
-use PDO;
+use OpenConext\EngineBlock\Authentication\Repository\ConsentRepository;
 use function array_filter;
 use function array_keys;
 use function array_values;
@@ -36,28 +36,28 @@
 final class ConsentHashService
 {
     /**
-     * @var ConsentHashRepository
+     * @var ConsentRepository
      */
-    private $consentHashRepository;
+    private $consentRepository;
 
-    public function __construct(ConsentHashRepository $consentHashRepository)
+    public function __construct(ConsentRepository $consentHashRepository)
     {
-        $this->consentHashRepository = $consentHashRepository;
+        $this->consentRepository = $consentHashRepository;
     }
 
-    public function retrieveConsentHashFromDb(PDO $dbh, array $parameters): bool
+    public function retrieveConsentHashFromDb(array $parameters): bool
     {
-        return $this->consentHashRepository->retrieveConsentHashFromDb($dbh, $parameters);
+        return $this->consentRepository->hasConsentHash($parameters);
     }
 
-    public function storeConsentHashInDb(PDO $dbh, array $parameters): bool
+    public function storeConsentHashInDb(array $parameters): bool
     {
-        return $this->consentHashRepository->storeConsentHashInDb($dbh, $parameters);
+        return $this->consentRepository->storeConsentHash($parameters);
     }
 
-    public function countTotalConsent(PDO $dbh, $consentUid): int
+    public function countTotalConsent($consentUid): int
     {
-        return $this->consentHashRepository->countTotalConsent($dbh, $consentUid);
+        return $this->consentRepository->countTotalConsent($consentUid);
     }
 
     public function getUnstableAttributesHash(array $attributes, bool $mustStoreValues): string

src/OpenConext/EngineBlock/Service/Consent/ConsentHashService.php

@@ -26,6 +26,7 @@
 use OpenConext\EngineBlock\Authentication\Value\ConsentType;
 use OpenConext\EngineBlock\Exception\RuntimeException;
 use PDO;
+use PDOException;
 use Psr\Log\LoggerInterface;
 use function sha1;
 
@@ -56,7 +57,7 @@ public function __construct(DbalConnection $connection, LoggerInterface $logger)
      */
     public function findAllFor($userId)
     {
-        $sql       = '
+        $sql = '
             SELECT
                 service_id
             ,   consent_date
@@ -129,7 +130,8 @@ public function deleteOneFor(string $userId, string $serviceProviderEntityId): b
                 hashed_user_id = :hashed_user_id
             AND
                 service_id = :service_id
-            AND deleted_at IS NULL
+            AND
+                deleted_at IS NULL
         ';
         try {
             $result = $this->connection->executeQuery(
@@ -161,4 +163,79 @@ public function deleteOneFor(string $userId, string $serviceProviderEntityId): b
             );
         }
     }
+
+    /**
+     * @throws RuntimeException
+     */
+    public function hasConsentHash(array $parameters): bool
+    {
+        try {
+            $query = "
+                        SELECT
+                            *
+                        FROM
+                            {$this->_tableName}
+                        WHERE
+                            hashed_user_id = ?
+                        AND
+                            service_id = ?
+                        AND
+                            attribute = ?
+                        AND
+                            consent_type = ?
+                        AND
+                            deleted_at IS NULL
+            ";
+
+            $statement = $this->connection->prepare($query);
+            $statement->execute($parameters);
+            $rows = $statement->fetchAll();
+
+            if (count($rows) < 1) {
+                // No stored consent found
+                return false;
+            }
+
+            return true;
+        } catch (PDOException $e) {
+            throw new RuntimeException(sprintf('Consent retrieval failed! Error: "%s"', $e->getMessage()));
+        }
+    }
+
+    /**
+     * @throws RuntimeException
+     */
+    public function storeConsentHash(array $parameters): bool
+    {
+        $query = "INSERT INTO consent (hashed_user_id, service_id, attribute, consent_type, consent_date, deleted_at)
+                  VALUES (?, ?, ?, ?, NOW(), '0000-00-00 00:00:00')
+                  ON DUPLICATE KEY UPDATE attribute=VALUES(attribute), consent_type=VALUES(consent_type), consent_date=NOW()";
+        $statement = $this->connection->prepare($query);
+        if (!$statement) {
+            throw new RuntimeException("Unable to create a prepared statement to insert consent?!");
+        }
+
+        if (!$statement->execute($parameters)) {
+            throw new RuntimeException(
+                sprintf('Error storing consent: "%s"', var_export($statement->errorInfo(), true))
+            );
+        }
+
+        return true;
+    }
+
+    /**
+     * @throws RuntimeException
+     */
+    public function countTotalConsent($consentUid): int
+    {
+        $query = "SELECT COUNT(*) FROM consent where hashed_user_id = ? AND deleted_at IS NULL";
+        $parameters = array(sha1($consentUid));
+        $statement = $this->connection->prepare($query);
+        if (!$statement) {
+            throw new RuntimeException("Unable to create a prepared statement to count consent?!");
+        }
+        $statement->execute($parameters);
+        return (int)$statement->fetchColumn();
+    }
 }

src/OpenConext/EngineBlockBundle/Authentication/Repository/DbalConsentRepository.php

@@ -367,10 +367,7 @@ services:
         tags:
              - { name: 'twig.extension' }
 
-    engineblock.service.consent.ConsentHashRepository:
-        class: OpenConext\EngineBlock\Service\Consent\ConsentHashRepository
-
     engineblock.service.consent.ConsentHashService:
         class: OpenConext\EngineBlock\Service\Consent\ConsentHashService
         arguments:
-            - "engineblock.service.consent.ConsentHashRepository"
+            - "@engineblock.repository.consent"

src/OpenConext/EngineBlockBundle/Resources/config/services.yml

@@ -20,6 +20,7 @@
 
 use Mockery as m;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
+use OpenConext\EngineBlock\Authentication\Repository\ConsentRepository;
 use PHPUnit\Framework\TestCase;
 
 class ConsentHashServiceTest extends TestCase
@@ -33,7 +34,7 @@ class ConsentHashServiceTest extends TestCase
 
     public function setUp()
     {
-        $mockConsentHashRepository = m::mock('OpenConext\EngineBlock\Service\Consent\ConsentHashRepository');
+        $mockConsentHashRepository = m::mock(ConsentRepository::class);
         $this->chs = new ConsentHashService($mockConsentHashRepository);
     }