Merge pull request #47336 from nextcloud/backport/47332/stable28

[stable28] fix(caldav): allow renaming of birthday calendars
nextcloud · Aug 29, 2024 · b678e13 · b678e13
2 parents c1d9259 + 932b0f7
commit b678e13
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -137,6 +137,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);
@@ -206,6 +207,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
@@ -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')