fix: add event link #8123
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
| namespace OCA\Calendar\Controller; | ||
|
|
||
| use OCA\Calendar\Service\CalendarInitialStateService; | ||
| use OCP\AppFramework\Controller; | ||
| use OCP\AppFramework\Http\RedirectResponse; | ||
| use OCP\AppFramework\Http\Response; | ||
| use OCP\AppFramework\Http\TemplateResponse; | ||
| use OCP\Calendar\IManager; | ||
| use OCP\IRequest; | ||
| use OCP\IURLGenerator; | ||
|
|
||
| /** | ||
| * Controller for permanent event deep links. | ||
| * | ||
| * Routes like /apps/calendar/event/{uid} and /apps/calendar/event/{uid}/{recurrenceId} | ||
| * resolve the UID to the appropriate calendar object and redirect to the standard | ||
| * edit route | ||
| */ | ||
| class EventController extends Controller { | ||
|
|
||
| public function __construct( | ||
| string $appName, | ||
| IRequest $request, | ||
| private CalendarInitialStateService $calendarInitialStateService, | ||
| private IManager $calendarManager, | ||
| private IURLGenerator $urlGenerator, | ||
| private ?string $userId, | ||
|
Contributor
There was a problem hiding this comment. Use a userSession |
||
| ) { | ||
| parent::__construct($appName, $request); | ||
| } | ||
|
|
||
| /** | ||
| * Resolve a permanent event deep link. | ||
| * | ||
| * Searches all calendars for an event with the given UID and redirects | ||
| * to the standard edit route. Falls back to serving the SPA if the | ||
| * event cannot be resolved server-side. | ||
| * | ||
| * @NoAdminRequired | ||
| * @NoCSRFRequired | ||
|
Comment on lines
+47
to
+48
Contributor
There was a problem hiding this comment. Please use the new route attributes |
||
| * | ||
| * @param string $uid The iCalendar UID of the event | ||
| * @param string|null $recurrenceId Unix timestamp of the recurrence instance, or null for 'next' | ||
| * @return Response | ||
| */ | ||
| public function index(string $uid, ?string $recurrenceId = null): Response { | ||
| if ($this->userId === null) { | ||
| $this->calendarInitialStateService->run(); | ||
| return new TemplateResponse($this->appName, 'main'); | ||
| } | ||
|
Comment on lines
+55
to
+58
|
||
|
|
||
| $principalUri = "principals/users/{$this->userId}"; | ||
| $calendars = $this->calendarManager->getCalendarsForPrincipal($principalUri); | ||
|
|
||
| foreach ($calendars as $calendar) { | ||
| if (method_exists($calendar, 'isDeleted') && $calendar->isDeleted()) { | ||
| continue; | ||
| } | ||
|
|
||
| $results = $calendar->search('', [], ['uid' => $uid], 1); | ||
| if (!empty($results)) { | ||
| $result = $results[0]; | ||
| $objectUri = $result['uri']; | ||
| $calendarUri = $calendar->getUri(); | ||
|
|
||
| $davPath = '/remote.php/dav/calendars/' . $this->userId . '/' . $calendarUri . '/' . $objectUri; | ||
| $objectId = base64_encode($davPath); | ||
|
|
||
| $editRecurrenceId = $recurrenceId ?? 'next'; | ||
|
|
||
| return new RedirectResponse( | ||
| $this->urlGenerator->linkToRoute('calendar.view.indexdirect.edit.recurrenceId', [ | ||
| 'objectId' => $objectId, | ||
| 'recurrenceId' => $editRecurrenceId, | ||
| ]) | ||
| ); | ||
| } | ||
|
Comment on lines
+63
to
+85
Contributor
Author
There was a problem hiding this comment. should be maybe moved to a service, so it can be reused by #8048 |
||
| } | ||
|
|
||
| // Event not found (no access or deleted) — redirect to a non-existent object so | ||
| // the SPA's error handling displays "Event does not exist" instead of a blank page. | ||
| return new RedirectResponse( | ||
| $this->urlGenerator->linkToRoute('calendar.view.indexdirect.edit.recurrenceId', [ | ||
| 'objectId' => base64_encode("/event-not-found/$uid"), | ||
| 'recurrenceId' => $recurrenceId ?? 'next', | ||
| ]) | ||
| ); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would make this a generic route "/object/{uid}" or something like that, this way this can be used for both Events and Tasks
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also can we use the new route attributes instead of the routes file?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I never worked with tasks, would they also use the same logic to resolve/ redirect ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, VTODO (tasks) are identical for the most part to a VEVENT, they have a UID and a RECURRANCE-ID, the main differences are VTODO does not have a DTEND it uses a DUE and DURATION.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Makes sense, I'll update it then