Merge branch 'develop' into release/3.1

OpenConext · Mar 16, 2020 · 7d38d0b · 7d38d0b
2 parents 065b4eb + ac3e087
commit 7d38d0b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 89 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+# 3.1.6
+**Bugfix**
+ * Disable ra-candidate fulltext search #300
+ * Show the correct RA candidates for the virtual institution use case #299
+
 # 3.1.5
 **Bugfix**
  * Fix invalid RA candidate authorization #298

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -154,9 +154,6 @@ doctrine:
                         dir: "%kernel.root_dir%/../src/Surfnet/StepupMiddleware/ManagementBundle/Configuration"
                         prefix: Surfnet\StepupMiddleware\ManagementBundle\Configuration
                         is_bundle: false
-                dql:
-                    string_functions:
-                        MATCH_AGAINST: \Surfnet\StepupMiddleware\ApiBundle\Doctrine\Query\MatchAgainst
             gateway:
                 connection: gateway
                 naming_strategy: doctrine.orm.naming_strategy.underscore

diff --git a/...tepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php b/...tepupMiddleware/ApiBundle/Configuration/Repository/InstitutionAuthorizationRepository.php
@@ -59,16 +59,15 @@ public function findAuthorizationOptionsForInstitution(Institution $institution)
 
     /**
      * @param Institution $institution
-     * @param InstitutionRole $role
      * @return InstitutionAuthorization[]
      */
-    public function findSelectRaasForInstitution(Institution $institution, InstitutionRole $role)
+    public function findSelectRaasForInstitution(Institution $institution)
     {
         return $this->createQueryBuilder('ia')
             ->where('ia.institutionRelation = :institution')
             ->andWhere('ia.institutionRole = :role')
             ->setParameter('institution', $institution->getInstitution())
-            ->setParameter('role', $role->getType())
+            ->setParameter('role', InstitutionRole::selectRaa()->getType())
             ->getQuery()
             ->getResult();
     }

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Query/MatchAgainst.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Query/MatchAgainst.php
diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaCandidateProjector.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Projector/RaCandidateProjector.php
@@ -22,6 +22,7 @@
 use Surfnet\Stepup\Configuration\Event\InstitutionConfigurationRemovedEvent;
 use Surfnet\Stepup\Configuration\Event\SelectRaaOptionChangedEvent;
 use Surfnet\Stepup\Configuration\Event\SraaUpdatedEvent;
+use Surfnet\Stepup\Configuration\Value\InstitutionRole;
 use Surfnet\Stepup\Identity\Collection\InstitutionCollection;
 use Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaaForInstitutionEvent;
 use Surfnet\Stepup\Identity\Event\IdentityAccreditedAsRaForInstitutionEvent;
@@ -308,13 +309,13 @@ private function addCandidateToProjection(
         CommonName $identityCommonName,
         Email $identityEmail
     ) {
-        $institutionAuthorizations = $this->institutionAuthorizationRepository
-            ->findAuthorizationOptionsForInstitution(new ConfigurationInstitution($identityInstitution->getInstitution()));
+        $selectRaaInstitutions = $this->institutionAuthorizationRepository->findSelectRaasForInstitution(
+            new ConfigurationInstitution($identityInstitution->getInstitution())
+        );
 
         $institutions = [];
-        foreach ($institutionAuthorizations as $authorization) {
-            $raInstitutionName = $authorization->institutionRelation->getInstitution();
-            $institutions[$raInstitutionName] = new Institution($raInstitutionName);
+        foreach ($selectRaaInstitutions as $institution) {
+            $institutions[$institution->institution->getInstitution()] = new Institution($institution->institution->getInstitution());
         }
 
         foreach ($institutions as $institution) {

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/IdentityRepository.php
@@ -90,14 +90,14 @@ public function createSearchQuery(
 
         if ($query->email) {
             $queryBuilder
-                ->andWhere('MATCH_AGAINST(i.email, :email) > 0')
-                ->setParameter('email', $query->email);
+                ->andWhere('i.email LIKE :email')
+                ->setParameter('email', sprintf('%%%s%%', $query->email));
         }
 
         if ($query->commonName) {
             $queryBuilder
-                ->andWhere('MATCH_AGAINST(i.commonName, :commonName) > 0')
-                ->setParameter('commonName', $query->commonName);
+                ->andWhere('i.commonName LIKE :commonName')
+                ->setParameter('commonName', sprintf('%%%s%%', $query->commonName));
         }
 
         return $queryBuilder->getQuery();

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaCandidateRepository.php
@@ -184,14 +184,14 @@ public function createSearchQuery(RaCandidateQuery $query)
 
         if ($query->commonName) {
             $queryBuilder
-                ->andWhere('MATCH_AGAINST(rac.commonName, :commonName) > 0')
-                ->setParameter('commonName', $query->commonName);
+                ->andWhere('rac.commonName LIKE :commonName')
+                ->setParameter('commonName', sprintf('%%%s%%', $query->commonName));
         }
 
         if ($query->email) {
             $queryBuilder
-                ->andWhere('MATCH_AGAINST(rac.email, :email) > 0')
-                ->setParameter('email', $query->email);
+                ->andWhere('rac.email LIKE :email')
+                ->setParameter('email', sprintf('%%%s%%', $query->email));
         }
 
         if (!empty($query->secondFactorTypes)) {