PasswordChange should reset any pending password reset requests

composer · Jan 5, 2024 · dec62de · dec62de
1 parent 9e34e90
commit dec62de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/Controller/ChangePasswordController.php b/src/Controller/ChangePasswordController.php
@@ -31,6 +31,7 @@ public function changePasswordAction(Request $request, UserPasswordHasherInterfa
  $form->handleRequest($request);
 
  if ($form->isSubmitted() && $form->isValid()) {
+ $user->resetPasswordRequest();
  $user->setPassword(
  $passwordHasher->hashPassword(
  $user,

diff --git a/src/Controller/ResetPasswordController.php b/src/Controller/ResetPasswordController.php
@@ -102,8 +102,7 @@ public function reset(Request $request, UserPasswordHasherInterface $passwordHas
  $form->handleRequest($request);
 
  if ($form->isSubmitted() && $form->isValid()) {
- $user->setPasswordRequestedAt(null);
- $user->clearConfirmationToken();
+ $user->resetPasswordRequest();
  if (!$user->hasRole('ROLE_SPAMMER')) {
  $user->setEnabled(true);
  }

diff --git a/src/Entity/User.php b/src/Entity/User.php
@@ -454,6 +454,12 @@ public function setPasswordRequestedAt(DateTimeInterface|null $date = null): voi
  $this->passwordRequestedAt = $date;
  }
 
+ public function resetPasswordRequest(): void
+ {
+ $this->setPasswordRequestedAt(null);
+ $this->clearConfirmationToken();
+ }
+
  /**
  * Gets the timestamp that the user requested a password reset.
  */