From 8f838b2fe8a349d4537384d95b25dacf51f6ac30 Mon Sep 17 00:00:00 2001 From: Anna Larch Date: Mon, 19 Aug 2024 17:27:01 +0200 Subject: [PATCH] fix(caldav): allow renaming of birthday calendars Signed-off-by: Anna Larch --- apps/dav/lib/CalDAV/Calendar.php | 2 +- apps/dav/tests/unit/CalDAV/CalendarTest.php | 2 ++ apps/dav/tests/unit/Command/DeleteCalendarTest.php | 8 +++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/dav/lib/CalDAV/Calendar.php b/apps/dav/lib/CalDAV/Calendar.php index fbfbdf652ec22..97580ab442030 100644 --- a/apps/dav/lib/CalDAV/Calendar.php +++ b/apps/dav/lib/CalDAV/Calendar.php @@ -66,7 +66,7 @@ public function __construct(BackendInterface $caldavBackend, $calendarInfo, IL10 parent::__construct($caldavBackend, $calendarInfo); - if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI) { + if ($this->getName() === BirthdayService::BIRTHDAY_CALENDAR_URI && strcasecmp($this->calendarInfo['{DAV:}displayname'], 'Contact birthdays') === 0) { $this->calendarInfo['{DAV:}displayname'] = $l10n->t('Contact birthdays'); } if ($this->getName() === CalDavBackend::PERSONAL_CALENDAR_URI && diff --git a/apps/dav/tests/unit/CalDAV/CalendarTest.php b/apps/dav/tests/unit/CalDAV/CalendarTest.php index 68e6e5ef2518d..56bd78a2c31b0 100644 --- a/apps/dav/tests/unit/CalDAV/CalendarTest.php +++ b/apps/dav/tests/unit/CalDAV/CalendarTest.php @@ -135,6 +135,7 @@ public function testDeleteBirthdayCalendar(): void { 'principaluri' => 'principals/users/user1', 'id' => 666, 'uri' => 'contact_birthdays', + '{DAV:}displayname' => 'Test', ]; $c = new Calendar($backend, $calendarInfo, $this->l10n, $this->config, $this->logger); @@ -204,6 +205,7 @@ public function testAcl($expectsWrite, $readOnlyValue, $hasOwnerSet, $uri = 'def 'id' => 666, 'uri' => $uri ]; + $calendarInfo['{DAV:}displayname'] = 'Test'; if (!is_null($readOnlyValue)) { $calendarInfo['{http://owncloud.org/ns}read-only'] = $readOnlyValue; } diff --git a/apps/dav/tests/unit/Command/DeleteCalendarTest.php b/apps/dav/tests/unit/Command/DeleteCalendarTest.php index 1c499dbcc259c..3b666546bac7d 100644 --- a/apps/dav/tests/unit/Command/DeleteCalendarTest.php +++ b/apps/dav/tests/unit/Command/DeleteCalendarTest.php @@ -142,7 +142,7 @@ public function testDelete(): void { $calendar = [ 'id' => $id, 'principaluri' => 'principals/users/' . self::USER, - 'uri' => self::NAME + 'uri' => self::NAME, ]; $this->userManager->expects($this->once()) @@ -203,7 +203,8 @@ public function testDeleteBirthday(): void { $calendar = [ 'id' => $id, 'principaluri' => 'principals/users/' . self::USER, - 'uri' => BirthdayService::BIRTHDAY_CALENDAR_URI + 'uri' => BirthdayService::BIRTHDAY_CALENDAR_URI, + '{DAV:}displayname' => 'Test', ]; $this->userManager->expects($this->once()) @@ -232,7 +233,8 @@ public function testBirthdayHasPrecedence(): void { $calendar = [ 'id' => 1234, 'principaluri' => 'principals/users/' . self::USER, - 'uri' => BirthdayService::BIRTHDAY_CALENDAR_URI + 'uri' => BirthdayService::BIRTHDAY_CALENDAR_URI, + '{DAV:}displayname' => 'Test', ]; $this->userManager->expects($this->once()) ->method('userExists')