Merge pull request #40301 from nextcloud/bug/noid/webroot-calendar-ev…

…ents-activity fix(caldav): add webroot to objectid for activities
nextcloud · Sep 13, 2023 · a3e0a93 · a3e0a93
2 parents 1137b7a + 457f4a5
commit a3e0a93
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Event.php b/apps/dav/lib/CalDAV/Activity/Provider/Event.php
@@ -97,7 +97,7 @@ protected function generateObjectParameter(array $eventData) {
 				// The calendar app needs to be manually loaded for the routes to be loaded
 				OC_App::loadApp('calendar');
 				$linkData = $eventData['link'];
-				$objectId = base64_encode('/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']);
+				$objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']);
 				$link = [
 					'view' => 'dayGridMonth',
 					'timeRange' => 'now',

diff --git a/apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php b/apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php
@@ -121,6 +121,8 @@ public function testGenerateObjectParameter(int $id, string $name, ?array $link,
 				->with('calendar')
 				->willReturn($calendarAppEnabled);
 			if ($calendarAppEnabled) {
+				$this->url->expects($this->once())
+					->method('getWebroot');
 				$this->url->expects($this->once())
 					->method('linkToRouteAbsolute')
 					->with('calendar.view.indexview.timerange.edit', $generatedLink)