User: identity and authenticated state are cached, UserStorage is not called repeatedly

Author: dg

src/Security/User.php

@@ -53,6 +53,12 @@ class User
 	/** @var IAuthorizator|null */
 	private $authorizator;
 
+	/** @var IIdentity|null|false  false means undefined */
+	private $identity = false;
+
+	/** @var bool|null */
+	private $authenticated;
+
 
 	public function __construct(IUserStorage $storage, IAuthenticator $authenticator = null, IAuthorizator $authorizator = null)
 	{
@@ -84,6 +90,8 @@ public function login($user, string $password = null): void
 		}
 		$this->storage->setIdentity($user);
 		$this->storage->setAuthenticated(true);
+		$this->identity = $user;
+		$this->authenticated = true;
 		$this->onLoggedIn($this);
 	}
 
@@ -96,9 +104,11 @@ final public function logout(bool $clearIdentity = false): void
 		if ($this->isLoggedIn()) {
 			$this->onLoggedOut($this);
 			$this->storage->setAuthenticated(false);
+			$this->authenticated = false;
 		}
 		if ($clearIdentity) {
 			$this->storage->setIdentity(null);
+			$this->identity = null;
 		}
 	}
 
@@ -108,7 +118,10 @@ final public function logout(bool $clearIdentity = false): void
 	 */
 	final public function isLoggedIn(): bool
 	{
-		return $this->storage->isAuthenticated();
+		if ($this->authenticated === null) {
+			$this->authenticated = $this->storage->isAuthenticated();
+		}
+		return $this->authenticated;
 	}
 
 
@@ -117,7 +130,10 @@ final public function isLoggedIn(): bool
 	 */
 	final public function getIdentity(): ?IIdentity
 	{
-		return $this->storage->getIdentity();
+		if ($this->identity === false) {
+			$this->identity = $this->storage->getIdentity();
+		}
+		return $this->identity;
 	}