-
-
Notifications
You must be signed in to change notification settings - Fork 5k
fix(caldav-delegation): send notification to delegator #60712
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
hamza221
wants to merge
1
commit into
master
Choose a base branch
from
fix/caldav-delegation/notifications
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
80 changes: 80 additions & 0 deletions
80
apps/dav/lib/CalDAV/Schedule/DelegateActionCapturePlugin.php
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,80 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| namespace OCA\DAV\CalDAV\Schedule; | ||
|
|
||
| use OCA\DAV\CalDAV\CalendarObject; | ||
| use Sabre\DAV\INode; | ||
| use Sabre\DAV\Server; | ||
| use Sabre\DAV\ServerPlugin; | ||
| use Sabre\VObject\Component\VCalendar; | ||
| use Sabre\VObject\Reader; | ||
| use Throwable; | ||
|
|
||
| /** | ||
| * Captures the iCalendar payload of a calendar object before it is overwritten | ||
| * (PUT) or deleted (DELETE), and stashes it in DelegateActionContext so that | ||
| * CalendarDelegateActionListener can diff old vs new when it fires later in | ||
| * the same request. | ||
| */ | ||
| class DelegateActionCapturePlugin extends ServerPlugin { | ||
|
|
||
| private ?Server $server = null; | ||
|
|
||
| public function __construct( | ||
| private readonly DelegateActionContext $context, | ||
| ) { | ||
| } | ||
|
|
||
| #[\Override] | ||
| public function initialize(Server $server): void { | ||
| $this->server = $server; | ||
| $server->on('beforeWriteContent', [$this, 'beforeWriteContent'], 10); | ||
| $server->on('beforeUnbind', [$this, 'beforeUnbind'], 10); | ||
| } | ||
|
|
||
| #[\Override] | ||
| public function getPluginName(): string { | ||
| return 'nc-delegate-action-capture'; | ||
| } | ||
|
|
||
| public function beforeWriteContent(string $uri, INode $node, $data, $modified): void { | ||
| $this->capture($node); | ||
| } | ||
|
|
||
| public function beforeUnbind(string $path): void { | ||
| if ($this->server === null) { | ||
| return; | ||
| } | ||
| try { | ||
| $node = $this->server->tree->getNodeForPath($path); | ||
| } catch (Throwable) { | ||
| return; | ||
| } | ||
| $this->capture($node); | ||
| } | ||
|
|
||
| private function capture(INode $node): void { | ||
| if (!$node instanceof CalendarObject) { | ||
| return; | ||
| } | ||
| try { | ||
| $raw = $node->get(); | ||
| if ($raw === '') { | ||
| return; | ||
| } | ||
| $vCalendar = Reader::read($raw); | ||
| if ($vCalendar instanceof VCalendar) { | ||
| $this->context->setPrevious($vCalendar); | ||
| } | ||
| } catch (Throwable) { | ||
| // Capture is best-effort: swallow malformed iCalendar. | ||
| } | ||
| } | ||
| } |
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,31 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| namespace OCA\DAV\CalDAV\Schedule; | ||
|
|
||
| use Sabre\VObject\Component\VCalendar; | ||
|
|
||
| /** | ||
| * Request-scoped container that lets a Sabre plugin (capturing the | ||
| * pre-write iCalendar in beforeWriteContent / beforeUnbind) hand the | ||
| * previous VCalendar to the CalendarDelegateActionListener, which fires | ||
| * later in the same request from the CalDavBackend event dispatcher. | ||
| */ | ||
| class DelegateActionContext { | ||
|
|
||
| private ?VCalendar $previous = null; | ||
|
|
||
| public function setPrevious(?VCalendar $vCalendar): void { | ||
| $this->previous = $vCalendar; | ||
| } | ||
|
|
||
| public function getPrevious(): ?VCalendar { | ||
| return $this->previous; | ||
| } | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
Hey,
If I am reading this correctly, you are using a global context class to transport data from the plugin to the event listener. This is a bad idea, in my opinion.
Also this plugin is only really needed in one instance on update, that is wasteful and the calendar object update event already emits the new data:
CalendarObjectUpdatedEvent
What you do need is the CalendarObjectUpdatedEvent to also carry previous data, I would extend the event to also emit the previous object data also. It is only emitted in one place so you are save to change it.
I would recommend changing the updateCalendarObject method to first pull the existing record, then updated it and then use can use the array for both new and previous, just replace record in the array with the new data from $extraData
server/apps/dav/lib/CalDAV/CalDavBackend.php
Line 1460 in 8609cd4