Feat/add calendar delegation features by GVodyanov · Pull Request #8085 · nextcloud/calendar

GVodyanov · 2026-03-22T22:17:48Z

For #2706

Requires feat: add mailing notifications to calendar delegation server#59232

COMPREHENSIVE GUIDE FOR TESTING THIS

You need to be using this PR from cdav-library: feat: add calendar delegation cdav-library#1040
You need to have the server PR checked out: Requires feat: add mailing notifications to calendar delegation server#59232
You need the trashbin ACL fix applied: fix: add proper ACLs for trashbin proxys server#60211

codecov · 2026-03-22T22:20:12Z

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

GVodyanov · 2026-05-04T10:20:07Z

Here's what everything looks like

kra-mo

From the design side:

"Select a user" and "Search for a user…" are redundant, it's fine to just have the second if it's baked into the component anyway, so without the title. The input field should also be full-width, and Add should be a primary button.

I wonder why delegation should be its own item in the sidebar instead of just a section in Settings? I'd rather have it just there. And at that point, have + Add delegate be full-width as well.

hamza221 · 2026-05-05T09:39:25Z

The pre-existing sharing logic doesn't work for delegation

A clear indication of Calendar "owner" should be visible

GVodyanov · 2026-05-05T17:18:55Z

From the design side:

"Select a user" and "Search for a user…" are redundant, it's fine to just have the second if it's baked into the component anyway, so without the title. The input field should also be full-width, and Add should be a primary button.

I wonder why delegation should be its own item in the sidebar instead of just a section in Settings? I'd rather have it just there. And at that point, have + Add delegate be full-width as well.

Thanks for the review! How does this look?

(I know that having delegates under delegation looks a little weird as title organization but that's the setting section with the form group component, and u can't not have titles for both)

GVodyanov · 2026-05-06T14:56:08Z

It took me a while to figure out but here is everything working

GVodyanov · 2026-05-06T14:58:59Z

You get the icon here to show its delegated

kra-mo

Looks good from the design side :)

SebastianKrupinski · 2026-05-07T13:18:03Z

Tested.

Found error when delegator has a shared calendar

