Skip to content
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

fix: propagate group name changes #1829

Merged
merged 2 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
use OCA\Circles\Listeners\Files\PreparingShareSendMail as ListenerFilesPreparingShareSendMail;
use OCA\Circles\Listeners\Files\RemovingMember as ListenerFilesRemovingMember;
use OCA\Circles\Listeners\Files\ShareCreatedSendMail as ListenerFilesShareCreatedSendMail;
use OCA\Circles\Listeners\GroupChanged;
use OCA\Circles\Listeners\GroupCreated;
use OCA\Circles\Listeners\GroupDeleted;
use OCA\Circles\Listeners\GroupMemberAdded;
Expand All @@ -50,6 +51,7 @@
use OCP\AppFramework\Bootstrap\IBootstrap;
use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\Files\Config\IMountProviderCollection;
use OCP\Group\Events\GroupChangedEvent;
use OCP\Group\Events\GroupCreatedEvent;
use OCP\Group\Events\GroupDeletedEvent;
use OCP\Group\Events\UserAddedEvent;
Expand Down Expand Up @@ -96,6 +98,7 @@ public function register(IRegistrationContext $context): void {

// Group Events
$context->registerEventListener(GroupCreatedEvent::class, GroupCreated::class);
$context->registerEventListener(GroupChangedEvent::class, GroupChanged::class);
$context->registerEventListener(GroupDeletedEvent::class, GroupDeleted::class);
$context->registerEventListener(UserAddedEvent::class, GroupMemberAdded::class);
$context->registerEventListener(UserRemovedEvent::class, GroupMemberRemoved::class);
Expand Down
9 changes: 9 additions & 0 deletions lib/FederatedItems/CircleEdit.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,11 @@ public function verify(FederatedEvent $event): void {
$event->getData()->s('name', $new->getName());
}

if ($data->hasKey('displayName')) {
$new->setDisplayName($data->g('displayName'));
$event->getData()->s('displayName', $new->getDisplayName());
}

if ($data->hasKey('description')) {
$new->setDescription($data->g('description'));
$event->getData()->s('description', $new->getDescription());
Expand All @@ -114,6 +119,10 @@ public function manage(FederatedEvent $event): void {
$circle->setName($data->g('name'));
}

if ($data->hasKey('displayName')) {
$circle->setDisplayName($data->g('displayName'));
}

$this->circleService->confirmName($circle);

if ($data->hasKey('description')) {
Expand Down
68 changes: 68 additions & 0 deletions lib/Listeners/GroupChanged.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?php

declare(strict_types=1);

/**
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Circles\Listeners;

use OCA\Circles\AppInfo\Application;
use OCA\Circles\Db\CircleRequest;
use OCA\Circles\Exceptions\CircleNotFoundException;
use OCA\Circles\Model\Circle;
use OCA\Circles\Model\Member;
use OCA\Circles\Service\CircleService;
use OCA\Circles\Service\FederatedUserService;
use OCP\EventDispatcher\Event;
use OCP\EventDispatcher\IEventListener;
use OCP\Group\Events\GroupChangedEvent;

/** @template-implements IEventListener<GroupChangedEvent|Event> */
class GroupChanged implements IEventListener {
public function __construct(
private readonly FederatedUserService $federatedUserService,
private readonly CircleService $circleService,
private readonly CircleRequest $circleRequest,
) {
}

public function handle(Event $event): void {
if (!($event instanceof GroupChangedEvent)) {
return;
}

if ($event->getFeature() !== 'displayName') {
return;
}

$groupId = $event->getGroup()->getGID();

$circle = new Circle();
$circle->setName('group:' . $groupId)
->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
->setSource(Member::TYPE_GROUP);

$owner = $this->federatedUserService->getAppInitiator(
Application::APP_ID,
Member::APP_CIRCLES,
Application::APP_NAME
);
$member = new Member();
$member->importFromIFederatedUser($owner);
$member->setLevel(Member::LEVEL_OWNER)
->setStatus(Member::STATUS_MEMBER);
$circle->setOwner($member);

try {
$this->federatedUserService->setCurrentUser($owner);
$circle = $this->circleRequest->searchCircle($circle);
} catch (CircleNotFoundException) {
return;
}

$this->circleService->updateDisplayName($circle->getSingleId(), $event->getValue());
}
}
11 changes: 11 additions & 0 deletions lib/Service/CircleService.php
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,17 @@ public function updateName(string $circleId, string $name): array {
return $event->getOutcome();
}

public function updateDisplayName(string $circleId, string $displayName): array {
$circle = $this->getCircle($circleId);

$event = new FederatedEvent(CircleEdit::class);
$event->setCircle($circle);
$event->setParams(new SimpleDataStore(['displayName' => $displayName]));
$this->federatedEventService->newEvent($event);

return $event->getOutcome();
}

/**
* @param string $circleId
* @param string $description
Expand Down
Loading