Skip to content

Disable sharing calendars via link when sharing via link is disabled - #34372

Closed
pboguslawski wants to merge 2 commits into
nextcloud:masterfrom
ibpl:master-IB#1126264
Closed

Disable sharing calendars via link when sharing via link is disabled#34372
pboguslawski wants to merge 2 commits into
nextcloud:masterfrom
ibpl:master-IB#1126264

Conversation

@pboguslawski

@pboguslawskipboguslawski commented Oct 1, 2022

Copy link
Copy Markdown
Contributor

This mod disallows sharing calendars via link when shareapi_allow_links is disabled.

Related: nextcloud/calendar#525
Related: nextcloud/calendar#4399
Author-Change-Id: IB#1126264
Signed-off-by: Pawel Boguslawski pawel.boguslawski@ib.pl

@pboguslawski
Disable sharing calendars via link when sharik via link is disabled
45eefc2
This mod disallows sharing calendars via link when `shareapi_allow_links`
is disabled.
Related: nextcloud/calendar#525
Related: nextcloud/calendar#4399
Author-Change-Id: IB#1126264
Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>
pboguslawski added a commit to ibpl/calendar that referenced this pull request Oct 1, 2022
@pboguslawski
Hide sharing calendar via link in UI when sharing via link is disabled
608636d
This mod hides sharing calendar via link in UI when `shareapi_allow_links` is disabled.
Should be applied together with nextcloud/server#34372
Related: nextcloud/server#34372
Related: nextcloud#525
Related: nextcloud#4399
Author-Change-Id: IB#1126264
Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>
@pboguslawskipboguslawski mentioned this pull request Oct 1, 2022
Closed
miaulalala
miaulalala requested changes Oct 1, 2022
View reviewed changes
Comment threadapps/dav/lib/CalDAV/CalDavBackend.php Outdated
Comment threadapps/dav/lib/CalDAV/CalDavBackend.php Outdated
@miaulalala

miaulalala commented Oct 1, 2022

Copy link
Copy Markdown
Contributor

Thanks for your PR! A couple small change requests only :)

@szaimenszaimen added this to the Nextcloud 26 milestone Oct 1, 2022
@szaimenszaimen added the 3. to review Waiting for reviews label Oct 1, 2022
tcitworld
tcitworld requested changes Oct 2, 2022
View reviewed changes
Comment threadapps/dav/lib/CalDAV/CalDavBackend.php
Comment threadapps/dav/lib/CalDAV/CalDavBackend.php Outdated
Comment threadapps/dav/lib/CalDAV/Publishing/PublishPlugin.php Outdated
@pboguslawski
Disable sharing calendars via link adjusted
bfd8c62
Fixes: 45eefc2
Related: nextcloud#34372
Author-Change-Id: IB#1126264
Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>
@tcitworldtcitworld mentioned this pull request Oct 14, 2022
Open
github-advanced-security[bot]
github-advanced-securityAI found potential problems Oct 14, 2022
View reviewed changes
Comment threadapps/dav/lib/Server.php
\OC::$server->getConfig(),
\OC::$server->getURLGenerator()
));
if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {

Check notice

Code scanning / Psalm

DeprecatedMethod

The method OC\Server::getConfig has been marked as deprecated
Comment threadapps/dav/lib/Server.php
));
if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
$this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
\OC::$server->getConfig(),

Check notice

Code scanning / Psalm

DeprecatedMethod

The method OC\Server::getConfig has been marked as deprecated
Comment threadapps/dav/lib/Server.php
if (\OC::$server->getConfig()->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
$this->server->addPlugin(new \OCA\DAV\CalDAV\Publishing\PublishPlugin(
\OC::$server->getConfig(),
\OC::$server->getURLGenerator()

Check notice

Code scanning / Psalm

DeprecatedMethod

The method OC\Server::getURLGenerator has been marked as deprecated
@tcitworldtcitworld added the feature: caldav Related to CalDAV internals label Oct 14, 2022
@pboguslawskipboguslawski changed the title Disable sharing calendars via link when sharik via link is disabledDisable sharing calendars via link when sharing via link is disabledOct 28, 2022
@pboguslawski

pboguslawski commented Oct 28, 2022•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Current solution (unregistering plugin) does not work correctly so please wait with merging until final solution is proposed.

tcitworld pushed a commit that referenced this pull request Oct 28, 2022
@pboguslawski@tcitworld
Disable sharing calendars via link adjusted
b9f276e
Fixes: 45eefc2
Related: #34372
Author-Change-Id: IB#1126264
Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>
@tcitworldtcitworld mentioned this pull request Oct 28, 2022
Open
@tcitworld

tcitworld commented Oct 28, 2022

Copy link
Copy Markdown
Member

@pboguslawski That's correct, thanks for checking! Sadly the AllowedSharingModes didn't fallback as I planned when the plugin was unregistered, so I made #34873 to extract exposing this information into it's own plugin. That should do it, please have a go and test.

@pboguslawski

pboguslawski commented Oct 29, 2022

Copy link
Copy Markdown
ContributorAuthor

Replaced with #34873.

tcitworld pushed a commit that referenced this pull request Jan 20, 2023
@pboguslawski@tcitworld
Disable sharing calendars via link adjusted
bbaf2af
Fixes: 45eefc2
Related: #34372
Author-Change-Id: IB#1126264
Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@miaulalalamiaulalalamiaulalala requested changes
@ChristophWurstChristophWurstChristophWurst approved these changes
@tcitworldtcitworldtcitworld approved these changes

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsfeature: caldavRelated to CalDAV internals

Projects

None yet

Milestone

Nextcloud 26

Development

Successfully merging this pull request may close these issues.

6 participants

@pboguslawski@miaulalala@tcitworld@ChristophWurst@github-advanced-security@szaimen