From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Wed, 6 Sep 2023 15:48:21 +0000 (+0200)
Subject: fix(caldav): add webroot to objectid for activities
X-Git-Tag: v26.0.7~5^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3a55fb948fed95b9341230e384c562ff8d24cc64;p=nextcloud-server.git

fix(caldav): add webroot to objectid for activities

A calendar uri includes the webroot: example.com/cloud/remote.php/dav/calendars/alice/personal/
The calendar app uses base64(calendar uri) as identifier for calendar objects.

Without this patch the links from activity app to calendar app don't work for installations in a subdirectory.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---

diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Event.php b/apps/dav/lib/CalDAV/Activity/Provider/Event.php
index 9ae04aadbba..13f0036b0b0 100644
--- a/apps/dav/lib/CalDAV/Activity/Provider/Event.php
+++ b/apps/dav/lib/CalDAV/Activity/Provider/Event.php
@@ -97,7 +97,7 @@ class Event extends Base {
 				// 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
index 583ac6ca725..253e1628229 100644
--- a/apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php
+++ b/apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php
@@ -121,6 +121,8 @@ class EventTest extends TestCase {
 				->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)