Merge branch '4.1'

* 4.1:
  fix merge
This commit is contained in:
Christian Flothmann 2018-10-10 16:58:57 +02:00
commit 493c13a9fb

View File

@ -175,17 +175,13 @@ class ContextListener implements ListenerInterface
// tokens can be deauthenticated if the user has been changed.
if (!$newToken->isAuthenticated()) {
if ($this->logoutOnUserChange) {
$userDeauthenticated = true;
$userDeauthenticated = true;
if (null !== $this->logger) {
$this->logger->debug('Cannot refresh token because user has changed.', array('username' => $refreshedUser->getUsername(), 'provider' => \get_class($provider)));
}
continue;
if (null !== $this->logger) {
$this->logger->debug('Cannot refresh token because user has changed.', array('username' => $refreshedUser->getUsername(), 'provider' => \get_class($provider)));
}
return null;
continue;
}
$token->setUser($refreshedUser);