User: logout reason is cached

Author: dg

src/Security/User.php

@@ -59,6 +59,9 @@ class User
 	/** @var bool|null */
 	private $authenticated;
 
+	/** @var int|null */
+	private $logoutReason;
+
 
 	public function __construct(
 		IUserStorage $storage,
@@ -98,6 +101,7 @@ public function login($user, string $password = null): void
 		$this->storage->setAuthenticated(true);
 		$this->identity = $user;
 		$this->authenticated = true;
+		$this->logoutReason = null;
 		$this->onLoggedIn($this);
 	}
 
@@ -111,6 +115,7 @@ final public function logout(bool $clearIdentity = false): void
 			$this->onLoggedOut($this);
 			$this->storage->setAuthenticated(false);
 			$this->authenticated = false;
+			$this->logoutReason = self::MANUAL;
 		}
 		if ($clearIdentity) {
 			$this->storage->setIdentity(null);
@@ -147,6 +152,7 @@ private function getStoredData(): void
 	{
 		$this->authenticated = $this->storage->isAuthenticated();
 		$this->identity = $this->storage->getIdentity();
+		$this->logoutReason = $this->storage->getLogoutReason();
 	}
 
 
@@ -163,7 +169,7 @@ public function getId()
 
 	final public function refreshStorage(): void
 	{
-		$this->identity = $this->authenticated = null;
+		$this->identity = $this->authenticated = $this->logoutReason = null;
 	}
 
 
@@ -239,7 +245,7 @@ public function setExpiration($expire, /*int*/$flags = 0)
 	 */
 	final public function getLogoutReason(): ?int
 	{
-		return $this->storage->getLogoutReason();
+		return $this->logoutReason;
 	}
 
 

tests/Security/MockUserStorage.php

@@ -40,5 +40,6 @@ public function setExpiration(?string $time, int $flags = 0)
 
 	public function getLogoutReason(): ?int
 	{
+		return null;
 	}
 }