PostUserAccountResetPasswordResourceHandler optimizations

Signed-off-by: alexmerlin <[email protected]>

Author: alexmerlin

src/Core/src/User/src/Entity/User.php

@@ -117,17 +117,6 @@ public function addResetPassword(UserResetPassword $resetPassword): void
         $this->resetPasswords->add($resetPassword);
     }
 
-    public function createResetPassword(): self
-    {
-        $this->resetPasswords->add(
-            (new UserResetPassword())
-                ->setHash(self::generateHash())
-                ->setUser($this)
-        );
-
-        return $this;
-    }
-
     public function getResetPasswords(): Collection
     {
         return $this->resetPasswords;

src/User/src/Handler/Account/ResetPassword/PostUserAccountResetPasswordResourceHandler.php

@@ -5,11 +5,11 @@
 namespace Api\User\Handler\Account\ResetPassword;
 
 use Api\App\Exception\BadRequestException;
-use Api\App\Exception\ConflictException;
 use Api\App\Exception\NotFoundException;
 use Api\App\Handler\AbstractHandler;
 use Api\App\Template\RendererInterface;
 use Api\User\InputFilter\ResetPasswordInputFilter;
+use Api\User\Service\UserResetPasswordServiceInterface;
 use Api\User\Service\UserServiceInterface;
 use Core\App\Message;
 use Core\App\Service\MailService;
@@ -24,20 +24,21 @@ class PostUserAccountResetPasswordResourceHandler extends AbstractHandler
     #[Inject(
         MailService::class,
         UserServiceInterface::class,
+        UserResetPasswordServiceInterface::class,
         ResetPasswordInputFilter::class,
         RendererInterface::class,
     )]
     public function __construct(
         protected MailService $mailService,
         protected UserServiceInterface $userService,
+        protected UserResetPasswordServiceInterface $userResetPasswordService,
         protected ResetPasswordInputFilter $inputFilter,
         protected RendererInterface $renderer,
     ) {
     }
 
     /**
      * @throws BadRequestException
-     * @throws ConflictException
      * @throws MailException
      * @throws NotFoundException
      */
@@ -59,10 +60,13 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             throw NotFoundException::create(Message::USER_NOT_FOUND);
         }
 
-        $this->userService->saveUser([], $user->createResetPassword());
+        $resetPassword = $this->userResetPasswordService->saveResetPassword($user);
         $this->mailService->sendResetPasswordRequestedMail(
             $user,
-            $this->renderer->render('user::reset-password-requested', ['user' => $user])
+            $this->renderer->render('user::reset-password-requested', [
+                'user'          => $user,
+                'resetPassword' => $resetPassword,
+            ])
         );
 
         return $this->infoResponse(Message::MAIL_SENT_RESET_PASSWORD, StatusCodeInterface::STATUS_CREATED);

src/User/src/Service/UserResetPasswordService.php

@@ -6,6 +6,7 @@
 
 use Api\App\Exception\NotFoundException;
 use Core\App\Message;
+use Core\User\Entity\User;
 use Core\User\Entity\UserResetPassword;
 use Core\User\Repository\UserResetPasswordRepository;
 use Dot\DependencyInjection\Attribute\Inject;
@@ -37,4 +38,16 @@ public function findOneBy(array $params): UserResetPassword
 
         return $userResetPassword;
     }
+
+    public function saveResetPassword(User $user): UserResetPassword
+    {
+        $resetPassword = (new UserResetPassword())
+            ->setHash(User::generateHash())
+            ->setUser($user);
+        $user->addResetPassword($resetPassword);
+
+        $this->userResetPasswordRepository->saveResource($resetPassword);
+
+        return $resetPassword;
+    }
 }

src/User/src/Service/UserResetPasswordServiceInterface.php

@@ -5,6 +5,7 @@
 namespace Api\User\Service;
 
 use Api\App\Exception\NotFoundException;
+use Core\User\Entity\User;
 use Core\User\Entity\UserResetPassword;
 use Core\User\Repository\UserResetPasswordRepository;
 
@@ -16,4 +17,6 @@ public function getUserResetPasswordRepository(): UserResetPasswordRepository;
      * @throws NotFoundException
      */
     public function findOneBy(array $params): UserResetPassword;
+
+    public function saveResetPassword(User $user): UserResetPassword;
 }

src/User/templates/user/reset-password-requested.phtml

@@ -9,11 +9,8 @@ use Core\User\Entity\UserResetPassword;
 /** @var ParserInterface $this */
 /** @var array $application */
 /** @var User $user */
+/** @var UserResetPassword $resetPassword */
 
-$resetPasswords = $user->getResetPasswords()->toArray();
-usort($resetPasswords, fn(UserResetPassword $a, UserResetPassword $b) => $b->getCreated() <=> $a->getCreated());
-
-$resetPassword = array_shift($resetPasswords);
 $resetUrl = $this->absoluteUrl(
     $this->url('user::update-account-reset-password', ['hash' => $resetPassword->getHash()])
 );