Repair IdentityCommandHandlerTest.php

OpenConext · Feb 28, 2024 · 84a70b1 · 84a70b1
1 parent 4d634f7
commit 84a70b1
Show file tree

Hide file tree

Showing 40 changed files with 116 additions and 168 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php b/src/Surfnet/Stepup/Configuration/Value/AllowedSecondFactorList.php
@@ -20,6 +20,7 @@
 
 use ArrayIterator;
 use Broadway\Serializer\Serializable as SerializableInterface;
+use Iterator;
 use IteratorAggregate;
 use JsonSerializable;
 use Surfnet\StepupBundle\Value\SecondFactorType;
@@ -94,7 +95,7 @@ public function equals(AllowedSecondFactorList $other): bool
         return true;
     }
 
-    public static function deserialize(array $data)
+    public static function deserialize(array $data): self
     {
         $secondFactorTypes = array_map(
             fn($secondFactorString): SecondFactorType => new SecondFactorType($secondFactorString),
@@ -116,7 +117,7 @@ public function serialize(): array
         ];
     }
 
-    public function getIterator()
+    public function getIterator(): Iterator
     {
         return new ArrayIterator($this->allowedSecondFactors);
     }

diff --git a/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php b/src/Surfnet/Stepup/Configuration/Value/RaLocationList.php
@@ -19,6 +19,7 @@
 namespace Surfnet\Stepup\Configuration\Value;
 
 use ArrayIterator;
+use Iterator;
 use IteratorAggregate;
 use Surfnet\Stepup\Configuration\Entity\RaLocation;
 use Surfnet\Stepup\Exception\LogicException;
@@ -103,7 +104,7 @@ public function getById(RaLocationId $raLocationId)
         );
     }
 
-    public function getIterator()
+    public function getIterator(): Iterator
     {
         return new ArrayIterator($this->raLocations);
     }

diff --git a/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php b/src/Surfnet/Stepup/Identity/Collection/InstitutionCollection.php
@@ -20,6 +20,7 @@
 
 use ArrayIterator;
 use Broadway\Serializer\Serializable as SerializableInterface;
+use Iterator;
 use IteratorAggregate;
 use JsonSerializable;
 use Surfnet\Stepup\Exception\RuntimeException;
@@ -100,12 +101,12 @@ public function removeAllIn(InstitutionCollection $institutionCollection): void
         }
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return ['institutions' => $this->elements];
     }
 
-    public static function deserialize(array $data)
+    public static function deserialize(array $data): self
     {
         $institutions = array_map(fn($institution): Institution => new Institution($institution), $data);
 
@@ -117,7 +118,7 @@ public function serialize(): array
         return array_map(fn(Institution $institution): string => (string)$institution, $this->elements);
     }
 
-    public function getIterator()
+    public function getIterator(): Iterator
     {
         return new ArrayIterator($this->elements);
     }

diff --git a/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php b/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php
@@ -64,12 +64,12 @@ public function remove(VettingTypeHint $hint): void
         $this->elements = $elements;
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return $this->elements;
     }
 
