Merge pull request #167 from crf-devs/improve-login-log

Improve login log
crf-devs · Mar 28, 2020 · 3abc461 · 3abc461
2 parents b538c36 + 6020a44
commit 3abc461
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 3 deletions.
diff --git a/src/Entity/Organization.php b/src/Entity/Organization.php
@@ -18,7 +18,7 @@
  * )
  * @ORM\Entity(repositoryClass="App\Repository\OrganizationRepository")
  */
-class Organization implements UserInterface
+class Organization implements UserInterface, \JsonSerializable
 {
     /**
      * @ORM\Id
@@ -59,6 +59,14 @@ public function __toString(): string
         return $this->name;
     }
 
+    public function jsonSerialize(): array
+    {
+        return [
+            'id' => $this->id,
+            'name' => $this->__toString(),
+        ];
+    }
+
     public function getRoles(): array
     {
         return ['ROLE_ORGANIZATION'];

diff --git a/src/Entity/User.php b/src/Entity/User.php
@@ -5,6 +5,7 @@
 namespace App\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use JsonSerializable;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Component\Security\Core\User\UserInterface;
 use function Symfony\Component\String\u;
@@ -25,7 +26,7 @@
  * @UniqueEntity("emailAddress")
  * @UniqueEntity("identificationNumber")
  */
-class User implements UserInterface, AvailabilitableInterface
+class User implements UserInterface, AvailabilitableInterface, JsonSerializable
 {
     const NIVOL_FORMAT = '#^\d+[A-Z]$#';
 
@@ -162,6 +163,14 @@ public function __toString(): string
         return $this->organization->name.' / '.$this->getFullName();
     }
 
+    public function jsonSerialize(): array
+    {
+        return [
+            'id' => $this->id,
+            'identificationNumber' => $this->identificationNumber,
+        ];
+    }
+
     public function getId(): ?int
     {
         return $this->id;

diff --git a/src/EventListener/RequestLoggerListener.php b/src/EventListener/RequestLoggerListener.php
@@ -11,6 +11,9 @@
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
+use Symfony\Component\Security\Http\SecurityEvents;
 
 final class RequestLoggerListener implements EventSubscriberInterface, LoggerAwareInterface
 {
@@ -30,6 +33,9 @@ public static function getSubscribedEvents(): array
                 ['onRequest', 255],
                 ['logUser'],
             ],
+            SecurityEvents::INTERACTIVE_LOGIN => [
+                ['onLogin'],
+            ],
         ];
     }
 
@@ -60,7 +66,30 @@ public function logUser(RequestEvent $event): void
             return;
         }
 
-        $this->logger->info('User logged in', ['username' => (string) $this->tokenStorage->getToken()->getUser()]);
+        $user = $this->tokenStorage->getToken()->getUser();
+        if (!$user instanceof UserInterface) {
+            return;
+        }
+
+        $this->logLogIn($user);
+    }
+
+    public function onLogin(InteractiveLoginEvent $event): void
+    {
+        $user = $event->getAuthenticationToken()->getUser();
+        if (!$user instanceof UserInterface) {
+            return;
+        }
+
+        $this->logLogIn($user);
+    }
+
+    private function logLogIn(UserInterface $user): void
+    {
+        if (!$user instanceof \JsonSerializable) {
+            return;
+        }
+        $this->logger->info('User logged in', $user->jsonSerialize());
     }
 
     private static function isHealthCheck(Request $request): bool

diff --git a/src/Monolog/Processor/ChangeLevelProcessor.php b/src/Monolog/Processor/ChangeLevelProcessor.php
@@ -12,6 +12,7 @@ class ChangeLevelProcessor implements ProcessorInterface
     private static array $debugMessages = [
         'Matched route',
         'Populated the TokenStorage with an anonymous Token',
+        'Guard authentication successful',
     ];
 
     public function __invoke(array $record): array