{
  "reqId": "axdoc6W1q46YCrgBbdrq",
  "level": 0,
  "time": "2026-05-07T13:00:21+00:00",
  "remoteAddr": "127.0.0.1",
  "user": "user2",
  "app": "webdav",
  "method": "PROPFIND",
  "url": "/remote.php/dav/calendars/user1/",
  "scriptName": "/remote.php",
  "message": "Calendar with name 'company_shared_by_admin' could not be found",
  "userAgent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:150.0) Gecko/20100101 Firefox/150.0",
  "version": "34.0.0.3",
  "exception": {
    "Exception": "Sabre\\DAV\\Exception\\NotFound",
    "Message": "Calendar with name 'company_shared_by_admin' could not be found",
    "Code": 0,
    "Trace": [
      {
        "file": "/var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/DavAclPlugin.php",
        "line": 86,
        "function": "checkPrivileges",
        "class": "OCA\\DAV\\Connector\\Sabre\\DavAclPlugin",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/Server.php",
        "line": 163,
        "function": "propFind",
        "class": "OCA\\DAV\\Connector\\Sabre\\DavAclPlugin",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/master/3rdparty/sabre/event/lib/WildcardEmitterTrait.php",
        "line": 89,
        "function": "OCA\\DAV\\Connector\\Sabre\\{closure}",
        "class": "OCA\\DAV\\Connector\\Sabre\\Server",
        "type": "->",
        "args": [
          "*** sensitive parameters replaced ***"
        ]
      },
      {
        "file": "/var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php",
        "line": 1052,
        "function": "emit",
        "class": "Sabre\\DAV\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php",
        "line": 984,
        "function": "getPropertiesByNode",
        "class": "Sabre\\DAV\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php",
        "line": 1664,
        "function": "getPropertiesIteratorForPath",
        "class": "Sabre\\DAV\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php",
        "line": 1649,
        "function": "writeMultiStatus",
        "class": "Sabre\\DAV\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/CorePlugin.php",
        "line": 346,
        "function": "generateMultiStatus",
        "class": "Sabre\\DAV\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/master/3rdparty/sabre/event/lib/WildcardEmitterTrait.php",
        "line": 89,
        "function": "httpPropFind",
        "class": "Sabre\\DAV\\CorePlugin",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php",
        "line": 472,
        "function": "emit",
        "class": "Sabre\\DAV\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/Server.php",
        "line": 215,
        "function": "invokeMethod",
        "class": "Sabre\\DAV\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/master/apps/dav/lib/Server.php",
        "line": 430,
        "function": "start",
        "class": "OCA\\DAV\\Connector\\Sabre\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/master/apps/dav/appinfo/v2/remote.php",
        "line": 25,
        "function": "exec",
        "class": "OCA\\DAV\\Server",
        "type": "->"
      },
      {
        "file": "/var/www/nextcloud/master/remote.php",
        "line": 152,
        "args": [
          "/var/www/nextcloud/master/apps/dav/appinfo/v2/remote.php"
        ],
        "function": "require_once"
      }
    ],
    "File": "/var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/DavAclPlugin.php",
    "Line": 58,
    "message": "Calendar with name 'company_shared_by_admin' could not be found",
    "exception": "{\"class\":\"Sabre\\DAV\\Exception\\NotFound\",\"message\":\"Calendar with name 'company_shared_by_admin' could not be found\",\"code\":0,\"file\":\"/var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/DavAclPlugin.php:58\",\"trace\":\"#0 /var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/DavAclPlugin.php(86): OCA\\DAV\\Connector\\Sabre\\DavAclPlugin->checkPrivileges()\\n#1 /var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/Server.php(163): OCA\\DAV\\Connector\\Sabre\\DavAclPlugin->propFind()\\n#2 /var/www/nextcloud/master/3rdparty/sabre/event/lib/WildcardEmitterTrait.php(89): OCA\\DAV\\Connector\\Sabre\\Server->OCA\\DAV\\Connector\\Sabre\\{closure}()\\n#3 /var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php(1052): Sabre\\DAV\\Server->emit()\\n#4 /var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php(984): Sabre\\DAV\\Server->getPropertiesByNode()\\n#5 /var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php(1664): Sabre\\DAV\\Server->getPropertiesIteratorForPath()\\n#6 /var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php(1649): Sabre\\DAV\\Server->writeMultiStatus()\\n#7 /var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/CorePlugin.php(346): Sabre\\DAV\\Server->generateMultiStatus()\\n#8 /var/www/nextcloud/master/3rdparty/sabre/event/lib/WildcardEmitterTrait.php(89): Sabre\\DAV\\CorePlugin->httpPropFind()\\n#9 /var/www/nextcloud/master/3rdparty/sabre/dav/lib/DAV/Server.php(472): Sabre\\DAV\\Server->emit()\\n#10 /var/www/nextcloud/master/apps/dav/lib/Connector/Sabre/Server.php(215): Sabre\\DAV\\Server->invokeMethod()\\n#11 /var/www/nextcloud/master/apps/dav/lib/Server.php(430): OCA\\DAV\\Connector\\Sabre\\Server->start()\\n#12 /var/www/nextcloud/master/apps/dav/appinfo/v2/remote.php(25): OCA\\DAV\\Server->exec()\\n#13 /var/www/nextcloud/master/remote.php(152): require_once('...')\\n#14 {main}\"}",
    "CustomMessage": "Calendar with name 'company_shared_by_admin' could not be found"
  }
}

GVodyanov · 2026-05-11T07:59:23Z

I think it's related to nextcloud/server#59232 @hamza221

Tested.

