-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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
feat(dav): expose Nextcloud groups to Contact's system addressbook contacts #40997
Open
tcitworld
wants to merge
2
commits into
master
Choose a base branch
from
feat/expose-nc-groups-to-system-addressbook-contacts
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 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
50 changes: 50 additions & 0 deletions
50
apps/dav/lib/BackgroundJob/SyncSystemAddressBookAfterUsersChange.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,50 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright 2023, Citharel Thomas <[email protected]> | ||
| * | ||
| * @author Citharel Thomas <[email protected]> | ||
| * | ||
| * @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\DAV\BackgroundJob; | ||
|
|
||
| use OCA\DAV\CardDAV\SyncService; | ||
| use OCP\AppFramework\Utility\ITimeFactory; | ||
| use OCP\BackgroundJob\QueuedJob; | ||
| use OCP\IUser; | ||
|
|
||
| class SyncSystemAddressBookAfterUsersChange extends QueuedJob { | ||
| private SyncService $syncService; | ||
|
|
||
| public function __construct(SyncService $syncService, ITimeFactory $time) { | ||
| parent::__construct($time); | ||
| $this->syncService = $syncService; | ||
| } | ||
|
|
||
| /** | ||
| * @param IUser[] $argument | ||
| * @return void | ||
| */ | ||
| public function run($argument): void { | ||
| foreach ($argument as $user) { | ||
| $this->syncService->updateUser($user); | ||
| } | ||
| } | ||
| } |
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,56 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright 2023 Thomas Citharel <[email protected]> | ||
| * | ||
| * @author Thomas Citharel <[email protected]> | ||
| * | ||
| * @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\DAV\Listener; | ||
|
|
||
| use OCA\DAV\AppInfo\Application; | ||
| use OCA\DAV\BackgroundJob\SyncSystemAddressBookAfterUsersChange; | ||
| use OCP\BackgroundJob\IJobList; | ||
| use OCP\EventDispatcher\Event; | ||
| use OCP\EventDispatcher\IEventListener; | ||
| use OCP\Group\Events\BeforeGroupChangedEvent; | ||
| use OCP\Group\Events\BeforeGroupDeletedEvent; | ||
| use OCP\IConfig; | ||
|
|
||
| /** | ||
| * @template-implements IEventListener<BeforeGroupChangedEvent|BeforeGroupDeletedEvent> | ||
| */ | ||
| class GroupChangeListener implements IEventListener { | ||
| public function __construct(private IJobList $jobList, private IConfig $config) { | ||
| } | ||
|
|
||
| public function handle(Event $event): void { | ||
| if (!$this->canSyncBecauseOfGroupChange($event)) { | ||
| // Not what we subscribed to | ||
| return; | ||
| } | ||
| /** @var BeforeGroupChangedEvent|BeforeGroupDeletedEvent $event */ | ||
| $this->jobList->add(SyncSystemAddressBookAfterUsersChange::class, $event->getGroup()->getUsers()); | ||
| } | ||
|
|
||
| private function canSyncBecauseOfGroupChange(Event $event): bool { | ||
| return ($event instanceof BeforeGroupChangedEvent || $event instanceof BeforeGroupDeletedEvent) && $this->config->getAppValue(Application::APP_ID, 'system_addressbook_expose_groups', 'no') === 'yes'; | ||
| } | ||
| } |
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,60 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright 2023 Thomas Citharel <[email protected]> | ||
| * | ||
| * @author Thomas Citharel <[email protected]> | ||
| * | ||
| * @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\DAV\Listener; | ||
|
|
||
| use OCA\DAV\AppInfo\Application; | ||
| use OCA\DAV\BackgroundJob\SyncSystemAddressBookAfterUsersChange; | ||
| use OCP\Accounts\UserUpdatedEvent; | ||
| use OCP\BackgroundJob\IJobList; | ||
| use OCP\EventDispatcher\Event; | ||
| use OCP\EventDispatcher\IEventListener; | ||
| use OCP\Group\Events\UserAddedEvent; | ||
| use OCP\Group\Events\UserRemovedEvent; | ||
| use OCP\IConfig; | ||
|
|
||
| /** | ||
| * @template-implements IEventListener<UserUpdatedEvent|UserAddedEvent|UserRemovedEvent> | ||
| */ | ||
| class UserChangeListener implements IEventListener { | ||
| public function __construct(private IJobList $jobList, private IConfig $config) { | ||
| } | ||
|
|
||
| public function handle(Event $event): void { | ||
| if (!($event instanceof UserUpdatedEvent || $event instanceof UserAddedEvent || $event instanceof UserRemovedEvent)) { | ||
|
Check notice Code scanning / Psalm DocblockTypeContradiction Note
Docblock-defined type OCP\Group\Events\UserRemovedEvent for $event is always OCP\Group\Events\UserRemovedEvent
|
||
| // Not what we subscribed to | ||
| return; | ||
| } | ||
|
|
||
| if ($this->canSyncBecauseOfGroupMembershipChange($event)) { | ||
| /** @var UserUpdatedEvent|UserAddedEvent|UserRemovedEvent $event */ | ||
| $this->jobList->add(SyncSystemAddressBookAfterUsersChange::class, [$event->getUser()]); | ||
| } | ||
| } | ||
|
|
||
| private function canSyncBecauseOfGroupMembershipChange(Event $event): bool { | ||
| return $event instanceof UserUpdatedEvent || $this->config->getAppValue(Application::APP_ID, 'system_addressbook_expose_groups', 'no') === 'yes'; | ||
| } | ||
| } | ||
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.
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 might be wrong but this could be a use case for https://www.php.net/manual/en/function.array-intersect.php