diff --git a/src/EventSubscriber/UserSystem/LoginSuccessSubscriber.php b/src/EventSubscriber/UserSystem/LoginSuccessSubscriber.php index 30bacb57..34e960b0 100644 --- a/src/EventSubscriber/UserSystem/LoginSuccessSubscriber.php +++ b/src/EventSubscriber/UserSystem/LoginSuccessSubscriber.php @@ -46,7 +46,7 @@ use App\Entity\LogSystem\UserLoginLogEntry; use App\Entity\UserSystem\User; use App\Services\LogSystem\EventLogger; use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface; +use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\Security\Http\Event\InteractiveLoginEvent; use Symfony\Component\Security\Http\SecurityEvents; use Symfony\Contracts\Translation\TranslatorInterface; @@ -61,10 +61,10 @@ final class LoginSuccessSubscriber implements EventSubscriberInterface private $eventLogger; private $gpdr_compliance; - public function __construct(TranslatorInterface $translator, FlashBagInterface $flashBag, EventLogger $eventLogger, bool $gpdr_compliance) + public function __construct(TranslatorInterface $translator, SessionInterface $session, EventLogger $eventLogger, bool $gpdr_compliance) { $this->translator = $translator; - $this->flashBag = $flashBag; + $this->flashBag = $session->getFlashBag(); $this->eventLogger = $eventLogger; $this->gpdr_compliance = $gpdr_compliance; } diff --git a/src/EventSubscriber/UserSystem/PasswordChangeNeededSubscriber.php b/src/EventSubscriber/UserSystem/PasswordChangeNeededSubscriber.php index 8f3b8426..0df4ef7d 100644 --- a/src/EventSubscriber/UserSystem/PasswordChangeNeededSubscriber.php +++ b/src/EventSubscriber/UserSystem/PasswordChangeNeededSubscriber.php @@ -45,6 +45,7 @@ namespace App\EventSubscriber\UserSystem; use App\Entity\UserSystem\User; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface; +use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\HttpKernel\Event\RequestEvent; use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\Security\Core\Security; @@ -77,10 +78,10 @@ final class PasswordChangeNeededSubscriber implements EventSubscriberInterface private $flashBag; private $httpUtils; - public function __construct(Security $security, FlashBagInterface $flashBag, HttpUtils $httpUtils) + public function __construct(Security $security, SessionInterface $session, HttpUtils $httpUtils) { $this->security = $security; - $this->flashBag = $flashBag; + $this->flashBag = $session->getFlashBag(); $this->httpUtils = $httpUtils; } diff --git a/src/EventSubscriber/UserSystem/RegisterU2FSubscriber.php b/src/EventSubscriber/UserSystem/RegisterU2FSubscriber.php index 190dbc65..6fecf023 100644 --- a/src/EventSubscriber/UserSystem/RegisterU2FSubscriber.php +++ b/src/EventSubscriber/UserSystem/RegisterU2FSubscriber.php @@ -52,6 +52,7 @@ use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface; +use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Contracts\EventDispatcher\EventDispatcherInterface; @@ -74,12 +75,12 @@ final class RegisterU2FSubscriber implements EventSubscriberInterface */ private $eventDispatcher; - public function __construct(UrlGeneratorInterface $router, EntityManagerInterface $entityManager, FlashBagInterface $flashBag, EventDispatcherInterface $eventDispatcher, bool $demo_mode) + public function __construct(UrlGeneratorInterface $router, EntityManagerInterface $entityManager, SessionInterface $session, EventDispatcherInterface $eventDispatcher, bool $demo_mode) { $this->router = $router; $this->em = $entityManager; $this->demo_mode = $demo_mode; - $this->flashBag = $flashBag; + $this->flashBag = $session->getFlashBag(); $this->eventDispatcher = $eventDispatcher; }