fix merge

This commit is contained in:
Christian Flothmann 2018-10-10 16:48:55 +02:00
parent d9c9e0cf52
commit 61cf143727

View File

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