Add CancelUserPasswordRequest command (#315)

ro0NL · web-flow · commit 2052039cb824 · 2019-03-30T09:23:38.000+01:00
diff --git a/Command/CancelUserPasswordRequest.php b/Command/CancelUserPasswordRequest.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MsgPhp\User\Command;
+
+use MsgPhp\User\UserId;
+
+/**
+ * @author Roland Franssen <franssen.roland@gmail.com>
+ */
+class CancelUserPasswordRequest
+{
+    /**
+     * @var UserId
+     */
+    public $userId;
+
+    public function __construct(UserId $userId)
+    {
+        $this->userId = $userId;
+    }
+}
diff --git a/Command/Handler/CancelUserPasswordRequestHandler.php b/Command/Handler/CancelUserPasswordRequestHandler.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MsgPhp\User\Command\Handler;
+
+use MsgPhp\Domain\Event\DomainEvent;
+use MsgPhp\Domain\Event\EventSourcingCommandHandlerTrait;
+use MsgPhp\Domain\Factory\DomainObjectFactory;
+use MsgPhp\Domain\Message\DomainMessageBus;
+use MsgPhp\Domain\Message\MessageDispatchingTrait;
+use MsgPhp\User\Command\CancelUserPasswordRequest;
+use MsgPhp\User\Event\Domain\CancelPasswordRequest;
+use MsgPhp\User\Event\UserPasswordRequestCanceled;
+use MsgPhp\User\Repository\UserRepository;
+use MsgPhp\User\User;
+
+/**
+ * @author Roland Franssen <franssen.roland@gmail.com>
+ */
+final class CancelUserPasswordRequestHandler
+{
+    use EventSourcingCommandHandlerTrait;
+    use MessageDispatchingTrait;
+
+    /**
+     * @var UserRepository
+     */
+    private $repository;
+
+    public function __construct(DomainObjectFactory $factory, DomainMessageBus $bus, UserRepository $repository)
+    {
+        $this->factory = $factory;
+        $this->bus = $bus;
+        $this->repository = $repository;
+    }
+
+    public function __invoke(CancelUserPasswordRequest $command): void
+    {
+        $this->handle($command, function (User $user): void {
+            $this->repository->save($user);
+            $this->dispatch(UserPasswordRequestCanceled::class, compact('user'));
+        });
+    }
+
+    protected function getDomainEvent(CancelUserPasswordRequest $command): DomainEvent
+    {
+        return $this->factory->create(CancelPasswordRequest::class);
+    }
+
+    protected function getDomainEventTarget(CancelUserPasswordRequest $command): User
+    {
+        return $this->repository->find($command->userId);
+    }
+}
diff --git a/Event/Domain/CancelPasswordRequest.php b/Event/Domain/CancelPasswordRequest.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MsgPhp\User\Event\Domain;
+
+use MsgPhp\Domain\Event\DomainEvent;
+
+/**
+ * @author Roland Franssen <franssen.roland@gmail.com>
+ */
+class CancelPasswordRequest implements DomainEvent
+{
+}
diff --git a/Event/UserPasswordRequestCanceled.php b/Event/UserPasswordRequestCanceled.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MsgPhp\User\Event;
+
+use MsgPhp\User\User;
+
+/**
+ * @author Roland Franssen <franssen.roland@gmail.com>
+ */
+class UserPasswordRequestCanceled
+{
+    /**
+     * @var User
+     */
+    public $user;
+
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+}
diff --git a/Model/ResettablePassword.php b/Model/ResettablePassword.php
@@ -4,6 +4,7 @@
 
 namespace MsgPhp\User\Model;
 
+use MsgPhp\User\Event\Domain\CancelPasswordRequest;
 use MsgPhp\User\Event\Domain\RequestPassword;
 
 /**
@@ -37,20 +38,27 @@ public function requestPassword(string $token = null): void
         $this->passwordRequestedAt = new \DateTimeImmutable();
     }
 
-    public function clearPasswordRequest(): void
+    public function cancelPasswordRequest(): void
     {
         $this->passwordResetToken = null;
         $this->passwordRequestedAt = null;
     }
 
     private function onRequestPasswordEvent(RequestPassword $event): bool
     {
-        if (null === $event->token || $event->token !== $this->passwordResetToken) {
-            $this->requestPassword($event->token);
+        $this->requestPassword($event->token);
 
-            return true;
+        return true;
+    }
+
+    private function onCancelPasswordRequestEvent(CancelPasswordRequest $event): bool
+    {
+        if (null === $this->passwordRequestedAt) {
+            return false;
         }
 
-        return false;
+        $this->cancelPasswordRequest();
+
+        return true;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace MsgPhp\User\Model;`
`6`	`6`
	`7`	`+use MsgPhp\User\Event\Domain\CancelPasswordRequest;`
`7`	`8`	`use MsgPhp\User\Event\Domain\RequestPassword;`
`8`	`9`
`9`	`10`	`/**`
`@@ -37,20 +38,27 @@ public function requestPassword(string $token = null): void`
`37`	`38`	`$this->passwordRequestedAt = new \DateTimeImmutable();`
`38`	`39`	`}`
`39`	`40`
`40`		`- public function clearPasswordRequest(): void`
	`41`	`+ public function cancelPasswordRequest(): void`
`41`	`42`	`{`
`42`	`43`	`$this->passwordResetToken = null;`
`43`	`44`	`$this->passwordRequestedAt = null;`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`private function onRequestPasswordEvent(RequestPassword $event): bool`
`47`	`48`	`{`
`48`		`- if (null === $event->token \|\| $event->token !== $this->passwordResetToken) {`
`49`		`- $this->requestPassword($event->token);`
	`49`	`+ $this->requestPassword($event->token);`
`50`	`50`
`51`		`- return true;`
	`51`	`+ return true;`
	`52`	`+ }`
	`53`	`+`
	`54`	`+ private function onCancelPasswordRequestEvent(CancelPasswordRequest $event): bool`
	`55`	`+ {`
	`56`	`+ if (null === $this->passwordRequestedAt) {`
	`57`	`+ return false;`
`52`	`58`	`}`
`53`	`59`
`54`		`- return false;`
	`60`	`+ $this->cancelPasswordRequest();`
	`61`	`+`
	`62`	`+ return true;`
`55`	`63`	`}`
`56`	`64`	`}`