Merge pull request #1900 from nextcloud/backport/1829/stable31

[stable31] fix: propagate group name changes

Author: provokateurin

lib/AppInfo/Application.php

@@ -34,6 +34,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;
@@ -52,6 +53,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;
@@ -98,6 +100,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);

lib/FederatedItems/CircleEdit.php

@@ -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());
@@ -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')) {

lib/Listeners/GroupChanged.php

@@ -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());
+	}
+}

lib/Service/CircleService.php

@@ -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