Merge pull request #8976 from nextcloud/dep_user_code

Remove deprecated functions from OCP\User

6 files changed, 35 insertions, 69 deletions

diff --git a/apps/files_sharing/lib/ShareBackend/Folder.php b/apps/files_sharing/lib/ShareBackend/Folder.php
index 0bb67e49b66..8cd639d047d 100644
--- a/apps/files_sharing/lib/ShareBackend/Folder.php
+++ b/apps/files_sharing/lib/ShareBackend/Folder.php
@@ -41,6 +41,9 @@ class Folder extends File implements \OCP\Share_Backend_Collection {
 	public function getParents($itemSource, $shareWith = null, $owner = null) {
 		$result = array();
 		$parent = $this->getParentId($itemSource);
+
+		$userManager = \OC::$server->getUserManager();
+
 		while ($parent) {
 			$shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith, $owner);
 			if ($shares) {
@@ -49,8 +52,11 @@ class Folder extends File implements \OCP\Share_Backend_Collection {
 					$share['collection']['path'] = $name;
 					$share['collection']['item_type'] = 'folder';
 					$share['file_path'] = $name;
-					$displayNameOwner = \OCP\User::getDisplayName($share['uid_owner']);
-					$displayNameShareWith = \OCP\User::getDisplayName($share['share_with']);
+
+					$ownerUser = $userManager->get($share['uid_owner']);
+					$displayNameOwner = $ownerUser === null ? $share['uid_owner'] : $ownerUser->getDisplayName();
+					$shareWithUser = $userManager->get($share['share_with']);
+					$displayNameShareWith = $shareWithUser === null ? $share['share_with'] : $shareWithUser->getDisplayName();
 					$share['displayname_owner'] = $displayNameOwner ? $displayNameOwner : $share['uid_owner'];
 					$share['share_with_displayname'] = $displayNameShareWith ? $displayNameShareWith : $share['uid_owner'];
 
diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php
index 9911aa37e37..5a165305d58 100644
--- a/apps/user_ldap/tests/User_LDAPTest.php
+++ b/apps/user_ldap/tests/User_LDAPTest.php
@@ -489,13 +489,21 @@ class User_LDAPTest extends TestCase {
 		$this->assertEquals(0, count($result));
 	}
 
+	private function getUsers($search = '', $limit = null, $offset = null) {
+		$users = \OC::$server->getUserManager()->search($search, $limit, $offset);
+		$uids = array_map(function(IUser $user) {
+			return $user->getUID();
+		}, $users);
+		return $uids;
+	}
+
 	public function testGetUsersViaAPINoParam() {
 		$access = $this->getAccessMock();
 		$this->prepareAccessForGetUsers($access);
 		$backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock());
 		\OC_User::useBackend($backend);
 
-		$result = \OCP\User::getUsers();
+		$result = $this->getUsers();
 		$this->assertEquals(3, count($result));
 	}
 
@@ -505,7 +513,7 @@ class User_LDAPTest extends TestCase {
 		$backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock());
 		\OC_User::useBackend($backend);
 
-		$result = \OCP\User::getUsers('', 1, 2);
+		$result = $this->getUsers('', 1, 2);
 		$this->assertEquals(1, count($result));
 	}
 
@@ -515,7 +523,7 @@ class User_LDAPTest extends TestCase {
 		$backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock());
 		\OC_User::useBackend($backend);
 
-		$result = \OCP\User::getUsers('', 2, 1);
+		$result = $this->getUsers('', 2, 1);
 		$this->assertEquals(2, count($result));
 	}
 
@@ -525,7 +533,7 @@ class User_LDAPTest extends TestCase {
 		$backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock());
 		\OC_User::useBackend($backend);
 
-		$result = \OCP\User::getUsers('yo');
+		$result = $this->getUsers('yo');
 		$this->assertEquals(2, count($result));
 	}
 
@@ -535,7 +543,7 @@ class User_LDAPTest extends TestCase {
 		$backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock());
 		\OC_User::useBackend($backend);
 
-		$result = \OCP\User::getUsers('nix');
+		$result = $this->getUsers('nix');
 		$this->assertEquals(0, count($result));
 	}
 
@@ -1085,11 +1093,11 @@ class User_LDAPTest extends TestCase {
 			->willReturnCallback(function($uuid) { return $uuid . '1'; });
 
 		//with displayName
-		$result = \OCP\User::getDisplayName('gunslinger');
+		$result = \OC::$server->getUserManager()->get('gunslinger')->getDisplayName();
 		$this->assertEquals('Roland Deschain', $result);
 
 		//empty displayname retrieved
-		$result = \OCP\User::getDisplayName('newyorker');
+		$result = \OC::$server->getUserManager()->get('newyorker') === null ? 'newyorker' : \OC::$server->getUserManager()->get('newyorker')->getDisplayName();
 		$this->assertEquals('newyorker', $result);
 	}
 
diff --git a/lib/private/Encryption/Util.php b/lib/private/Encryption/Util.php
index fc0adbbd47b..ddd19ac6345 100644
--- a/lib/private/Encryption/Util.php
+++ b/lib/private/Encryption/Util.php
@@ -35,6 +35,7 @@ use OC\Files\Filesystem;
 use OC\Files\View;
 use OCP\Encryption\IEncryptionModule;
 use OCP\IConfig;
