fix(caldav): allow VJOURNAL if no supported component set is specified

This is mandated by the RFCs.

Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>

diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index 8fff6902f9a5493f6b6edb1f2b755911ceac6675..5196a971e748f2476fc6825e379fdf9028b815d2 100644 (file)
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -755,7 +755,7 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
                        '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
index a7ca36ba994868e46555ec59640b592fd1b3a5f2..946a2328bf8dff50730bc37666bf39b2a82fdf1a 100644 (file)
--- a/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
+++ b/apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php
@@ -154,7 +154,7 @@ abstract class AbstractCalDavBackend extends TestCase {
                $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']);