Integrate upstream consent changes

Author: MKodde

library/EngineBlock/Application/DiContainer.php

@@ -152,7 +152,7 @@ public function getAuthenticationLoopGuard()
     }
 
     /**
-     * @return OpenConext\EngineBlock\Service\ConsentService
+     * @return OpenConext\EngineBlock\Service\Consent\ConsentService
      */
     public function getConsentService()
     {

library/EngineBlock/Corto/Model/Consent.php

@@ -18,7 +18,7 @@
 
 use OpenConext\EngineBlock\Metadata\Entity\ServiceProvider;
 use OpenConext\EngineBlock\Authentication\Value\ConsentType;
-use OpenConext\EngineBlock\Service\ConsentHashServiceInterface;
+use OpenConext\EngineBlock\Service\Consent\ConsentHashServiceInterface;
 
 class EngineBlock_Corto_Model_Consent
 {

library/EngineBlock/Corto/Module/Service/ProvideConsent.php

@@ -19,7 +19,7 @@
 use OpenConext\EngineBlock\Metadata\Entity\IdentityProvider;
 use OpenConext\EngineBlock\Metadata\Entity\ServiceProvider;
 use OpenConext\EngineBlock\Service\AuthenticationStateHelperInterface;
-use OpenConext\EngineBlock\Service\ConsentServiceInterface;
+use OpenConext\EngineBlock\Service\Consent\ConsentServiceInterface;
 use OpenConext\EngineBlock\Service\ProcessingStateHelperInterface;
 use SAML2\Constants;
 use Symfony\Component\HttpFoundation\Request;

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

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace OpenConext\EngineBlock\Service;
+namespace OpenConext\EngineBlock\Service\Consent;
 
 use Exception;
 use OpenConext\EngineBlock\Authentication\Dto\Consent;
@@ -25,6 +25,7 @@
 use OpenConext\EngineBlock\Authentication\Repository\ConsentRepository;
 use OpenConext\EngineBlock\Authentication\Value\CollabPersonId;
 use OpenConext\EngineBlock\Exception\RuntimeException;
+use OpenConext\EngineBlock\Service\MetadataServiceInterface;
 use OpenConext\Value\Saml\EntityId;
 use Psr\Log\LoggerInterface;
 use function sprintf;
@@ -37,7 +38,7 @@ final class ConsentService implements ConsentServiceInterface
     private $consentRepository;
 
     /**
-     * @var MetadataService
+     * @var MetadataServiceInterface
      */
     private $metadataService;
 

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

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-namespace OpenConext\EngineBlock\Service;
+namespace OpenConext\EngineBlock\Service\Consent;
 
 use OpenConext\EngineBlock\Authentication\Dto\ConsentList;
 use OpenConext\EngineBlock\Authentication\Value\CollabPersonId;

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

@@ -170,11 +170,10 @@ public function deleteOneFor(string $userId, string $serviceProviderEntityId): b
     public function hasConsentHash(array $parameters): bool
     {
         try {
-            $query = "
-                        SELECT
+            $query = " SELECT
                             *
                         FROM
-                            {$this->_tableName}
+                            consent
                         WHERE
                             hashed_user_id = ?
                         AND

src/OpenConext/EngineBlockBundle/Controller/Api/ConsentController.php

@@ -19,7 +19,7 @@
 namespace OpenConext\EngineBlockBundle\Controller\Api;
 
 use OpenConext\EngineBlock\Exception\RuntimeException;
-use OpenConext\EngineBlock\Service\ConsentServiceInterface;
+use OpenConext\EngineBlock\Service\Consent\ConsentServiceInterface;
 use OpenConext\EngineBlockBundle\Configuration\FeatureConfigurationInterface;
 use OpenConext\EngineBlockBundle\Exception\InvalidArgumentException as EngineBlockInvalidArgumentException;
 use OpenConext\EngineBlockBundle\Factory\CollabPersonIdFactory;

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

@@ -47,7 +47,6 @@ services:
         class: EngineBlock_Corto_Model_Consent_Factory
         arguments:
             - "@engineblock.compat.corto_filter_command_factory"
-            - "@engineblock.compat.database_connection_factory"
             - "@engineblock.service.consent.ConsentHashService"
 
     engineblock.compat.saml2_id_generator:

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

@@ -72,7 +72,7 @@ services:
             - "@engineblock.configuration.stepup.loa_repository"
 
     engineblock.service.consent:
-        class: OpenConext\EngineBlock\Service\ConsentService
+        class: OpenConext\EngineBlock\Service\Consent\ConsentService
         arguments:
             - "@engineblock.repository.consent"
             - "@engineblock.service.metadata"

tests/library/EngineBlock/Test/Corto/Model/ConsentTest.php

@@ -18,7 +18,7 @@
 
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use OpenConext\EngineBlock\Metadata\Entity\ServiceProvider;
-use OpenConext\EngineBlock\Service\ConsentHashServiceInterface;
+use OpenConext\EngineBlock\Service\Consent\ConsentHashServiceInterface;
 use PHPUnit\Framework\TestCase;
 
 class EngineBlock_Corto_Model_Consent_Test extends TestCase