Merge pull request #24318 from nextcloud/techdebt/noid/remove-oc_user…

…-getDisplayName Use proper methods for display name retrieval
nextcloud · Jun 17, 2021 · b73f40e · b73f40e
2 parents 18ff261 + 2690481
commit b73f40e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 39 deletions.
diff --git a/apps/files_sharing/lib/Cache.php b/apps/files_sharing/lib/Cache.php
@@ -38,22 +38,20 @@
 use OCP\Files\Search\ISearchComparison;
 use OCP\Files\Search\ISearchOperator;
 use OCP\Files\StorageNotAvailableException;
+use OCP\IUserManager;
 
 /**
  * Metadata cache for shared files
  *
  * don't use this class directly if you need to get metadata, use \OC\Files\Filesystem::getFileInfo instead
  */
 class Cache extends CacheJail {
-	/**
-	 * @var \OCA\Files_Sharing\SharedStorage
-	 */
+	/** @var \OCA\Files_Sharing\SharedStorage */
 	private $storage;
-
-	/**
-	 * @var ICacheEntry
-	 */
+	/** @var ICacheEntry */
 	private $sourceRootInfo;
+	/** @var IUserManager */
+	private $userManager;
 
 	private $rootUnchanged = true;
 
@@ -63,11 +61,11 @@ class Cache extends CacheJail {
 
 	/**
 	 * @param \OCA\Files_Sharing\SharedStorage $storage
-	 * @param ICacheEntry $sourceRootInfo
 	 */
-	public function __construct($storage, ICacheEntry $sourceRootInfo) {
+	public function __construct($storage, ICacheEntry $sourceRootInfo, IUserManager $userManager) {
 		$this->storage = $storage;
 		$this->sourceRootInfo = $sourceRootInfo;
+		$this->userManager = $userManager;
 		$this->numericId = $sourceRootInfo->getStorageId();
 
 		parent::__construct(
@@ -174,7 +172,13 @@ protected function formatCacheEntry($entry, $path = null) {
 
 	private function getOwnerDisplayName() {
 		if (!$this->ownerDisplayName) {
-			$this->ownerDisplayName = \OC_User::getDisplayName($this->storage->getOwner(''));
+			$uid = $this->storage->getOwner('');
+			$user = $this->userManager->get($uid);
+			if ($user) {
+				$this->ownerDisplayName = $user->getDisplayName();
+			} else {
+				$this->ownerDisplayName = $uid;
+			}
 		}
 		return $this->ownerDisplayName;
 	}

diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php
@@ -43,6 +43,7 @@
 use OCP\Files\NotFoundException;
 use OCP\Files\Storage\IDisableEncryptionStorage;
 use OCP\Files\Storage\IStorage;
+use OCP\IUserManager;
 use OCP\Lock\ILockingProvider;
 use OCP\Share\IShare;
 
@@ -385,7 +386,11 @@ public function getCache($path = '', $storage = null) {
 			return new FailedCache();
 		}
 
-		$this->cache = new \OCA\Files_Sharing\Cache($storage, $sourceRoot, $this->superShare);
+		$this->cache = new \OCA\Files_Sharing\Cache(
+			$storage,
+			$sourceRoot,
+			\OC::$server->get(IUserManager::class)
+		);
 		return $this->cache;
 	}
 

diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
@@ -52,6 +52,7 @@
 use OCP\IConfig;
 use OCP\IInitialStateService;
 use OCP\INavigationManager;
+use OCP\IUserSession;
 use OCP\Support\Subscription\IRegistry;
 use OCP\Util;
 
@@ -121,7 +122,12 @@ public function __construct($renderAs, $appId = '') {
 					break;
 				}
 			}
-			$userDisplayName = \OC_User::getDisplayName();
+
+			$userDisplayName = false;
+			$user = \OC::$server->get(IUserSession::class)->getUser();
+			if ($user) {
+				$userDisplayName = $user->getDisplayName();
+			}
 			$this->assign('user_displayname', $userDisplayName);
 			$this->assign('user_uid', \OC_User::getUser());
 
@@ -152,7 +158,11 @@ public function __construct($renderAs, $appId = '') {
 			\OC_Util::addStyle('guest');
 			$this->assign('bodyid', 'body-login');
 
-			$userDisplayName = \OC_User::getDisplayName();
+			$userDisplayName = false;
+			$user = \OC::$server->get(IUserSession::class)->getUser();
+			if ($user) {
+				$userDisplayName = $user->getDisplayName();
+			}
 			$this->assign('user_displayname', $userDisplayName);
 			$this->assign('user_uid', \OC_User::getUser());
 		} elseif ($renderAs === TemplateResponse::RENDER_AS_PUBLIC) {

diff --git a/lib/private/legacy/OC_User.php b/lib/private/legacy/OC_User.php
@@ -328,32 +328,6 @@ public static function getUser() {
 		}
 	}
 
-	/**
-	 * get the display name of the user currently logged in.
-	 *
-	 * @param string $uid
-	 * @return string|bool uid or false
-	 * @deprecated 8.1.0 fetch \OCP\IUser (has getDisplayName()) by using method
-	 *                   get() of \OCP\IUserManager - \OC::$server->getUserManager()
-	 */
-	public static function getDisplayName($uid = null) {
-		if ($uid) {
-			$user = \OC::$server->getUserManager()->get($uid);
-			if ($user) {
-				return $user->getDisplayName();
-			} else {
-				return $uid;
-			}
-		} else {
-			$user = \OC::$server->getUserSession()->getUser();
-			if ($user) {
-				return $user->getDisplayName();
-			} else {
-				return false;
-			}
-		}
-	}
-
 	/**
 	 * Set password
 	 *