Fix sync errors for duplicate cards with the same UID for different backends

Signed-off-by: Anna Larch <anna@nextcloud.com>

diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php
index 340e3127f0a765054f7bce31b4ab3aa349f9ac84..8452810c29e200c4fb79b2afdd8232c3c02af913 100644 (file)
--- a/apps/dav/lib/CardDAV/Converter.php
+++ b/apps/dav/lib/CardDAV/Converter.php
@@ -47,12 +47,14 @@ class Converter {
                $userProperties = $this->accountManager->getAccount($user)->getProperties();
 
                $uid = $user->getUID();
+               $backendClassName = $user->getBackendClassName();
                $cloudId = $user->getCloudId();
                $image = $this->getAvatarImage($user);
 
                $vCard = new VCard();
                $vCard->VERSION = '3.0';
-               $vCard->UID = $uid;
+               $vCard->UID = md5("$backendClassName:$uid");
+               $vCard->add(new Text($vCard, 'X-NEXTCLOUD-UID', $uid));
 
                $publish = false;
 

diff --git a/apps/dav/lib/CardDAV/SyncService.php b/apps/dav/lib/CardDAV/SyncService.php
index da798c5768e5629ea25ee8b0cd0c6c8f957c3402..d73ec9029f9925df04f511b36ac74f3d6bce50bd 100644 (file)
--- a/apps/dav/lib/CardDAV/SyncService.php
+++ b/apps/dav/lib/CardDAV/SyncService.php
@@ -274,7 +274,7 @@ class SyncService {
                $allCards = $this->backend->getCards($systemAddressBook['id']);
                foreach ($allCards as $card) {
                        $vCard = Reader::read($card['carddata']);
-                       $uid = $vCard->UID->getValue();
+                       $uid = isset($vCard->{'X-NEXTCLOUD-UID'}) ? $vCard->{'X-NEXTCLOUD-UID'}->getValue() : $vCard->UID->getValue();
                        // load backend and see if user exists
                        if (!$this->userManager->userExists($uid)) {
                                $this->deleteUser($card['uri']);