bug fixing

Author: dmitriy

.dockerignore

@@ -15,4 +15,5 @@
 Dockerfile
 docker-compose.yml
 docker-compose-test-ci.yml
+docker-compose-staging.yml
 docker-compose-prod.yml

composer.lock

@@ -112,4 +112,5 @@ After above command you will be inside symfony container and for display list of
 ./bin/console db:wait                               # Waits for database availability (1 mins max)
 ./bin/console utils:create-date-dimension-entities  # Create 'DateDimension' entities
 ./bin/console messenger:setup-transports            # Initialize transports for Messenger component
+./bin/console logs:cleanup                          # Command to cleanup logs(log_login, log_request) in the database
 ```

docs/commands.md

@@ -39,12 +39,12 @@ class ApiKey extends RestDto
      * @Assert\NotBlank()
      * @Assert\NotNull()
      */
-    protected string $description;
+    protected string $description = '';
 
     /**
      * @var string
      */
-    protected string $token;
+    protected string $token = '';
 
     /**
      * @var UserGroupEntity[]|array<int, UserGroupEntity>

src/DTO/ApiKey/ApiKey.php

@@ -11,6 +11,7 @@
 use App\Repository\UserRepository;
 use App\Doctrine\DBAL\Types\EnumLogLoginType;
 use Lexik\Bundle\JWTAuthenticationBundle\Event\AuthenticationSuccessEvent;
+use Lexik\Bundle\JWTAuthenticationBundle\Events;
 use Throwable;
 
 /**
@@ -56,7 +57,7 @@ public function __construct(LoginLoggerService $loginLoggerService, UserReposito
     public static function getSubscribedEvents(): array
     {
         return [
-            AuthenticationSuccessEvent::class => 'onAuthenticationSuccess',
+            Events::AUTHENTICATION_SUCCESS => 'onAuthenticationSuccess', //AuthenticationSuccessEvent::class
         ];
     }
 

src/EventSubscriber/AuthenticationSuccessSubscriber.php

@@ -13,6 +13,7 @@
 use App\Entity\User;
 use Lexik\Bundle\JWTAuthenticationBundle\Event\AuthenticationFailureEvent;
 use Lexik\Bundle\JWTAuthenticationBundle\Event\AuthenticationSuccessEvent;
+use Lexik\Bundle\JWTAuthenticationBundle\Events;
 use Symfony\Component\Security\Core\Exception\LockedException;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Throwable;
@@ -62,7 +63,7 @@ public function __construct(UserRepository $userRepository, LogLoginFailureResou
     public static function getSubscribedEvents(): array
     {
         return [
-            AuthenticationSuccessEvent::class => [
+            Events::AUTHENTICATION_SUCCESS => [ //AuthenticationSuccessEvent::class
                 'onAuthenticationSuccess',
                 128,
             ],

src/EventSubscriber/LockedUserSubscriber.php

@@ -8,6 +8,7 @@
 
 use App\Entity\LogLoginFailure as Entity;
 use App\Entity\User;
+use Ramsey\Uuid\Doctrine\UuidBinaryOrderedTimeType;
 
 /**
  * Class LogLoginFailureRepository
@@ -43,7 +44,7 @@ public function clear(User $user): int
             ->createQueryBuilder('logLoginFailure')
             ->delete()
             ->where('logLoginFailure.user = :user')
-            ->setParameter('user', $user);
+            ->setParameter('user', $user->getId(), UuidBinaryOrderedTimeType::NAME);
 
         // Return deleted row count
         return (int)$queryBuilder->getQuery()->execute();

src/Repository/LogLoginFailureRepository.php

@@ -18,8 +18,6 @@
 /**
  * Interface RepositoryInterface
  *
- * TODO: Deprecated, see App\Repository\Interfaces\BaseRepositoryInterface
- *
  * @package App\Rest\Interfaces
  */
 interface RepositoryInterface