Found error when delegator has a shared calendar
{
  "reqId": "axdoc6W1q46YCrgBbdrq",
  "level": 0,
  "time": "2026-05-07T13:00:21+00:00",

Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>

SebastianKrupinski · 2026-05-21T01:00:29Z

Rebased to most recent head

hamza221 · 2026-05-21T17:36:35Z

Accidental close
Apparently referencing a comment also closes the PR

…calendars Delegated calendars showed a permanent loading spinner because their owners' principals were never added to the principals store, so the avatar in CalendarListItem could not resolve. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Each delegator now gets its own "Delegated by {name}" caption above their calendars. Grouping uses a new delegatorUrl field on the calendar (the principal of the proxy-granting user), since the calendar's owner can differ when the delegator only has access via a regular share. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Append "(read-only)" to the "Delegated by {name}" caption when the delegator granted read-only proxy access, so users can tell at a glance which delegated calendars they can edit. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

The counter avatar and "Delegated to you by" action text now use the delegator's principal rather than the calendar's owner, so a calendar that the delegator received via a regular share is correctly attributed to the delegator who actually granted proxy access. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

In the event editor's CalendarPickerHeader and the shared CalendarPicker, delegated calendars now display "{name} (delegated by {delegator})" and show the delegator's avatar (instead of the calendar owner's). The label is built as a single string because NcActionButton only renders the first text node of its default slot. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

hamza221 · 2026-05-23T20:56:25Z

small frontend fixes submitted, in small commits for easy reviews

1	2	3

GVodyanov

Thanks a lot for fixing the broken stuff @hamza221! Please don't merge this for now though because you accidentally removed the information on whether people are read/write delegates in settings, I'll re-introduce that.

EDIT: NOT TRUE

GVodyanov · 2026-05-24T21:13:14Z

Revoking access also stopped working

EDIT: NOT TRUE

GVodyanov · 2026-05-24T21:14:34Z

Share with delegator -> delegator delegates -> delegatee doesn't see avatar of sharer

EDIT: NOT TRUE

hamza221 · 2026-05-24T21:50:39Z

doesn't look like you're on latest, please pull and build again

I can't reproduce, but please fix if you can

GVodyanov · 2026-05-24T22:03:51Z

@hamza221 My bad, ignore my comments

hamza221 · 2026-05-25T09:50:59Z

Btw sorry for the co-authored commits, I told it to commit as Assisted but apparently it ignored my, will be fixed on squash.

SebastianKrupinski · 2026-05-26T12:26:59Z

any newly created files should be in TypeScript with setup and Vue composition api

SebastianKrupinski · 2026-05-26T12:28:19Z

any newly created files should be in TypeScript with setup and Vue composition api.

SebastianKrupinski · 2026-05-26T12:31:09Z

+			const baseUrl = currentUser.url.replace(/\/?$/, '')
+			const proxyWriteGroupUrl = baseUrl + '/calendar-proxy-write'
+			const proxyReadGroupUrl = baseUrl + '/calendar-proxy-read'


The CDav library should be responsible for creating the specific urls the Calendar app should not need to know how to format a dav url

SebastianKrupinski · 2026-05-26T12:37:40Z

+				[writeUrls, readUrls] = await Promise.all([
+					getClient().getDelegateUrls(proxyWriteGroupUrl),
+					getClient().getDelegateUrls(proxyReadGroupUrl),
+				])


According to the description in the cdav library getDelegateUrls is to be use to retrieve all write-delegates, but you are also retrieving read delegates.

This is also in efficient, you are making two requests one for read only delegates and one for read write delegates, you should be able to do both in one request.

SebastianKrupinski · 2026-05-26T12:40:40Z

+			const baseUrl = currentUser.url.replace(/\/?$/, '')
+			const proxyGroupUrl = permission === 'read'
+				? baseUrl + '/calendar-proxy-read'
+				: baseUrl + '/calendar-proxy-write'
+			await getClient().addDelegate(proxyGroupUrl, principalUrl)


Same comment as above, this is the responsibility of the cdav library

SebastianKrupinski · 2026-05-26T12:41:18Z

+			const baseUrl = currentUser.url.replace(/\/?$/, '')
+			// Find the delegate's current permission so we remove from the right group.
+			const existing = this.delegates.find((d) => d.url === principalUrl)
+			const permission = existing?.permission ?? 'write'
+
+			const proxyGroupUrl = permission === 'read'
+				? baseUrl + '/calendar-proxy-read'
+				: baseUrl + '/calendar-proxy-write'
+			await getClient().removeDelegate(proxyGroupUrl, principalUrl)


Same comment as above, this is the responsibility of the cdav library

SebastianKrupinski · 2026-05-26T13:19:02Z

One last comment, this feature needs a version gate for 34 unless we are back porting all the server changes

GVodyanov self-assigned this Mar 22, 2026

GVodyanov added the 2. developing Work in progress label Mar 22, 2026

GVodyanov force-pushed the feat/add-calendar-delegation-features branch from da7ae86 to 654e770 Compare March 22, 2026 22:22

tcitworld reviewed Mar 23, 2026

View reviewed changes

Comment thread src/services/delegationService.js Outdated

GVodyanov mentioned this pull request Mar 26, 2026

feat: add mailing notifications to calendar delegation nextcloud/server#59232

Closed

8 tasks

GVodyanov marked this pull request as ready for review May 4, 2026 08:17

GVodyanov requested a review from SebastianKrupinski as a code owner May 4, 2026 08:17

ChristophWurst mentioned this pull request May 4, 2026

Calendar delegation #2706

Open

10 tasks

kra-mo requested changes May 4, 2026

View reviewed changes

hamza221 added enhancement New feature request Feature: Delegation labels May 5, 2026

GVodyanov requested a review from kra-mo May 5, 2026 17:20

GVodyanov force-pushed the feat/add-calendar-delegation-features branch 2 times, most recently from 0dd4839 to f50f37d Compare May 6, 2026 15:04

hamza221 added 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 6, 2026

kra-mo approved these changes May 7, 2026

View reviewed changes

GVodyanov mentioned this pull request May 18, 2026

feat: add calendar delegation nextcloud/cdav-library#1040

Open

GVodyanov added 3 commits May 20, 2026 20:59

feat: add calendar delegation feature

79b616e

Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>

feat: move to cdav-library

02ffe17

Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>

feat: add readonly delegation

d8f14d7

Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>

SebastianKrupinski force-pushed the feat/add-calendar-delegation-features branch from e8b2495 to d8f14d7 Compare May 21, 2026 01:00

hamza221 mentioned this pull request May 21, 2026

fix(caldav): grant sharee Acls to the delegate nextcloud/server#60641

Merged

7 tasks

AndyScherzinger closed this in nextcloud/server#60641 May 21, 2026

hamza221 reopened this May 21, 2026

hamza221 and others added 5 commits May 23, 2026 22:11

hamza221 mentioned this pull request May 24, 2026

fix(caldav-delegation): send notification to delegator nextcloud/server#60712

Open

7 tasks

GVodyanov commented May 24, 2026

View reviewed changes

hamza221 added 2. developing Work in progress and removed 3. to review Waiting for reviews labels May 24, 2026

GVodyanov added 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 24, 2026

SebastianKrupinski reviewed May 26, 2026

View reviewed changes

Conversation

GVodyanov commented Mar 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

COMPREHENSIVE GUIDE FOR TESTING THIS

Uh oh!

codecov Bot commented Mar 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

GVodyanov commented May 4, 2026

Uh oh!

kra-mo left a comment

Choose a reason for hiding this comment

Uh oh!

hamza221 commented May 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GVodyanov commented May 5, 2026

Uh oh!

GVodyanov commented May 6, 2026

Uh oh!

GVodyanov commented May 6, 2026

Uh oh!

kra-mo left a comment

Choose a reason for hiding this comment

Uh oh!

SebastianKrupinski commented May 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GVodyanov commented May 11, 2026

Uh oh!

SebastianKrupinski commented May 21, 2026

Uh oh!

hamza221 commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hamza221 commented May 23, 2026

Uh oh!

GVodyanov left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

GVodyanov commented May 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GVodyanov commented May 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hamza221 commented May 24, 2026

Uh oh!

GVodyanov commented May 24, 2026

Uh oh!

hamza221 commented May 25, 2026

Uh oh!

SebastianKrupinski May 26, 2026

Choose a reason for hiding this comment

Uh oh!

SebastianKrupinski May 26, 2026

Choose a reason for hiding this comment

Uh oh!

SebastianKrupinski May 26, 2026

Choose a reason for hiding this comment

Uh oh!

SebastianKrupinski May 26, 2026

Choose a reason for hiding this comment

Uh oh!

SebastianKrupinski May 26, 2026

Choose a reason for hiding this comment

Uh oh!

SebastianKrupinski May 26, 2026

Choose a reason for hiding this comment

Uh oh!

SebastianKrupinski commented May 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

GVodyanov commented Mar 22, 2026 •

edited

Loading

codecov Bot commented Mar 22, 2026 •

edited

Loading

hamza221 commented May 5, 2026 •

edited

Loading

SebastianKrupinski commented May 7, 2026 •

edited

Loading

hamza221 commented May 21, 2026 •

edited

Loading

GVodyanov left a comment •

edited

Loading

GVodyanov commented May 24, 2026 •

edited

Loading

GVodyanov commented May 24, 2026 •

edited

Loading