Skip to content

[stable35] fix(cardDav): Only update user card on actual mapped propreties changes #63771

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

Merged
AndyScherzinger merged 1 commit into from
Aug 28, 2026
Merged

[stable35] fix(cardDav): Only update user card on actual mapped propreties changes #63771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion apps/dav/lib/CardDAV/SyncService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,12 @@ public function updateUser(IUser $user): void {
if (is_null($vCard)) {
$this->backend->deleteCard($addressBookId, $cardId);
} else {
$this->backend->updateCard($addressBookId, $cardId, $vCard->serialize());
$cardData = $vCard->serialize();
// Writing an identical card would still bump the address book
// sync token and make every client re-download the card
if ($card['carddata'] !== $cardData) {
$this->backend->updateCard($addressBookId, $cardId, $cardData);
}
}
}
}, $this->dbConnection);
Expand Down
39 changes: 39 additions & 0 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 @@ -457,6 +457,45 @@ public function testUpdateAndDeleteUser(bool $activated, int $createCalls, int $
$ss->deleteUser($user);
}

public function testUpdateUserSkipsUnchangedCard(): void {
$vCard = new VCard();
$vCard->VERSION = '3.0';
$vCard->UID = 'test-user';
$vCard->FN = 'test-user';

/** @var CardDavBackend&MockObject $backend */
$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock();
$logger = $this->createMock(LoggerInterface::class);

$backend->expects($this->never())->method('createCard');
$backend->expects($this->never())->method('updateCard');
$backend->expects($this->never())->method('deleteCard');

$backend->method('getCard')->willReturn(['carddata' => $vCard->serialize()]);
$backend->method('getAddressBooksByUri')
->with('principals/system/system', 'system')
->willReturn(['id' => -1]);

$user = $this->createMock(IUser::class);
$user->method('getBackendClassName')->willReturn('unittest');
$user->method('getUID')->willReturn('test-user');
$user->method('isEnabled')->willReturn(true);

$converter = $this->createMock(Converter::class);
$converter->method('createCardFromUser')->willReturn($vCard);

$ss = new SyncService(
$this->createMock(IClientService::class),
$this->createMock(IConfig::class),
$backend,
$this->createMock(IUserManager::class),
$this->createMock(IDBConnection::class),
$logger,
$converter,
);
$ss->updateUser($user);
}

public function testSyncInstance(): void {
/** @var CardDavBackend | MockObject $backend */
$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock();
Expand Down
Loading