aboutsummaryrefslogtreecommitdiffstats
path: root/apps/dav
diff options
context:
space:
mode:
authorRichard Steinmetz <richard@steinmetz.cloud>2024-06-11 14:00:14 +0200
committerRichard Steinmetz <richard@steinmetz.cloud>2024-08-13 15:26:17 +0200
commit82615ce8688da9ecc2c0e4e9353c463e2f4c3fee (patch)
treee584ddb986cf42ac9c6a1e7f7dfdf7a757537c5b /apps/dav
parent822aab6850cf88ae6c11bb25e0d5f2c2e7258075 (diff)
downloadnextcloud-server-82615ce8688da9ecc2c0e4e9353c463e2f4c3fee.tar.gz
nextcloud-server-82615ce8688da9ecc2c0e4e9353c463e2f4c3fee.zip
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>
Diffstat (limited to 'apps/dav')
-rw-r--r--apps/dav/lib/CalDAV/CalDavBackend.php2
-rw-r--r--apps/dav/tests/unit/CalDAV/AbstractCalDavBackend.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index 8fff6902f9a..5196a971e74 100644
--- 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 a7ca36ba994..946a2328bf8 100644
--- 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']);