refactor: Adjustment due to the immutable times and authentication check

src/App/ConfigProvider.php

@@ -6,6 +6,7 @@
 use App\Handler\Authentication\UserPasswordForgottonHandlerFactory;
 use App\Hydrator\ClassMethodsHydratorFactory;
 use App\Hydrator\DateTimeFormatterStrategyFactory;
+use App\Hydrator\DateTimeImmutableFormatterStrategyFactory;
 use App\Hydrator\NullableStrategyFactory;
 use App\Hydrator\ReflectionHydrator;
 use App\Middleware\Event\EventCreateMiddlewareFactory;
@@ -54,6 +55,7 @@
 use Envms\FluentPDO\Query;
 use Laminas\Hydrator\ClassMethodsHydrator;
 use Laminas\Hydrator\Strategy\DateTimeFormatterStrategy;
+use Laminas\Hydrator\Strategy\DateTimeImmutableFormatterStrategy;
 use Laminas\Hydrator\Strategy\NullableStrategy;
 use Laminas\ServiceManager\AbstractFactory\ConfigAbstractFactory;
 use Ramsey\Uuid\Uuid;
@@ -73,7 +75,19 @@ public function getDependencies(): array
     {
         return [
             'invokables' => [
+                LoginAuthenticationService::class,
+
+                EmailInput::class,
+                EventDescriptionInput::class,
+                EventDurationInput::class,
+                EventStartTimeInput::class,
+                EventTextInput::class,
+                EventTitleInput::class,
+                PasswordInput::class,
                 ReflectionHydrator::class,
+                TopicDescriptionInput::class,
+                TopicInput::class,
+                UsernameInput::class,
             ],
             'aliases' => [
                 EventRepository::class => EventTable::class,
@@ -85,6 +99,7 @@ public function getDependencies(): array
             'factories' => [
                 ClassMethodsHydrator::class => ClassMethodsHydratorFactory::class,
                 DateTimeFormatterStrategy::class => DateTimeFormatterStrategyFactory::class,
+                DateTimeImmutableFormatterStrategy::class => DateTimeImmutableFormatterStrategyFactory::class,
                 NullableStrategy::class => NullableStrategyFactory::class,
 
                 Handler\Authentication\LoginHandler::class => LoginHandlerFactory::class,

src/App/Handler/Authentication/LoginHandler.php

@@ -53,15 +53,11 @@ public function handle(ServerRequestInterface $request): ResponseInterface
     {
         $user = $request->getAttribute(User::AUTHENTICATED_USER);
 
-        $token = null;
-
-        if ($user instanceof User) {
-            $token = $this->generateToken(
-                $user->uuid->getHex()->toString(),
-                $this->tokenSecret,
-                $this->tokenDuration,
-            );
-        }
+        $token = $this->generateToken(
+            $user->uuid->getHex()->toString(),
+            $this->tokenSecret,
+            $this->tokenDuration,
+        );
 
         return new JsonResponse(new LoginTokenDto($token), HTTP::STATUS_OK);
     }

src/App/Hydrator/DateTimeImmutableFormatterStrategyFactory.php

@@ -0,0 +1,15 @@
+<?php declare(strict_types=1);
+
+namespace App\Hydrator;
+
+use Laminas\Hydrator\Strategy\DateTimeFormatterStrategy;
+use Laminas\Hydrator\Strategy\DateTimeImmutableFormatterStrategy;
+use Psr\Container\ContainerInterface;
+
+readonly class DateTimeImmutableFormatterStrategyFactory
+{
+    public function __invoke(ContainerInterface $container): DateTimeImmutableFormatterStrategy
+    {
+        return new DateTimeImmutableFormatterStrategy(new DateTimeFormatterStrategy('Y-m-d H:i:s'));
+    }
+}

src/App/Middleware/Authentication/LoginAuthenticationMiddleware.php

@@ -25,18 +25,12 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
     {
         $data = $request->getParsedBody();
 
-        $validationMessages = $request->getAttribute('validationMessages');
-
-        if (null !== $validationMessages) {
-            return $handler->handle($request);
-        }
-
         $name = $data['username'];
         $password = $data['password'];
 
         $user = $this->userService->findByName($name);
 
-        if (!$this->authService->isUserDataCorrect($user, $password)) {
+        if (!($user instanceof User) || !$this->authService->isUserDataCorrect($user, $password)) {
             return new JsonResponse(new SimpleMessageDto('Login failed'), HTTP::STATUS_UNAUTHORIZED);
         }
 

src/App/Service/User/UserServiceFactory.php

@@ -8,6 +8,7 @@
 use App\System\Hydrator\Strategy\UuidStrategy;
 use Laminas\Hydrator\Strategy\BackedEnumStrategy;
 use Laminas\Hydrator\Strategy\DateTimeFormatterStrategy;
+use Laminas\Hydrator\Strategy\DateTimeImmutableFormatterStrategy;
 use Psr\Container\ContainerInterface;
 use Ramsey\Uuid\Uuid;
 
@@ -21,8 +22,8 @@ public function __invoke(ContainerInterface $container): UserService
         /** @var ReflectionHydrator $hydrator */
         $hydrator = clone $container->get(ReflectionHydrator::class);
 
-        /** @var DateTimeFormatterStrategy $dateTimeFormatterStrategy */
-        $dateTimeFormatterStrategy = $container->get(DateTimeFormatterStrategy::class);
+        /** @var DateTimeImmutableFormatterStrategy $dateTimeFormatterStrategy */
+        $dateTimeFormatterStrategy = $container->get(DateTimeImmutableFormatterStrategy::class);
 
         /** @var Uuid $uuid */
         $uuid = $container->get(Uuid::class);

tests/Unit/App/Handler/Authentication/LoginHandlerTest.php

@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+namespace Test\Unit\App\Handler\Authentication;
+
+use App\Entity\User;
+use App\Handler\Authentication\LoginHandler;
+use Laminas\Diactoros\Response\JsonResponse;
+use Test\Data\Entity\UserTestEntity;
+use Test\Unit\App\Handler\AbstractHandler;
+
+use function json_decode;
+
+class LoginHandlerTest extends AbstractHandler
+{
+    public function testUserIsLoggedIn(): void
+    {
+        $handler = new LoginHandler('abcd', 100);
+
+        $response = $handler->handle(
+            $this->request->withAttribute(User::AUTHENTICATED_USER, new User(...UserTestEntity::getDefaultUserValue()))
+        );
+
+        $responseData = $response->getBody()->getContents();
+
+        $responseDataAsArray = json_decode($responseData, true);
+
+        self::assertInstanceOf(JsonResponse::class, $response);
+        self::assertIsString($responseData);
+        self::assertJson($responseData);
+        self::assertIsArray($responseDataAsArray);
+        self::assertArrayHasKey('token', $responseDataAsArray);
+    }
+}

tests/Unit/App/Service/AbstractService.php

@@ -5,6 +5,7 @@
 use App\Hydrator\ReflectionHydrator;
 use App\System\Hydrator\Strategy\UuidStrategy;
 use Laminas\Hydrator\Strategy\DateTimeFormatterStrategy;
+use Laminas\Hydrator\Strategy\DateTimeImmutableFormatterStrategy;
 use Laminas\Hydrator\Strategy\NullableStrategy;
 use PHPUnit\Framework\TestCase;
 use Ramsey\Uuid\Uuid;
@@ -14,6 +15,7 @@ abstract class AbstractService extends TestCase
 {
     protected ReflectionHydrator $hydrator;
     protected DateTimeFormatterStrategy $dateTimeFormatterStrategy;
+    protected DateTimeImmutableFormatterStrategy $dateTimeImmutableFormatterStrategy;
     protected NullableStrategy $nullableStrategy;
     protected UuidStrategy $uuidStrategy;
     protected UuidInterface $uuid;
@@ -22,6 +24,7 @@ protected function setUp(): void
     {
         $this->hydrator = new ReflectionHydrator();
         $this->dateTimeFormatterStrategy = new DateTimeFormatterStrategy();
+        $this->dateTimeImmutableFormatterStrategy = new DateTimeImmutableFormatterStrategy(new DateTimeFormatterStrategy('Y-m-d H:i:s'));
         $this->nullableStrategy = new NullableStrategy($this->dateTimeFormatterStrategy);
         $this->uuidStrategy = new UuidStrategy();
         $this->uuid = Uuid::uuid4();

tests/Unit/App/Service/UserServiceFactoryTest.php

@@ -7,6 +7,7 @@
 use App\Service\User\UserService;
 use App\Service\User\UserServiceFactory;
 use Laminas\Hydrator\Strategy\DateTimeFormatterStrategy;
+use Laminas\Hydrator\Strategy\DateTimeImmutableFormatterStrategy;
 use Laminas\Hydrator\Strategy\NullableStrategy;
 use Ramsey\Uuid\Uuid;
 use Test\Unit\Mock\MockContainer;
@@ -20,7 +21,7 @@ public function testCanCreateUserService(): void
             UserRepository::class => new MockUserTable(),
             ReflectionHydrator::class => $this->hydrator,
             NullableStrategy::class => $this->nullableStrategy,
-            DateTimeFormatterStrategy::class => $this->dateTimeFormatterStrategy,
+            DateTimeImmutableFormatterStrategy::class => $this->dateTimeFormatterStrategy,
             Uuid::class => Uuid::uuid4(),
         ]);