Merge pull request #16254 from nextcloud/backport/16208/stable16

[stable16] Always set the display name for user shares

Author: MorrisJobke

lib/private/Share20/DefaultShareProvider.php

@@ -940,6 +940,10 @@ private function createShare($data) {
 
 		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_USER) {
 			$share->setSharedWith($data['share_with']);
+			$user = $this->userManager->get($data['share_with']);
+			if ($user !== null) {
+				$share->setSharedWithDisplayName($user->getDisplayName());
+			}
 		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
 			$share->setSharedWith($data['share_with']);
 		} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK) {

tests/lib/Share20/DefaultShareProviderTest.php

@@ -1110,8 +1110,10 @@ public function testGetSharedWithUserWithNode($storageStringId, $fileName1, $fil
 
 		$user0 = $this->createMock(IUser::class);
 		$user0->method('getUID')->willReturn('user0');
+		$user0->method('getDisplayName')->willReturn('user0');
 		$user1 = $this->createMock(IUser::class);
 		$user1->method('getUID')->willReturn('user1');
+		$user0->method('getDisplayName')->willReturn('user0');
 
 		$this->userManager->method('get')->willReturnMap([
 			['user0', $user0],
@@ -1640,8 +1642,10 @@ public function testDeleteFromSelfUser() {
 
 		$user1 = $this->createMock(IUser::class);
 		$user1->method('getUID')->willReturn('user1');
+		$user1->method('getDisplayName')->willReturn('user1');
 		$user2 = $this->createMock(IUser::class);
 		$user2->method('getUID')->willReturn('user2');
+		$user2->method('getDisplayName')->willReturn('user2');
 		$this->userManager->method('get')->will($this->returnValueMap([
 			['user1', $user1],
 			['user2', $user2],
@@ -1691,8 +1695,10 @@ public function testDeleteFromSelfUserNotRecipient() {
 
 		$user1 = $this->createMock(IUser::class);
 		$user1->method('getUID')->willReturn('user1');
+		$user1->method('getDisplayName')->willReturn('user1');
 		$user2 = $this->createMock(IUser::class);
 		$user2->method('getUID')->willReturn('user2');
+		$user2->method('getDisplayName')->willReturn('user2');
 		$user3 = $this->createMock(IUser::class);
 		$this->userManager->method('get')->will($this->returnValueMap([
 			['user1', $user1],
@@ -1755,6 +1761,7 @@ public function testUpdateUser() {
 		for($i = 0; $i < 6; $i++) {
 			$user = $this->createMock(IUser::class);
 			$user->method('getUID')->willReturn('user'.$i);
+			$user->method('getDisplayName')->willReturn('user' . $i);
 			$users['user'.$i] = $user;
 		}
 
@@ -2105,8 +2112,10 @@ public function testMoveUserShare() {
 
 		$user0 = $this->createMock(IUser::class);
 		$user0->method('getUID')->willReturn('user0');
+		$user0->method('getDisplayName')->willReturn('user0');
 		$user1 = $this->createMock(IUser::class);
 		$user1->method('getUID')->willReturn('user1');
+		$user1->method('getDisplayName')->willReturn('user1');
 
 		$this->userManager->method('get')->will($this->returnValueMap([
 			['user0', $user0],