chg: pkg: upgrade the doctrine related back-end pkgs to the latest available version #7
This commit is contained in:
@@ -86,10 +86,9 @@ class SecurityController extends AbstractController
|
||||
if ($form->isSubmitted() && $form->isValid()) {
|
||||
$token = bin2hex(random_bytes(32));
|
||||
|
||||
$user
|
||||
->setIsVerified(false)
|
||||
->setVerificationToken($token)
|
||||
->setPassword($hasher->hashPassword($user, $form->get('plainPassword')->getData()));
|
||||
$user->isVerified = false;
|
||||
$user->verificationToken = $token;
|
||||
$user->password = $hasher->hashPassword($user, $form->get('plainPassword')->getData());
|
||||
|
||||
$em->persist($user);
|
||||
$em->flush();
|
||||
@@ -108,7 +107,7 @@ class SecurityController extends AbstractController
|
||||
$mailer->send(
|
||||
new TemplatedEmail()
|
||||
->from('noreply@mineseeker.hu')
|
||||
->to($user->getEmail())
|
||||
->to($user->email)
|
||||
->subject('Activate your MineSeeker account')
|
||||
->htmlTemplate('emails/activation.html.twig')
|
||||
->context([
|
||||
@@ -130,7 +129,7 @@ class SecurityController extends AbstractController
|
||||
])
|
||||
);
|
||||
|
||||
$this->addFlash('verify_email', $user->getEmail());
|
||||
$this->addFlash('verify_email', $user->email);
|
||||
|
||||
return $this->redirectToRoute('MineSeekerBundle_register');
|
||||
}
|
||||
@@ -156,11 +155,10 @@ class SecurityController extends AbstractController
|
||||
$email = $form->get('email')->getData();
|
||||
$user = $userRepository->findOneByEmail($email);
|
||||
|
||||
if ($user && $user->isVerified()) {
|
||||
if ($user && $user->isVerified) {
|
||||
$token = bin2hex(random_bytes(32));
|
||||
$user
|
||||
->setResetToken($token)
|
||||
->setResetTokenExpiresAt(new DateTime('+1 hour'));
|
||||
$user->resetToken = $token;
|
||||
$user->resetTokenExpiresAt = new DateTime('+1 hour');
|
||||
$em->flush();
|
||||
|
||||
$resetUrl = $this->generateUrl(
|
||||
@@ -206,7 +204,7 @@ class SecurityController extends AbstractController
|
||||
): Response {
|
||||
$user = $userRepository->findOneByResetToken($token);
|
||||
|
||||
if (!$user || $user->getResetTokenExpiresAt() < new DateTime()) {
|
||||
if (!$user || $user->resetTokenExpiresAt < new DateTime()) {
|
||||
$this->addFlash('error', 'This password reset link is invalid or has expired.');
|
||||
return $this->redirectToRoute('MineSeekerBundle_forgot_password');
|
||||
}
|
||||
@@ -215,10 +213,9 @@ class SecurityController extends AbstractController
|
||||
$form->handleRequest($request);
|
||||
|
||||
if ($form->isSubmitted() && $form->isValid()) {
|
||||
$user
|
||||
->setPassword($hasher->hashPassword($user, $form->get('plainPassword')->getData()))
|
||||
->setResetToken(null)
|
||||
->setResetTokenExpiresAt(null);
|
||||
$user->password = $hasher->hashPassword($user, $form->get('plainPassword')->getData());
|
||||
$user->resetToken = null;
|
||||
$user->resetTokenExpiresAt = null;
|
||||
$em->flush();
|
||||
|
||||
$this->addFlash('success', 'Your password has been reset. You can now sign in.');
|
||||
@@ -239,7 +236,8 @@ class SecurityController extends AbstractController
|
||||
return $this->redirectToRoute('MineSeekerBundle_login');
|
||||
}
|
||||
|
||||
$user->setIsVerified(true)->setVerificationToken(null);
|
||||
$user->isVerified = true;
|
||||
$user->verificationToken = null;
|
||||
$em->flush();
|
||||
|
||||
/** Send admin notification about account activation */
|
||||
|
||||
Reference in New Issue
Block a user