+use OCP\IUser;
 
 class Util {
 
@@ -271,9 +272,12 @@ class Util {
 	}
 
 	public function getUserWithAccessToMountPoint($users, $groups) {
-		$result = array();
+		$result = [];
 		if (in_array('all', $users)) {
-			$result = \OCP\User::getUsers();
+			$users = $this->userManager->search('', null, null);
+			$result = array_map(function(IUser $user) {
+				return $user->getUID();
+			}, $users);
 		} else {
 			$result = array_merge($result, $users);
 
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
index 90a05ac51a8..9c82fcc268b 100644
--- a/lib/private/Share/Share.php
+++ b/lib/private/Share/Share.php
@@ -1238,7 +1238,8 @@ class Share extends Constants {
 			$row['share_with_displayname'] = $row['share_with'];
 			if ( isset($row['share_with']) && $row['share_with'] != '' &&
 				$row['share_type'] === self::SHARE_TYPE_USER) {
-				$row['share_with_displayname'] = \OCP\User::getDisplayName($row['share_with']);
+				$shareWithUser = \OC::$server->getUserManager()->get($row['share_with']);
+				$row['share_with_displayname'] = $shareWithUser === null ? $row['share_with'] : $shareWithUser->getDisplayName();
 			} else if(isset($row['share_with']) && $row['share_with'] != '' &&
 				$row['share_type'] === self::SHARE_TYPE_REMOTE) {
 				$addressBookEntries = \OC::$server->getContactsManager()->search($row['share_with'], ['CLOUD']);
@@ -1251,7 +1252,8 @@ class Share extends Constants {
 				}
 			}
 			if ( isset($row['uid_owner']) && $row['uid_owner'] != '') {
-				$row['displayname_owner'] = \OCP\User::getDisplayName($row['uid_owner']);
+				$ownerUser = \OC::$server->getUserManager()->get($row['uid_owner']);
+				$row['displayname_owner'] = $ownerUser === null ? $row['uid_owner'] : $ownerUser->getDisplayName();
 			}
 
 			if ($row['permissions'] > 0) {
diff --git a/lib/private/legacy/user.php b/lib/private/legacy/user.php
index 8f342281adb..9c877f22a46 100644
--- a/lib/private/legacy/user.php
+++ b/lib/private/legacy/user.php
@@ -312,6 +312,8 @@ class OC_User {
 	 *
 	 * @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) {
@@ -367,25 +369,6 @@ class OC_User {
 	}
 
 	/**
-	 * Get a list of all users
-	 *
-	 * @return array an array of all uids
-	 *
-	 * Get a list of all users.
-	 * @param string $search
-	 * @param integer $limit
-	 * @param integer $offset
-	 */
-	public static function getUsers($search = '', $limit = null, $offset = null) {
-		$users = \OC::$server->getUserManager()->search($search, $limit, $offset);
-		$uids = array();
-		foreach ($users as $user) {
-			$uids[] = $user->getUID();
-		}
-		return $uids;
-	}
-
-	/**
 	 * Get a list of all users display name
 	 *
 	 * @param string $search
diff --git a/lib/public/User.php b/lib/public/User.php
index 14fdd6fb1ab..a669a3a06fc 100644
--- a/lib/public/User.php
+++ b/lib/public/User.php
@@ -58,31 +58,6 @@ class User {
 	}
 
 	/**
-	 * Get a list of all users
-	 * @param string $search search pattern
-	 * @param int|null $limit
-	 * @param int|null $offset
-	 * @return array an array of all uids
-	 * @deprecated 8.1.0 use method search() of \OCP\IUserManager - \OC::$server->getUserManager()
-	 * @since 5.0.0
-	 */
-	public static function getUsers( $search = '', $limit = null, $offset = null ) {
-		return \OC_User::getUsers( $search, $limit, $offset );
-	}
-
-	/**
-	 * Get the user display name of the user currently logged in.
-	 * @param string|null $user user id or null for current user
-	 * @return string display name
-	 * @deprecated 8.1.0 fetch \OCP\IUser (has getDisplayName()) by using method
-	 *                   get() of \OCP\IUserManager - \OC::$server->getUserManager()
-	 * @since 5.0.0
-	 */
-	public static function getDisplayName( $user = null ) {
-		return \OC_User::getDisplayName( $user );
-	}
-
-	/**
 	 * Check if the user is logged in
 	 * @return boolean
 	 * @since 5.0.0
@@ -93,18 +68,6 @@ class User {
 	}
 
 	/**
-	 * Check if a user exists
-	 * @param string $uid the username
-	 * @param string $excludingBackend (default none)
-	 * @return boolean
-	 * @deprecated 8.1.0 use method userExists() of \OCP\IUserManager - \OC::$server->getUserManager()
-	 * @since 5.0.0
-	 */
-	public static function userExists($uid, $excludingBackend = null) {
-		return \OC::$server->getUserManager()->userExists($uid);
-	}
-
-	/**
 	 * Check if the user is a admin, redirects to home if not
 	 * @since 5.0.0
 	 * @deprecated 13.0.0 Use annotation based ACLs from the AppFramework instead