Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not show deactivated users in sharees and contacts #10543

Merged
merged 3 commits into from
Aug 10, 2018
Merged

Do not show deactivated users in sharees and contacts #10543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a311798
Remove users from system addressbook when user deactivated
tcitworld Aug 5, 2018
03f1fef
Ignore deactivated users in collaborators user search plugin
tcitworld Aug 6, 2018
c800495
Test sync service when user is deactivated
tcitworld Aug 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions apps/dav/lib/CardDAV/SyncService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,18 +270,22 @@ public function updateUser($user) {

$cardId = "$name:$userId.vcf";
$card = $this->backend->getCard($addressBookId, $cardId);
if ($card === false) {
$vCard = $converter->createCardFromUser($user);
if ($vCard !== null) {
$this->backend->createCard($addressBookId, $cardId, $vCard->serialize());
}
} else {
$vCard = $converter->createCardFromUser($user);
if (is_null($vCard)) {
$this->backend->deleteCard($addressBookId, $cardId);
if ($user->isEnabled()) {
if ($card === false) {
$vCard = $converter->createCardFromUser($user);
if ($vCard !== null) {
$this->backend->createCard($addressBookId, $cardId, $vCard->serialize());
}
} else {
$this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
$vCard = $converter->createCardFromUser($user);
if (is_null($vCard)) {
$this->backend->deleteCard($addressBookId, $cardId);
} else {
$this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
}
}
} else {
$this->backend->deleteCard($addressBookId, $cardId);
}
}

Expand Down
25 changes: 21 additions & 4 deletions apps/dav/tests/unit/CardDAV/SyncServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,30 @@ public function testEnsureSystemAddressBookExists() {
$ss->ensureSystemAddressBookExists('principals/users/adam', 'contacts', []);
}

public function testUpdateAndDeleteUser() {
public function dataActivatedUsers() {
return [
[true, 1, 1, 1],
[false, 0, 0, 3],
];
}

/**
* @dataProvider dataActivatedUsers
*
* @param boolean $activated
* @param integer $createCalls
* @param integer $updateCalls
* @param integer $deleteCalls
* @return void
*/
public function testUpdateAndDeleteUser($activated, $createCalls, $updateCalls, $deleteCalls) {
/** @var CardDavBackend | \PHPUnit_Framework_MockObject_MockObject $backend */
$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock();
$logger = $this->getMockBuilder(ILogger::class)->disableOriginalConstructor()->getMock();

$backend->expects($this->once())->method('createCard');
$backend->expects($this->once())->method('updateCard');
$backend->expects($this->once())->method('deleteCard');
$backend->expects($this->exactly($createCalls))->method('createCard');
$backend->expects($this->exactly($updateCalls))->method('updateCard');
$backend->expects($this->exactly($deleteCalls))->method('deleteCard');

$backend->method('getCard')->willReturnOnConsecutiveCalls(false, [
'carddata' => "BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Sabre//Sabre VObject 3.4.8//EN\r\nUID:test-user\r\nFN:test-user\r\nN:test-user;;;;\r\nEND:VCARD\r\n\r\n"
Expand All @@ -106,6 +122,7 @@ public function testUpdateAndDeleteUser() {
$user->method('getUID')->willReturn('test-user');
$user->method('getCloudId')->willReturn('cloudId');
$user->method('getDisplayName')->willReturn('test-user');
$user->method('isEnabled')->willReturn($activated);
$accountManager = $this->getMockBuilder(AccountManager::class)->disableOriginalConstructor()->getMock();
$accountManager->expects($this->any())->method('getUser')
->willReturn([
Expand Down
4 changes: 3 additions & 1 deletion lib/private/Collaboration/Collaborators/UserPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,9 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
$usersTmp = $this->userManager->searchDisplayName($search, $limit, $offset);

foreach ($usersTmp as $user) {
$users[$user->getUID()] = $user->getDisplayName();
if ($user->isEnabled()) { // Don't keep deactivated users
$users[$user->getUID()] = $user->getDisplayName();
}
}
}

Expand Down
6 changes: 5 additions & 1 deletion tests/lib/Collaboration/Collaborators/UserPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function instantiatePlugin() {
);
}

public function getUserMock($uid, $displayName) {
public function getUserMock($uid, $displayName, $enabled = true) {
$user = $this->createMock(IUser::class);

$user->expects($this->any())
Expand All @@ -100,6 +100,10 @@ public function getUserMock($uid, $displayName) {
->method('getDisplayName')
->willReturn($displayName);

$user->expects($this->any())
->method('isEnabled')
->willReturn($enabled);

return $user;
}

Expand Down