wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not return the current user himself

Browse source
This commit is contained in:
Joas Schilling 2015-08-17 12:13:49 +02:00
parent 0227cfff08
commit 83b88c9a26
2 changed files with 44 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/files_sharing/api/sharees.php
View file

@ -116,6 +116,11 @@ class Sharees {
foreach ($users as $uid => $displayName) {
if ($uid === $this->userSession->getUser()->getUID()) {
// Skip the current user
continue;
}
$sharees[] = [
'label' => $displayName,
'value' => [

44
apps/files_sharing/tests/api/sharees.php
View file

@ -127,6 +127,20 @@ class ShareesTest extends TestCase {
['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
]
],
[
'test',
false,
[],
[
$this->getUserMock('test1', 'Test One'),
$this->getUserMock('test2', 'Test Two'),
$this->getUserMock('admin', 'Should be removed'),
],
[
['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
]
],
[
'test',
true,
@ -175,6 +189,26 @@ class ShareesTest extends TestCase {
['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
]
],
[
'test',
true,
['abc', 'xyz'],
[
['abc', 'test', -1, 0, [
'test1' => 'Test One',
]],
['xyz', 'test', -1, 0, [
'test2' => 'Test Two',
]],
['admin', 'Should be removed', -1, 0, [
'test2' => 'Test Two',
]],
],
[
['label' => 'Test One', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
['label' => 'Test Two', 'value' => ['shareType' => \OCP\Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
]
],
];
}
@ -188,17 +222,17 @@ class ShareesTest extends TestCase {
* @param array $expected
*/
public function testGetUsers($searchTerm, $shareWithGroupOnly, $groupResponse, $userResponse, $expected) {
$user = $this->getUserMock('admin', 'Administrator');
$this->session->expects($this->any())
->method('getUser')
->willReturn($user);
if (!$shareWithGroupOnly) {
$this->userManager->expects($this->once())
->method('searchDisplayName')
->with($searchTerm)
->willReturn($userResponse);
} else {
$user = $this->getUserMock('admin', 'Administrator');
$this->session->expects($this->any())
->method('getUser')
->willReturn($user);
$this->groupManager->expects($this->once())
->method('getUserGroupIds')
->with($user)