X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/d3c0403000560ca0fd1b08fced1e043584bf4e54..c087e23226ca50473259a07cebe0d49cb24eee5a:/Handler/AuthenticationFailureHandler.php

diff --git a/Handler/AuthenticationFailureHandler.php b/Handler/AuthenticationFailureHandler.php
index d1c2a34..7e7c132 100644
--- a/Handler/AuthenticationFailureHandler.php
+++ b/Handler/AuthenticationFailureHandler.php
@@ -12,7 +12,14 @@
 namespace Rapsys\UserBundle\Handler;
 
 use Doctrine\Persistence\ManagerRegistry;
+
 use Psr\Log\LoggerInterface;
+
+use Rapsys\PackBundle\Util\SluggerUtil;
+
+use Rapsys\UserBundle\Exception\UnactivatedException;
+use Rapsys\UserBundle\RapsysUserBundle;
+
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -35,10 +42,6 @@ use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationFailureH
 use Symfony\Component\Security\Http\HttpUtils;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-use Rapsys\PackBundle\Util\SluggerUtil;
-use Rapsys\UserBundle\Exception\UnactivatedException;
-use Rapsys\UserBundle\RapsysUserBundle;
-
 /**
  * {@inheritdoc}
  */
@@ -47,7 +50,6 @@ class AuthenticationFailureHandler extends DefaultAuthenticationFailureHandler {
 	 * Config array
 	 */
 	protected array $config;
-	protected array $options;
 	protected array $defaultOptions = [
 		'failure_path' => null,
 		'failure_forward' => false,
@@ -56,36 +58,8 @@ class AuthenticationFailureHandler extends DefaultAuthenticationFailureHandler {
 	];
 
 	/**
-	 * Doctrine instance
-	 */
-	protected ManagerRegistry $doctrine;
-
-	/**
-	 * MailerInterface
-	 */
-	protected MailerInterface $mailer;
-
-	/**
-	 * Router instance
-	 */
-	protected RouterInterface $router;
-
-	/**
-	 * Slugger instance
-	 */
-	protected SluggerUtil $slugger;
-
-	/**
-	 * RequestStack instance
-	 */
-	protected RequestStack $stack;
-
-	/**
-	 * Translator instance
-	 */
-	protected TranslatorInterface $translator;
-
-	/**
+	 * {@inheritdoc}
+	 *
 	 * @xxx Second argument will be replaced by security.firewalls.main.logout.target
 	 * @see vendor/symfony/security-bundle/DependencyInjection/SecurityExtension.php +360
 	 *
@@ -100,33 +74,13 @@ class AuthenticationFailureHandler extends DefaultAuthenticationFailureHandler {
 	 * @param SluggerUtil $slugger The slugger instance
 	 * @param RequestStack $stack The stack instance
 	 * @param TranslatorInterface $translator The translator instance
-	 *
-	 * {@inheritdoc}
 	 */
-	public function __construct(HttpKernelInterface $httpKernel, HttpUtils $httpUtils, array $options, LoggerInterface $logger, ContainerInterface $container, ManagerRegistry $doctrine, MailerInterface $mailer, RouterInterface $router, SluggerUtil $slugger, RequestStack $stack, TranslatorInterface $translator) {
-		//Set config
-		$this->config = $container->getParameter(self::getAlias());
-
-		//Set doctrine
-		$this->doctrine = $doctrine;
-
-		//Set mailer
-		$this->mailer = $mailer;
-
-		//Set router
-		$this->router = $router;
-
-		//Set slugger
-		$this->slugger = $slugger;
-
-		//Set stack
-		$this->stack = $stack;
-
-		//Set translator
-		$this->translator = $translator;
-
+	public function __construct(protected HttpKernelInterface $httpKernel, protected HttpUtils $httpUtils, protected array $options, protected ?LoggerInterface $logger, protected ContainerInterface $container, protected ManagerRegistry $doctrine, protected MailerInterface $mailer, protected RouterInterface $router, protected SluggerUtil $slugger, protected RequestStack $stack, protected TranslatorInterface $translator) {
 		//Call parent constructor
 		parent::__construct($httpKernel, $httpUtils, $options, $logger);
+
+		//Set config
+		$this->config = $container->getParameter(RapsysUserBundle::getAlias());
 	}
 
 	/**
@@ -149,9 +103,9 @@ class AuthenticationFailureHandler extends DefaultAuthenticationFailureHandler {
 	}
 
 	/**
-	 * This is called when an interactive authentication attempt fails
-	 *
 	 * {@inheritdoc}
+	 *
+	 * This is called when an interactive authentication attempt fails
 	 */
 	public function onAuthenticationFailure(Request $request, AuthenticationException $exception): Response {
 		//With bad credential exception
@@ -233,7 +187,7 @@ class AuthenticationFailureHandler extends DefaultAuthenticationFailureHandler {
 			//With not enabled user
 			} elseif ($parent instanceof DisabledException) {
 				//Add error message account is not enabled
-				$this->addFlash('error', $this->translator->trans('Your account is not enabled'));
+				$this->addFlash('error', $this->translator->trans('Account not enabled'));
 
 				//Redirect on the same route with sent=1 to cleanup form
 				return new RedirectResponse($this->router->generate($request->get('_route'), $request->get('_route_params')), 302);
@@ -335,10 +289,10 @@ class AuthenticationFailureHandler extends DefaultAuthenticationFailureHandler {
 				}
 
 				//Add notice
-				$this->addFlash('notice', $this->translator->trans('Your verification mail has been sent, to activate your account you must follow the confirmation link inside'));
+				$this->addFlash('notice', $this->translator->trans('Your verification mail has been sent, to activate your account follow the confirmation link inside'));
 
 				//Add junk warning
-				$this->addFlash('warning', $this->translator->trans('If you did not receive a verification mail, check your Spam or Junk mail folders'));
+				$this->addFlash('warning', $this->translator->trans('If you did not receive a verification mail, check your Spam or Junk mail folder'));
 
 				//Redirect on the same route with sent=1 to cleanup form
 				return new RedirectResponse($this->router->generate($request->get('_route'), $request->get('_route_params')), 302);
@@ -348,11 +302,4 @@ class AuthenticationFailureHandler extends DefaultAuthenticationFailureHandler {
 		//Call parent function
 		return parent::onAuthenticationFailure($request, $exception);
 	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function getAlias(): string {
-		return RapsysUserBundle::getAlias();
-	}
 }