Merge pull request #33563 from nextcloud/feat/make-displaynamecache-r…

…eturn-null Make DisplayNameCache return null if user doesn't exists
nextcloud · Aug 16, 2022 · 1c60ff5 · 1c60ff5
2 parents 604c175 + 8004aa7
commit 1c60ff5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/apps/files_sharing/lib/Cache.php b/apps/files_sharing/lib/Cache.php
@@ -170,7 +170,7 @@ protected function formatCacheEntry($entry, $path = null) {
 	private function getOwnerDisplayName() {
 		if (!$this->ownerDisplayName) {
 			$uid = $this->storage->getOwner('');
-			$this->ownerDisplayName = $this->displayNameCache->getDisplayName($uid);
+			$this->ownerDisplayName = $this->displayNameCache->getDisplayName($uid) ?? $uid;
 		}
 		return $this->ownerDisplayName;
 	}

diff --git a/lib/private/User/DisplayNameCache.php b/lib/private/User/DisplayNameCache.php
@@ -47,7 +47,7 @@ public function __construct(ICacheFactory $cacheFactory, IUserManager $userManag
 		$this->userManager = $userManager;
 	}
 
-	public function getDisplayName(string $userId) {
+	public function getDisplayName(string $userId): ?string {
 		if (isset($this->cache[$userId])) {
 			return $this->cache[$userId];
 		}
@@ -61,7 +61,7 @@ public function getDisplayName(string $userId) {
 		if ($user) {
 			$displayName = $user->getDisplayName();
 		} else {
-			$displayName = $userId;
+			$displayName = null;
 		}
 		$this->cache[$userId] = $displayName;
 		$this->memCache->set($userId, $displayName, 60 * 10); // 10 minutes

diff --git a/lib/private/User/LazyUser.php b/lib/private/User/LazyUser.php
@@ -51,7 +51,7 @@ public function getUID() {
 	}
 
 	public function getDisplayName() {
-		return $this->userManager->getDisplayName($this->uid);
+		return $this->userManager->getDisplayName($this->uid) ?? $this->uid;
 	}
 
 	public function setDisplayName($displayName) {

diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
@@ -188,7 +188,7 @@ public function get($uid) {
 		return null;
 	}
 
-	public function getDisplayName(string $uid): string {
+	public function getDisplayName(string $uid): ?string {
 		return $this->displayNameCache->getDisplayName($uid);
 	}
 

diff --git a/lib/public/IUserManager.php b/lib/public/IUserManager.php
@@ -87,13 +87,11 @@ public function get($uid);
 	/**
 	 * Get the display name of a user
 	 *
-	 * Note that this will return the uid if the user is not found instead of throwing an exception
-	 *
 	 * @param string $uid
-	 * @return string
+	 * @return string|null
 	 * @since 25.0.0
 	 */
-	public function getDisplayName(string $uid): string;
+	public function getDisplayName(string $uid): ?string;
 
 	/**
 	 * check if a user exists