Always set the display name for user shares

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
index 59aefd54cde5f9636505ed4047f981e34ce01b01..aea50dfcdb6e28e1d8a2ebbfb177c69f32f5226f 100644 (file)
--- a/lib/private/Share20/DefaultShareProvider.php
+++ b/lib/private/Share20/DefaultShareProvider.php
@@ -940,6 +940,10 @@ class DefaultShareProvider implements IShareProvider {
 
                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) {

diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php
index 578225840b6ca63f96131cf447e644d10b29895a..f5f710cbbd39fec00357c3fbfc6e848dfde4453c 100644 (file)
--- a/tests/lib/Share20/DefaultShareProviderTest.php
+++ b/tests/lib/Share20/DefaultShareProviderTest.php
@@ -1110,8 +1110,10 @@ class DefaultShareProviderTest extends \Test\TestCase {
 
                $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 @@ class DefaultShareProviderTest extends \Test\TestCase {
 
                $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 @@ class DefaultShareProviderTest extends \Test\TestCase {
 
                $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 @@ class DefaultShareProviderTest extends \Test\TestCase {
                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 @@ class DefaultShareProviderTest extends \Test\TestCase {
 
                $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],