remove Mailer, add SwiftMailer, fix password recover request

This commit is contained in:
2021-02-03 15:45:29 +01:00
parent 01e93f7ba3
commit 2fee88bfce
3 changed files with 69 additions and 30 deletions

View File

@@ -27,42 +27,47 @@ use Chill\MainBundle\Security\PasswordRecover\PasswordRecoverVoter;
*/
class PasswordController extends AbstractController
{
/**
*
* @var UserPasswordEncoderInterface
*/
protected $passwordEncoder;
/**
*
* @var TranslatorInterface
*/
protected $translator;
/**
*
* @var LoggerInterface
*/
protected $chillLogger;
/**
*
* @var RecoverPasswordHelper
*/
protected $recoverPasswordHelper;
/**
*
* @var TokenManager
*/
protected $tokenManager;
/**
*
* @var EventDispatcherInterface
*/
protected $eventDispatcher;
/**
* PasswordController constructor.
*
* @param LoggerInterface $chillLogger
* @param UserPasswordEncoderInterface $passwordEncoder
* @param RecoverPasswordHelper $recoverPasswordHelper
* @param TokenManager $tokenManager
* @param TranslatorInterface $translator
* @param EventDispatcherInterface $eventDispatcher
*/
public function __construct(
LoggerInterface $chillLogger,
UserPasswordEncoderInterface $passwordEncoder,
@@ -80,7 +85,6 @@ class PasswordController extends AbstractController
}
/**
*
* @param Request $request
* @return Response
*/
@@ -128,8 +132,6 @@ class PasswordController extends AbstractController
}
/**
*
*
* @param User $user
* @return \Symfony\Component\Form\Form
*/
@@ -144,8 +146,11 @@ class PasswordController extends AbstractController
->add('submit', SubmitType::class, array('label' => 'Change password'))
;
}
/**
* @param Request $request
* @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
*/
public function recoverAction(Request $request)
{
if (FALSE === $this->isGranted(PasswordRecoverVoter::ASK_TOKEN)) {
@@ -205,11 +210,20 @@ class PasswordController extends AbstractController
}
/**
* @return Response
*/
public function changeConfirmedAction()
{
return $this->render('@ChillMain/Password/recover_password_changed.html.twig');
}
/**
* @param Request $request
* @return \Symfony\Component\HttpFoundation\RedirectResponse|Response
* @throws \Doctrine\ORM\NoResultException
* @throws \Doctrine\ORM\NonUniqueResultException
*/
public function requestRecoverAction(Request $request)
{
if (FALSE === $this->isGranted(PasswordRecoverVoter::ASK_TOKEN)) {
@@ -277,11 +291,17 @@ class PasswordController extends AbstractController
]);
}
/**
* @return Response
*/
public function requestRecoverConfirmAction()
{
return $this->render('@ChillMain/Password/request_recover_password_confirm.html.twig');
}
/**
* @return \Symfony\Component\Form\FormInterface
*/
protected function requestRecoverForm()
{
$builder = $this->createFormBuilder();