Skip to content

Commit 1b382e7

Browse files
committed
Repair the SelfVet ACS Controller
The controller was not autoconfigurable fixed that by adding a service definition. And the MW client bundle command: SelfVetSecondFactorCommand was not configured correctly. A none existant field was set on it. Repaired that
1 parent 35d9c68 commit 1b382e7

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

src/Surfnet/StepupSelfService/SelfServiceBundle/Controller/SelfVet/SelfVetConsumeController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function consumeSelfVetAssertion(Request $httpRequest, string $secondFact
9797
$samlLogger->error(
9898
sprintf(
9999
'Expected a response to the request with ID "%s", but the SAMLResponse was a response to a different request',
100-
$initiatedRequestId
100+
$initiatedRequestId->requestId()
101101
)
102102
);
103103
throw new AuthenticationException('Unexpected InResponseTo in SAMLResponse');

src/Surfnet/StepupSelfService/SelfServiceBundle/Resources/config/services.yaml

+12-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,21 @@ services:
3030
- '@surfnet_saml.http.redirect_binding'
3131
- '@surfnet_saml.http.post_binding'
3232
- '@surfnet_saml.hosted.service_provider'
33-
- '@self_service.second_factor_test_idp'
33+
- '@surfnet_saml.remote.idp'
3434
- '@surfnet_saml.logger'
3535
- '@logger'
3636

37+
Surfnet\StepupSelfService\SelfServiceBundle\Controller\SelfVet\SelfVetConsumeController:
38+
arguments:
39+
- "@logger"
40+
- "@surfnet_stepup_self_service_self_service.service.second_factor"
41+
- "@self_service.service.self_vet_marshaller"
42+
- "@surfnet_saml.hosted.service_provider"
43+
- '@surfnet_saml.remote.idp'
44+
- "@surfnet_saml.http.post_binding"
45+
- "@surfnet_saml.logger"
46+
- "@request_stack"
47+
3748
surfnet_stepup_self_service_self_service.service.command:
3849
class: Surfnet\StepupSelfService\SelfServiceBundle\Service\CommandService
3950
arguments:

src/Surfnet/StepupSelfService/SelfServiceBundle/Service/SecondFactorService.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function selfVet(SelfVetCommand $command): bool
8484
$apiCommand->secondFactorId = $command->secondFactor->secondFactorIdentifier;
8585
$apiCommand->secondFactorType = $command->secondFactor->type;
8686
$apiCommand->authorityId = $command->identity->id;
87-
$apiCommand->authoringSecondFactorLoa = $command->authoringLoa;
87+
$apiCommand->authoringSecondFactorIdentifier = $command->authoringLoa;
8888

8989
$result = $this->commandService->execute($apiCommand);
9090
return $result->isSuccessful();

0 commit comments

Comments
 (0)