Update RaListingService::findByIdentityId

This method used to return but one RaListing entry previously as a RA could only be RA for a single institution. With the introduction of FGA, identities can have RA duties for multiple institutions.
OpenConext · Jan 29, 2019 · 35f47c9 · 35f47c9
1 parent bc8903d
commit 35f47c9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Repository/RaListingRepository.php
@@ -47,11 +47,11 @@ public function __construct(
 
     /**
      * @param IdentityId $identityId The RA's identity id.
-     * @return null|RaListing
+     * @return null|RaListing[]
      */
     public function findByIdentityId(IdentityId $identityId)
     {
-        return parent::findOneBy(['identityId' => (string) $identityId]);
+        return parent::findBy(['identityId' => (string) $identityId]);
     }
 
     /**

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/IdentityService.php
@@ -140,7 +140,7 @@ public function findRegistrationAuthorityCredentialsByNameIdAndInstitution(NameI
      */
     private function findRegistrationAuthorityCredentialsByIdentity(Identity $identity)
     {
-        $raListing = $this->raListingRepository->findByIdentityId(new IdentityId($identity->id));
+        $raListing = $this->raListingRepository->findByIdentityIdAndRaInstitution(new IdentityId($identity->id), $identity->institution);
         $sraa = $this->sraaRepository->findByNameId($identity->nameId);
 
         if ($raListing) {

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php b/src/Surfnet/StepupMiddleware/ApiBundle/Identity/Service/RaListingService.php
@@ -39,7 +39,7 @@ public function __construct(RaListingRepository $raListingRepository)
 
     /**
      * @param IdentityId $identityId
-     * @return null|\Surfnet\StepupMiddleware\ApiBundle\Identity\Entity\RaListing
+     * @return null|RaListing[]
      */
     public function findByIdentityId(IdentityId $identityId)
     {