|
|
|
@ -5,7 +5,6 @@ namespace App\Controller; |
|
|
|
use App\Entity\User; |
|
|
|
use App\Entity\User; |
|
|
|
use App\Form\ChangePasswordFormType; |
|
|
|
use App\Form\ChangePasswordFormType; |
|
|
|
use App\Form\ResetPasswordRequestFormType; |
|
|
|
use App\Form\ResetPasswordRequestFormType; |
|
|
|
use Doctrine\ORM\EntityManagerInterface; |
|
|
|
|
|
|
|
use Symfony\Bridge\Twig\Mime\TemplatedEmail; |
|
|
|
use Symfony\Bridge\Twig\Mime\TemplatedEmail; |
|
|
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; |
|
|
|
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; |
|
|
|
use Symfony\Component\HttpFoundation\RedirectResponse; |
|
|
|
use Symfony\Component\HttpFoundation\RedirectResponse; |
|
|
|
@ -13,9 +12,8 @@ use Symfony\Component\HttpFoundation\Request; |
|
|
|
use Symfony\Component\HttpFoundation\Response; |
|
|
|
use Symfony\Component\HttpFoundation\Response; |
|
|
|
use Symfony\Component\Mailer\MailerInterface; |
|
|
|
use Symfony\Component\Mailer\MailerInterface; |
|
|
|
use Symfony\Component\Mime\Address; |
|
|
|
use Symfony\Component\Mime\Address; |
|
|
|
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface; |
|
|
|
|
|
|
|
use Symfony\Component\Routing\Annotation\Route; |
|
|
|
use Symfony\Component\Routing\Annotation\Route; |
|
|
|
use Symfony\Contracts\Translation\TranslatorInterface; |
|
|
|
use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface; |
|
|
|
use SymfonyCasts\Bundle\ResetPassword\Controller\ResetPasswordControllerTrait; |
|
|
|
use SymfonyCasts\Bundle\ResetPassword\Controller\ResetPasswordControllerTrait; |
|
|
|
use SymfonyCasts\Bundle\ResetPassword\Exception\ResetPasswordExceptionInterface; |
|
|
|
use SymfonyCasts\Bundle\ResetPassword\Exception\ResetPasswordExceptionInterface; |
|
|
|
use SymfonyCasts\Bundle\ResetPassword\ResetPasswordHelperInterface; |
|
|
|
use SymfonyCasts\Bundle\ResetPassword\ResetPasswordHelperInterface; |
|
|
|
@ -27,13 +25,11 @@ class ResetPasswordController extends AbstractController |
|
|
|
{ |
|
|
|
{ |
|
|
|
use ResetPasswordControllerTrait; |
|
|
|
use ResetPasswordControllerTrait; |
|
|
|
|
|
|
|
|
|
|
|
private ResetPasswordHelperInterface $resetPasswordHelper; |
|
|
|
private $resetPasswordHelper; |
|
|
|
private EntityManagerInterface $entityManager; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public function __construct(ResetPasswordHelperInterface $resetPasswordHelper, EntityManagerInterface $entityManager) |
|
|
|
public function __construct(ResetPasswordHelperInterface $resetPasswordHelper) |
|
|
|
{ |
|
|
|
{ |
|
|
|
$this->resetPasswordHelper = $resetPasswordHelper; |
|
|
|
$this->resetPasswordHelper = $resetPasswordHelper; |
|
|
|
$this->entityManager = $entityManager; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
@ -41,7 +37,7 @@ class ResetPasswordController extends AbstractController |
|
|
|
* |
|
|
|
* |
|
|
|
* @Route("", name="app_forgot_password_request") |
|
|
|
* @Route("", name="app_forgot_password_request") |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public function request(Request $request, MailerInterface $mailer, TranslatorInterface $translator): Response |
|
|
|
public function request(Request $request, MailerInterface $mailer): Response |
|
|
|
{ |
|
|
|
{ |
|
|
|
$form = $this->createForm(ResetPasswordRequestFormType::class); |
|
|
|
$form = $this->createForm(ResetPasswordRequestFormType::class); |
|
|
|
$form->handleRequest($request); |
|
|
|
$form->handleRequest($request); |
|
|
|
@ -49,8 +45,7 @@ class ResetPasswordController extends AbstractController |
|
|
|
if ($form->isSubmitted() && $form->isValid()) { |
|
|
|
if ($form->isSubmitted() && $form->isValid()) { |
|
|
|
return $this->processSendingPasswordResetEmail( |
|
|
|
return $this->processSendingPasswordResetEmail( |
|
|
|
$form->get('email')->getData(), |
|
|
|
$form->get('email')->getData(), |
|
|
|
$mailer, |
|
|
|
$mailer |
|
|
|
$translator |
|
|
|
|
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -82,7 +77,7 @@ class ResetPasswordController extends AbstractController |
|
|
|
* |
|
|
|
* |
|
|
|
* @Route("/reset/{token}", name="app_reset_password") |
|
|
|
* @Route("/reset/{token}", name="app_reset_password") |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public function reset(Request $request, UserPasswordHasherInterface $userPasswordHasher, TranslatorInterface $translator, string $token = null): Response |
|
|
|
public function reset(Request $request, UserPasswordEncoderInterface $passwordEncoder, string $token = null): Response |
|
|
|
{ |
|
|
|
{ |
|
|
|
if ($token) { |
|
|
|
if ($token) { |
|
|
|
// We store the token in session and remove it from the URL, to avoid the URL being |
|
|
|
// We store the token in session and remove it from the URL, to avoid the URL being |
|
|
|
@ -101,9 +96,8 @@ class ResetPasswordController extends AbstractController |
|
|
|
$user = $this->resetPasswordHelper->validateTokenAndFetchUser($token); |
|
|
|
$user = $this->resetPasswordHelper->validateTokenAndFetchUser($token); |
|
|
|
} catch (ResetPasswordExceptionInterface $e) { |
|
|
|
} catch (ResetPasswordExceptionInterface $e) { |
|
|
|
$this->addFlash('reset_password_error', sprintf( |
|
|
|
$this->addFlash('reset_password_error', sprintf( |
|
|
|
'%s - %s', |
|
|
|
'There was a problem validating your reset request - %s', |
|
|
|
$translator->trans(ResetPasswordExceptionInterface::MESSAGE_PROBLEM_VALIDATE, [], 'ResetPasswordBundle'), |
|
|
|
$e->getReason() |
|
|
|
$translator->trans($e->getReason(), [], 'ResetPasswordBundle') |
|
|
|
|
|
|
|
)); |
|
|
|
)); |
|
|
|
|
|
|
|
|
|
|
|
return $this->redirectToRoute('app_forgot_password_request'); |
|
|
|
return $this->redirectToRoute('app_forgot_password_request'); |
|
|
|
@ -117,14 +111,14 @@ class ResetPasswordController extends AbstractController |
|
|
|
// A password reset token should be used only once, remove it. |
|
|
|
// A password reset token should be used only once, remove it. |
|
|
|
$this->resetPasswordHelper->removeResetRequest($token); |
|
|
|
$this->resetPasswordHelper->removeResetRequest($token); |
|
|
|
|
|
|
|
|
|
|
|
// Encode(hash) the plain password, and set it. |
|
|
|
// Encode the plain password, and set it. |
|
|
|
$encodedPassword = $userPasswordHasher->hashPassword( |
|
|
|
$encodedPassword = $passwordEncoder->encodePassword( |
|
|
|
$user, |
|
|
|
$user, |
|
|
|
$form->get('plainPassword')->getData() |
|
|
|
$form->get('plainPassword')->getData() |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
$user->setPassword($encodedPassword); |
|
|
|
$user->setPassword($encodedPassword); |
|
|
|
$this->entityManager->flush(); |
|
|
|
$this->getDoctrine()->getManager()->flush(); |
|
|
|
|
|
|
|
|
|
|
|
// The session is cleaned up after the password has been changed. |
|
|
|
// The session is cleaned up after the password has been changed. |
|
|
|
$this->cleanSessionAfterReset(); |
|
|
|
$this->cleanSessionAfterReset(); |
|
|
|
@ -137,9 +131,9 @@ class ResetPasswordController extends AbstractController |
|
|
|
]); |
|
|
|
]); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private function processSendingPasswordResetEmail(string $emailFormData, MailerInterface $mailer, TranslatorInterface $translator): RedirectResponse |
|
|
|
private function processSendingPasswordResetEmail(string $emailFormData, MailerInterface $mailer): RedirectResponse |
|
|
|
{ |
|
|
|
{ |
|
|
|
$user = $this->entityManager->getRepository(User::class)->findOneBy([ |
|
|
|
$user = $this->getDoctrine()->getRepository(User::class)->findOneBy([ |
|
|
|
'email' => $emailFormData, |
|
|
|
'email' => $emailFormData, |
|
|
|
]); |
|
|
|
]); |
|
|
|
|
|
|
|
|
|
|
|
@ -156,16 +150,15 @@ class ResetPasswordController extends AbstractController |
|
|
|
// Caution: This may reveal if a user is registered or not. |
|
|
|
// Caution: This may reveal if a user is registered or not. |
|
|
|
// |
|
|
|
// |
|
|
|
// $this->addFlash('reset_password_error', sprintf( |
|
|
|
// $this->addFlash('reset_password_error', sprintf( |
|
|
|
// '%s - %s', |
|
|
|
// 'There was a problem handling your password reset request - %s', |
|
|
|
// $translator->trans(ResetPasswordExceptionInterface::MESSAGE_PROBLEM_HANDLE, [], 'ResetPasswordBundle'), |
|
|
|
// $e->getReason() |
|
|
|
// $translator->trans($e->getReason(), [], 'ResetPasswordBundle') |
|
|
|
|
|
|
|
// )); |
|
|
|
// )); |
|
|
|
|
|
|
|
|
|
|
|
return $this->redirectToRoute('app_check_email'); |
|
|
|
return $this->redirectToRoute('app_check_email'); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$email = (new TemplatedEmail()) |
|
|
|
$email = (new TemplatedEmail()) |
|
|
|
->from(new Address('mailer@sfycas.local', '"Sfycas mail bot"')) |
|
|
|
->from(new Address('k.jouini@tyr.local', 'SfyCAS Mail Bot')) |
|
|
|
->to($user->getEmail()) |
|
|
|
->to($user->getEmail()) |
|
|
|
->subject('Your password reset request') |
|
|
|
->subject('Your password reset request') |
|
|
|
->htmlTemplate('reset_password/email.html.twig') |
|
|
|
->htmlTemplate('reset_password/email.html.twig') |
|
|
|
|
