Track session usage when setting the token

Author: wouterj

Authentication/Token/Storage/TokenStorage.php

@@ -49,6 +49,11 @@ public function setToken(TokenInterface $token = null)
             @trigger_error(sprintf('Not implementing the "%s::getRoleNames()" method in "%s" is deprecated since Symfony 4.3.', TokenInterface::class, \get_class($token)), E_USER_DEPRECATED);
         }
 
+        if ($token) {
+            // ensure any initializer is called
+            $this->getToken();
+        }
+
         $this->initializer = null;
         $this->token = $token;
     }

Authentication/Token/Storage/UsageTrackingTokenStorage.php

@@ -52,6 +52,11 @@ public function getToken(): ?TokenInterface
     public function setToken(TokenInterface $token = null): void
     {
         $this->storage->setToken($token);
+
+        if ($token && $this->enableUsageTracking) {
+            // increments the internal session usage index
+            $this->sessionLocator->get('session')->getMetadataBag();
+        }
     }
 
     public function enableUsageTracking(): void