-    public static function deserialize(array $data)
+    public static function deserialize(array $data): self
     {
         $institutions = array_map(
             fn(array $hint): VettingTypeHint => new VettingTypeHint($hint['locale'], $hint['hint']),

diff --git a/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php~Stashed changes b/src/Surfnet/Stepup/Identity/Collection/VettingTypeHintCollection.php~Stashed changes
diff --git a/src/Surfnet/Stepup/Identity/Entity/AbstractSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/AbstractSecondFactor.php
@@ -20,19 +20,27 @@
 
 use Broadway\EventSourcing\SimpleEventSourcedEntity;
 use Surfnet\Stepup\Identity\Value\SecondFactorIdentifier;
+use Surfnet\Stepup\Identity\Value\UnknownVettingType;
+use Surfnet\Stepup\Identity\Value\VettingType;
 use Surfnet\StepupBundle\Service\SecondFactorTypeService;
 use Surfnet\StepupBundle\Value\SecondFactorType;
+use Surfnet\StepupBundle\Value\VettingType as StepupBundleVettingType;
 
 abstract class AbstractSecondFactor extends SimpleEventSourcedEntity implements SecondFactor
 {
     public function hasEqualOrHigherLoaComparedTo(SecondFactor $comparable, SecondFactorTypeService $service): bool
     {
-        return $comparable->hasTypeWithEqualOrLowerLoaComparedTo($this->getType(), $service);
+        return $comparable->hasTypeWithEqualOrLowerLoaComparedTo($this->getType(), $this->vettingType(), $service);
     }
 
-    public function hasTypeWithEqualOrLowerLoaComparedTo(SecondFactorType $type, SecondFactorTypeService $service): bool
+    public function hasTypeWithEqualOrLowerLoaComparedTo(SecondFactorType $type, VettingType $vettingType, SecondFactorTypeService $service): bool
     {
-        return $service->hasEqualOrLowerLoaComparedTo($this->getType(), $type);
+        // SecondFactorTypeService works with the vetting type value objects
+        // from the stepup bundle, so convert them.
+        $ownVettingType = new StepupBundleVettingType($this->vettingType()->type());
+        $otherVettingType = new StepupBundleVettingType($vettingType->type());
+
+        return $service->hasEqualOrLowerLoaComparedTo($this->getType(), $ownVettingType, $type, $otherVettingType);
     }
 
     public function typeAndIdentifierAreEqual(SecondFactorType $type, SecondFactorIdentifier $identifier): bool
@@ -41,4 +49,14 @@ public function typeAndIdentifierAreEqual(SecondFactorType $type, SecondFactorId
         $identifierIsEqual = $this->getIdentifier()->equals($identifier);
         return $typeIsEqual && $identifierIsEqual;
     }
+
+    /**
+     * By default the vetting type of a token is unknown UNITL it has been vetted
+     * So only the VettedSecondFactor implementation returns anything other than
+     * the UnknownVettingType
+     */
+    public function vettingType(): VettingType
+    {
+        return new UnknownVettingType();
+    }
 }
diff --git a/src/Surfnet/Stepup/Identity/Entity/SecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/SecondFactor.php
@@ -19,6 +19,7 @@
 namespace Surfnet\Stepup\Identity\Entity;
 
 use Surfnet\Stepup\Identity\Value\SecondFactorIdentifier;
+use Surfnet\Stepup\Identity\Value\VettingType;
 use Surfnet\StepupBundle\Service\SecondFactorTypeService;
 use Surfnet\StepupBundle\Value\SecondFactorType;
 
@@ -28,6 +29,7 @@ public function hasEqualOrHigherLoaComparedTo(SecondFactor $comparable, SecondFa
 
     public function hasTypeWithEqualOrLowerLoaComparedTo(
         SecondFactorType $type,
+        VettingType $vettingType,
         SecondFactorTypeService $service,
     ): bool;
 
@@ -36,4 +38,6 @@ public function typeAndIdentifierAreEqual(SecondFactorType $type, SecondFactorId
     public function getType(): SecondFactorType;
 
     public function getIdentifier(): SecondFactorIdentifier;
+
+    public function vettingType(): VettingType;
 }
diff --git a/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php b/src/Surfnet/Stepup/Identity/Entity/VettedSecondFactor.php
@@ -26,6 +26,7 @@
 use Surfnet\Stepup\Identity\Value\SecondFactorId;
 use Surfnet\Stepup\Identity\Value\SecondFactorIdentifier;
 use Surfnet\Stepup\Identity\Value\VettingType;
+use Surfnet\StepupBundle\Service\SecondFactorTypeService;
 use Surfnet\StepupBundle\Value\SecondFactorType;
 
 /**

diff --git a/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php b/src/Surfnet/Stepup/Identity/Event/IdentityCreatedEvent.php
@@ -85,7 +85,7 @@ public function getAuditLogMetadata(): Metadata
         return $metadata;
     }
 
-    public static function deserialize(array $data): IdentityCreatedEvent
+    public static function deserialize(array $data): self
     {
         return new self(
             new IdentityId($data['id']),

diff --git a/src/Surfnet/Stepup/Identity/Value/ContactInformation.php b/src/Surfnet/Stepup/Identity/Value/ContactInformation.php
@@ -54,7 +54,7 @@ public function getContactInformation()
         return $this->contactInformation;
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): string
     {
         return $this->contactInformation;
     }

diff --git a/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php b/src/Surfnet/Stepup/Identity/Value/RegistrationAuthorityRole.php
@@ -91,7 +91,7 @@ public function __toString(): string
         return (string)$this->role;
     }
 
-    public static function deserialize(array $data)
+    public static function deserialize(array $data): self
     {
         return new self($data['role']);
     }

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php b/src/Surfnet/StepupMiddleware/ApiBundle/Configuration/Entity/RaLocation.php
@@ -86,7 +86,7 @@ public static function create(
         return $raLocation;
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             'id' => $this->id,

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationContactInformationType.php
@@ -36,7 +36,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
         return $platform->getClobTypeDeclarationSQL($column);
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed
     {
         if (is_null($value)) {
             return null;

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationInstitutionType.php
@@ -36,7 +36,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
         return $platform->getVarcharTypeDeclarationSQL($column);
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed
     {
         if (is_null($value)) {
             return $value;

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ConfigurationLocationType.php
@@ -36,7 +36,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
         return $platform->getClobTypeDeclarationSQL($column);
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed
     {
         if (is_null($value)) {
             return $value;

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/ContactInformationType.php
@@ -36,7 +36,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
         return $platform->getClobTypeDeclarationSQL($column);
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed
     {
         if (is_null($value)) {
             return $value;

diff --git a/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php b/src/Surfnet/StepupMiddleware/ApiBundle/Doctrine/Type/InstitutionRoleType.php
@@ -36,7 +36,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st
         return $platform->getVarcharTypeDeclarationSQL($column);
     }
 
-    public function convertToDatabaseValue($value, AbstractPlatform $platform)
+    public function convertToDatabaseValue($value, AbstractPlatform $platform): mixed
     {
         if (is_null($value)) {
             return $value;