Merge pull request #20431 from owncloud/carddav-enforce-displayname

When creating addressbooks, make sure the displayname is set

apps/dav/lib/carddav/carddavbackend.php

@@ -134,7 +134,7 @@ function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
 	 * @param string $principalUri
 	 * @param string $url Just the 'basename' of the url.
 	 * @param array $properties
-	 * @return void
+	 * @throws BadRequest
 	 */
 	function createAddressBook($principalUri, $url, array $properties) {
 		$values = [
@@ -160,6 +160,12 @@ function createAddressBook($principalUri, $url, array $properties) {
 
 		}
 
+		// Fallback to make sure the displayname is set. Some clients may refuse
+		// to work with addressbooks not having a displayname.
+		if(is_null($values['displayname'])) {
+			$values['displayname'] = $url;
+		}
+
 		$query = $this->db->getQueryBuilder();
 		$query->insert('addressbooks')
 			->values([

apps/dav/tests/unit/carddav/carddavbackendtest.php

@@ -60,6 +60,7 @@ public function testAddressBookOperations() {
 
 		$books = $this->backend->getAddressBooksForUser(self::UNIT_TEST_USER);
 		$this->assertEquals(1, count($books));
+		$this->assertEquals('Example', $books[0]['{DAV:}displayname']);
 
 		// update it's display name
 		$patch = new PropPatch([