-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(contactsinteraction): allow users to disable contacts interactio…
…n addressbook This allows simple users to opt-out of the contacts interaction addressbook even if admins have the app installed. Similar to how the birthday calendar works, the functionnality can be toggled in the user's settings or by doing a DELETE on the addressbook. A new contacts personal section has been added to contain this new setting. Signed-off-by: Thomas Citharel <tcit@tcit.fr>
- Loading branch information
Showing
24 changed files
with
924 additions
and
7 deletions.
There are no files selected for viewing
This file contains 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 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,30 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
/** | ||
* @copyright Copyright (c) 2023 Thomas Citharel <nextcloud@tcit.fr> | ||
* | ||
* @author Thomas Citharel <nextcloud@tcit.fr> | ||
* | ||
* @license GNU AGPL version 3 or any later version | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as | ||
* published by the Free Software Foundation, either version 3 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
*/ | ||
return [ | ||
'ocs' => [ | ||
['name' => 'config#disable', 'url' => '/config/user/disable', 'verb' => 'POST'], | ||
], | ||
]; |
This file contains 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 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 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 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 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,110 @@ | ||
<?php | ||
/** | ||
* @copyright 2023, Thomas Citharel <nextcloud@tcit.fr> | ||
* | ||
* @author Thomas Citharel <nextcloud@tcit.fr> | ||
* | ||
* @license GNU AGPL version 3 or any later version | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License as | ||
* published by the Free Software Foundation, either version 3 of the | ||
* License, or (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
*/ | ||
namespace OCA\ContactsInteraction\DAV; | ||
|
||
use OCA\ContactsInteraction\AddressBook; | ||
use OCA\ContactsInteraction\AppInfo\Application; | ||
use OCA\ContactsInteraction\Db\RecentContactMapper; | ||
use OCP\IConfig; | ||
use Sabre\DAV\Server; | ||
use Sabre\DAV\ServerPlugin; | ||
use Sabre\HTTP\RequestInterface; | ||
use Sabre\HTTP\ResponseInterface; | ||
|
||
/** | ||
* Allows users to disable the feature by deleting the addressbook | ||
* | ||
* @package OCA\DAV\CalDAV\BirthdayCalendar | ||
*/ | ||
class Plugin extends ServerPlugin { | ||
|
||
protected Server $server; | ||
Check notice Code scanning / Psalm PropertyNotSetInConstructor Note
Property OCA\ContactsInteraction\DAV\Plugin::$server is not defined in constructor of OCA\ContactsInteraction\DAV\Plugin or in any methods called in the constructor
|
||
|
||
public function __construct(protected IConfig $config, protected RecentContactMapper $recentContactMapper) { | ||
} | ||
|
||
/** | ||
* This method should return a list of server-features. | ||
* | ||
* This is for example 'versioning' and is added to the DAV: header | ||
* in an OPTIONS response. | ||
* | ||
* @return string[] | ||
*/ | ||
public function getFeatures() { | ||
return ['nc-disable-recently-contacted']; | ||
} | ||
|
||
/** | ||
* Returns a plugin name. | ||
* | ||
* Using this name other plugins will be able to access other plugins | ||
* using Sabre\DAV\Server::getPlugin | ||
* | ||
* @return string | ||
*/ | ||
public function getPluginName() { | ||
return 'nc-disable-recently-contacted'; | ||
} | ||
|
||
/** | ||
* This initializes the plugin. | ||
* | ||
* This function is called by Sabre\DAV\Server, after | ||
* addPlugin is called. | ||
* | ||
* This method should set up the required event subscriptions. | ||
* | ||
* @param Server $server | ||
*/ | ||
public function initialize(Server $server) { | ||
Check notice Code scanning / Psalm MissingReturnType Note
Method OCA\ContactsInteraction\DAV\Plugin::initialize does not have a return type, expecting void
|
||
$this->server = $server; | ||
|
||
$this->server->on('method:DELETE', [$this, 'httpDelete']); | ||
} | ||
|
||
/** | ||
* We intercept this to handle POST requests on contacts homes. | ||
* | ||
* @param RequestInterface $request | ||
* @param ResponseInterface $response | ||
* | ||
* @return bool|void | ||
*/ | ||
public function httpDelete(RequestInterface $request, ResponseInterface $response) { | ||
$node = $this->server->tree->getNodeForPath($this->server->getRequestUri()); | ||
if (!($node instanceof AddressBook)) { | ||
return; | ||
} | ||
|
||
$principalUri = $node->getOwner(); | ||
$userId = substr($principalUri, 17); | ||
|
||
$this->config->setUserValue($userId, Application::APP_ID, 'disableContactsInteractionAddressBook', 'yes'); | ||
$this->recentContactMapper->cleanForUser($userId); | ||
|
||
$this->server->httpResponse->setStatus(204); | ||
|
||
return false; | ||
} | ||
} |
This file contains 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 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
35 changes: 35 additions & 0 deletions
35
apps/contactsinteraction/lib/Listeners/UserPreferenceListener.php
This file contains 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,35 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
/** | ||
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors | ||
* SPDX-License-Identifier: AGPL-3.0-or-later | ||
*/ | ||
namespace OCA\ContactsInteraction\Listeners; | ||
|
||
use OCA\ContactsInteraction\AppInfo\Application; | ||
use OCA\ContactsInteraction\Db\RecentContactMapper; | ||
use OCP\BackgroundJob\IJobList; | ||
use OCP\Config\BeforePreferenceDeletedEvent; | ||
use OCP\Config\BeforePreferenceSetEvent; | ||
use OCP\EventDispatcher\Event; | ||
use OCP\EventDispatcher\IEventListener; | ||
|
||
/** @template-implements IEventListener<BeforePreferenceSetEvent|BeforePreferenceDeletedEvent> */ | ||
class UserPreferenceListener implements IEventListener { | ||
|
||
public function __construct(protected IJobList $jobList, private RecentContactMapper $recentContactMapper) { } | ||
|
||
public function handle(Event $event): void { | ||
if ($event instanceof BeforePreferenceSetEvent) { | ||
if ($event->getAppId() === Application::APP_ID && $event->getConfigKey() === 'disableContactsInteractionAddressBook' && $event->getConfigValue() === 'yes') { | ||
$event->setValid(true); | ||
} | ||
} elseif ($event instanceof BeforePreferenceDeletedEvent) { | ||
Check notice Code scanning / Psalm RedundantConditionGivenDocblockType Note
Docblock-defined type OCP\Config\BeforePreferenceDeletedEvent for $event is always OCP\Config\BeforePreferenceDeletedEvent
|
||
if ($event->getAppId() === Application::APP_ID && $event->getConfigKey() === 'disableContactsInteractionAddressBook') { | ||
$this->recentContactMapper->cleanForUser($event->getUserId()); | ||
$event->setValid(true); | ||
} | ||
} | ||
} | ||
} |
Oops, something went wrong.