Merge pull request #385 from OpenConext/bugfix/sat-missing-params

Bugfix: add missing parameters
OpenConext · Oct 27, 2022 · c17aec2 · c17aec2
2 parents 469178d + c93a08b
commit c17aec2
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 274 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     },
     "minimum-stability": "stable",
     "require": {
-        "php": "^7.1",
+        "php": "^7.2",
         "ext-gmp": "*",
         "ext-json": "*",
         "broadway/broadway": "^2.3",
@@ -49,7 +49,7 @@
         "symfony/validator": "4.4.*",
         "twig/extensions": "^1.5",
         "twig/extra-bundle": "^2.12|^3.0",
-        "twig/twig": "^2.12|^3.0"
+        "twig/twig": "^2.15|^3.0"
     },
     "require-dev": {
         "doctrine/data-fixtures": "~1.1",

diff --git a/composer.lock b/composer.lock
diff --git a/...tepupMiddleware/CommandHandlingBundle/Processor/RecoveryTokenRevocationEmailProcessor.php b/...tepupMiddleware/CommandHandlingBundle/Processor/RecoveryTokenRevocationEmailProcessor.php
@@ -58,6 +58,7 @@ public function handleCompliedWithRecoveryCodeRevocationEvent(
             $identity->commonName,
             $identity->email,
             $event->recoveryTokenType,
+            $event->recoveryTokenId,
             true
         );
     }
@@ -75,6 +76,7 @@ public function handleRecoveryTokenRevokedEvent(RecoveryTokenRevokedEvent $event
             $identity->commonName,
             $identity->email,
             $event->recoveryTokenType,
+            $event->recoveryTokenId,
             false
         );
     }

diff --git a/...leware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php b/...leware/CommandHandlingBundle/Tests/Identity/CommandHandler/IdentityCommandHandlerTest.php
@@ -1702,11 +1702,10 @@ public function a_second_factor_cannot_be_vetted_without_physical_prove_of_posse
                     $registrantSecFacId,
                     new SecondFactorType('yubikey'),
                     new YubikeyPublicId('00028278'),
-                    new DocumentNumber('NH9392'),
                     $registrantCommonName,
                     $registrantEmail,
                     new Locale('en_GB'),
-                    VettingType::onPremise()
+                    new OnPremiseVettingType(new DocumentNumber('123456'))
                 ),
             ]);
     }

diff --git a/...re/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationState.php b/...re/MiddlewareBundle/Migrations/InstitutionConfiguration/InstitutionConfigurationState.php
@@ -71,6 +71,7 @@ public static function load(
                 $options->useRaLocationsOption,
                 $options->showRaaContactInformationOption,
                 $options->verifyEmailOption,
+                $options->selfVetOption,
                 $options->numberOfTokensPerIdentityOption,
                 $locations
             );

diff --git a/...e/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php b/...e/MiddlewareBundle/Migrations/InstitutionConfiguration/MappedInstitutionConfiguration.php
@@ -71,6 +71,7 @@ final class MappedInstitutionConfiguration
      * @param UseRaLocationsOption $useRaLocationsOption
      * @param ShowRaaContactInformationOption $showRaaContactInformationOption
      * @param VerifyEmailOption $verifyEmailOption
+     * @param SelfVetOption $setVetOption
      * @param NumberOfTokensPerIdentityOption $numberOfTokensPerIdentityOption
      * @param RaLocation[] $raLocations
      */
@@ -87,7 +88,7 @@ public function __construct(
         $this->useRaLocationsOption            = $useRaLocationsOption;
         $this->showRaaContactInformationOption = $showRaaContactInformationOption;
         $this->verifyEmailOption               = $verifyEmailOption;
-        $this->selfVetOption = $selfVetOption;
+        $this->selfVetOption                   = $selfVetOption;
         $this->numberOfTokensPerIdentityOption = $numberOfTokensPerIdentityOption;
         $this->raLocations                     = $raLocations;
     }