Merge pull request #45786 from nextcloud/fix/caldav/default-vjournal

fix(caldav): allow VJOURNAL if no supported component set is specified
nextcloud · Aug 13, 2024 · bb70699 · bb70699
2 parents 8bf2095 + 82615ce
commit bb70699
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -755,7 +755,7 @@ public function createCalendar($principalUri, $calendarUri, array $properties) {
 			'uri' => $calendarUri,
 			'synctoken' => 1,
 			'transparent' => 0,
-			'components' => 'VEVENT,VTODO',
+			'components' => 'VEVENT,VTODO,VJOURNAL',
 			'displayname' => $calendarUri
 		];
 

diff --git a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
@@ -154,7 +154,7 @@ protected function createTestCalendar() {
 		$this->assertEquals(self::UNIT_TEST_USER, $calendars[0]['principaluri']);
 		/** @var SupportedCalendarComponentSet $components */
 		$components = $calendars[0]['{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set'];
-		$this->assertEquals(['VEVENT','VTODO'], $components->getValue());
+		$this->assertEquals(['VEVENT','VTODO','VJOURNAL'], $components->getValue());
 		$color = $calendars[0]['{http://apple.com/ns/ical/}calendar-color'];
 		$this->assertEquals('#1C4587FF', $color);
 		$this->assertEquals('Example', $calendars[0]['uri']);