Merge pull request #2674 from nextcloud/bugfix/fix-user-memoization

Fix: Remove user memoization

Author: Koc

lib/CurrentUser.php

@@ -17,13 +17,6 @@
 
 class CurrentUser {
 
-	/** @var string|null */
-	protected $identifier = null;
-	/** @var string|false|null */
-	protected $cloudId = false;
-	/** @var string|false|null */
-	protected $sessionUser = false;
-
 	public function __construct(
 		protected IUserSession $userSession,
 		protected IRequest $request,
@@ -41,65 +34,48 @@ public function getUser(): ?IUser {
 	 * @return string
 	 */
 	public function getUserIdentifier() {
-		if ($this->identifier !== null) {
-			return $this->identifier;
-		}
-
 		$uid = $this->getUID();
 		if ($uid !== null) {
-			$this->identifier = $uid;
-			return $this->identifier;
+			return $uid;
 		}
 
 		$cloudId = $this->getCloudIDFromToken();
 		if ($cloudId !== null) {
-			$this->identifier = $cloudId;
-			return $this->identifier;
+			return $cloudId;
 		}
 
 		$nickname = htmlspecialchars($this->request->getHeader('X-NC-Nickname'));
 		if ($nickname !== '') {
-			$this->identifier = $nickname . ' (' . $this->l10nFactory->get('comments')->t('remote user') . ')';
-			return $this->identifier;
+			return $nickname . ' (' . $this->l10nFactory->get('comments')->t('remote user') . ')';
 		}
 
 		// Nothing worked, fallback to empty string
-		$this->identifier = '';
-		return $this->identifier;
+		return '';
 	}
 
 	/**
 	 * Get the current user id from the session
 	 * @return string|null
 	 */
 	public function getUID() {
-		if ($this->sessionUser === false) {
-			$user = $this->userSession->getUser();
-			if ($user instanceof IUser) {
-				$this->sessionUser = $user->getUID();
-			} else {
-				$this->sessionUser = null;
-			}
+		$user = $this->userSession->getUser();
+		if ($user instanceof IUser) {
+			return (string)$user->getUID();
 		}
-
-		return $this->sessionUser;
+		return null;
 	}
 
 	/**
 	 * Get the current user cloud id from the session
 	 * @return string|null
 	 */
 	public function getCloudId() {
-		if ($this->cloudId === false) {
-			$user = $this->userSession->getUser();
-			if ($user instanceof IUser) {
-				$this->cloudId = (string)$user->getCloudId();
-			} else {
-				$this->cloudId = $this->getCloudIDFromToken();
-			}
+		$user = $this->userSession->getUser();
+		if ($user instanceof IUser) {
+			return (string)$user->getCloudId();
+		} else {
+			return $this->getCloudIDFromToken();
 		}
-
-		return $this->cloudId;
 	}
 
 	/**

tests/CurrentUserTest.php

@@ -85,7 +85,6 @@ public static function dataGetUserIdentifier(): array {
 			[null, null, null, ''],
 			[null, 'uid', -1, 'uid'],
 			[null, null, 'token', 'token'],
-			['cached', -1, -1, 'cached'],
 		];
 	}
 
@@ -96,8 +95,6 @@ public function testGetUserIdentifier(?string $cachedIdentifier, string|int|null
 			'getCloudIDFromToken',
 		]);
 
-		self::invokePrivate($instance, 'identifier', [$cachedIdentifier]);
-
 		$instance->expects($uidResult !== -1 ? $this->once() : $this->never())
 			->method('getUID')
 			->willReturn($uidResult);