diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php index bc7aeb3..137b41d 100644 --- a/src/Controller/MainController.php +++ b/src/Controller/MainController.php @@ -20,7 +20,8 @@ class MainController extends AbstractController public function __construct( private readonly RequestStack $requestStack, private readonly HydraService $hydra, - private readonly Client $client + private readonly Client $client, + private readonly SQLLoginRequest $sqlLoginRequest ){ } @@ -40,7 +41,7 @@ class MainController extends AbstractController } #[Route('/connect/login-accept', name: 'app_login_accept', methods: ['GET'])] - public function loginAccept(SQLLoginRequest $sqlLoginRequest): RedirectResponse + public function loginAccept(): RedirectResponse { $user = $this->getUser(); @@ -54,7 +55,7 @@ class MainController extends AbstractController $subject = $user->getLogin(); - $subjectRewriteExpression = $sqlLoginRequest->getSubjectRewriteExpression(); + $subjectRewriteExpression = $this->sqlLoginRequest->getSubjectRewriteExpression(); if (null != $subjectRewriteExpression) { $expressionLanguage = new ExpressionLanguage(); diff --git a/src/Hydra/HydraService.php b/src/Hydra/HydraService.php index da86b95..3084cf1 100644 --- a/src/Hydra/HydraService.php +++ b/src/Hydra/HydraService.php @@ -39,7 +39,7 @@ class HydraService extends AbstractController // si le challenge est validé par hydra, on le stocke en session pour l'utiliser par la suite et on redirige vers une route interne protégée qui va déclencher l'identification FranceConnect $this->requestStack->getSession()->set('challenge', $loginRequestInfo['challenge']); - return new RedirectResponse($this->baseUrl.'/connect/login-accept'); + return new RedirectResponse($this->baseUrl.'/login'); } public function handleConsentRequest(Request $request): RedirectResponse