fix(CardDAV): set owner-principal, displayname properties for SAB

Signed-off-by: Anna Larch <anna@nextcloud.com>
nextcloud · Aug 24, 2023 · 504f396 · 504f396
1 parent 480d2c2
commit 504f396
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/apps/dav/lib/CardDAV/AddressBook.php b/apps/dav/lib/CardDAV/AddressBook.php
@@ -223,10 +223,7 @@ public function delete() {
 	}
 
 	public function propPatch(PropPatch $propPatch) {
-		// shared address books will be handled by
-		// \OCA\DAV\DAV\CustomPropertiesBackend::propPatch
-		// to save values in db table instead of dav object
-		if (!$this->isShared()) {
+		if (!isset($this->addressBookInfo['{http://owncloud.org/ns}owner-principal'])) {
 			parent::propPatch($propPatch);
 		}
 	}

diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
@@ -311,10 +311,12 @@ public function getAddressBooksByUri(string $principal, string $addressBookUri):
 			'{' . Plugin::NS_CARDDAV . '}addressbook-description' => $row['description'],
 			'{http://calendarserver.org/ns/}getctag' => $row['synctoken'],
 			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ?: '0',
+
 		];
 
 		// system address books are always read only
 		if ($principal === 'principals/system/system') {
+			$addressBook['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'] = $row['principaluri'];
 			$addressBook['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only'] = true;
 		}
 

diff --git a/apps/dav/lib/Connector/Sabre/Principal.php b/apps/dav/lib/Connector/Sabre/Principal.php
@@ -208,6 +208,11 @@ public function getPrincipalByPath($path) {
 					'{DAV:}displayname' => $group->getDisplayName(),
 				];
 			}
+		} elseif ($prefix === 'principals/system') {
+			return [
+				'uri' => 'principals/system/' . $name,
+				'{DAV:}displayname' => $this->languageFactory->get('dav')->t("Accounts"),
+			];
 		}
 		return null;
 	}

diff --git a/apps/dav/tests/unit/CardDAV/AddressBookTest.php b/apps/dav/tests/unit/CardDAV/AddressBookTest.php
@@ -124,7 +124,6 @@ public function testPropPatchNotShared(): void {
 		$backend = $this->getMockBuilder(CardDavBackend::class)->disableOriginalConstructor()->getMock();
 		$backend->expects($this->atLeast(1))->method('updateAddressBook');
 		$addressBookInfo = [
-			'{http://owncloud.org/ns}owner-principal' => 'user1',
 			'{DAV:}displayname' => 'Test address book',
 			'principaluri' => 'user1',
 			'id' => 666,