Merge pull request #11 from cedricduffournet/error_confirmation_url

Confirmation  url was not updated correctly when reset password

Author: cedricduffournet

app/src/Controller/PublicController.php

@@ -339,6 +339,9 @@ private function resetMailConfirm(User $user, Request $request): GetResponseUser
         if (null === $user->getConfirmationToken()) {
             /* @var $tokenGenerator TokenGeneratorInterface */
             $user->setConfirmationToken($this->tokenGenerator->generateToken());
+
+            $confirmationUrl = $request->request->get('confirmationUrl');
+            $user->setConfirmationUrl($confirmationUrl);
         }
         /* Dispatch confirm event */
         $event = new GetResponseUserEvent($user, $request);
@@ -351,8 +354,6 @@ private function resetMailComplete(User $user, Request $request): GetResponseUse
     {
         $this->mailer->sendResettingEmailMessage($user);
         $user->setPasswordRequestedAt(new \DateTime());
-        $confirmationUrl = $request->request->get('confirmationUrl');
-        $user->setConfirmationUrl($confirmationUrl);
         $this->userManager->updateUser($user);
 
         /* Dispatch completed event */