Merge pull request #2800 from nextcloud/backport/2728/stable1.0

[stable1.0] apply remove share for users/teams/groups

Author: samin-z

lib/AppInfo/Application.php

@@ -9,6 +9,7 @@
 
 use Exception;
 use OCA\Analytics\Datasource\DatasourceEvent;
+use OCA\Circles\Events\CircleDestroyedEvent;
 use OCA\Tables\Capabilities;
 use OCA\Tables\Event\RowDeletedEvent;
 use OCA\Tables\Event\TableDeletedEvent;
@@ -18,6 +19,7 @@
 use OCA\Tables\Listener\AnalyticsDatasourceListener;
 use OCA\Tables\Listener\BeforeTemplateRenderedListener;
 use OCA\Tables\Listener\LoadAdditionalListener;
+use OCA\Tables\Listener\ReceiverCleanupListener;
 use OCA\Tables\Listener\TablesReferenceListener;
 use OCA\Tables\Listener\UserDeletedListener;
 use OCA\Tables\Listener\WhenRowDeletedAuditLogListener;
@@ -39,7 +41,9 @@
 use OCP\Collaboration\Reference\RenderReferenceEvent;
 use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent;
 use OCP\DB\Events\AddMissingIndicesEvent;
+use OCP\Group\Events\GroupDeletedEvent;
 use OCP\User\Events\BeforeUserDeletedEvent;
+use OCP\User\Events\UserDeletedEvent;
 
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'tables';
@@ -85,6 +89,9 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(RowDeletedEvent::class, WhenRowDeletedAuditLogListener::class);
 		$context->registerEventListener(TableOwnershipTransferredEvent::class, WhenTableTransferredAuditLogListener::class);
 		$context->registerEventListener(AddMissingIndicesEvent::class, AddMissingIndicesListener::class);
+		$context->registerEventListener(UserDeletedEvent::class, ReceiverCleanupListener::class);
+		$context->registerEventListener(GroupDeletedEvent::class, ReceiverCleanupListener::class);
+		$context->registerEventListener(CircleDestroyedEvent::class, ReceiverCleanupListener::class);
 
 		$context->registerSearchProvider(SearchTablesProvider::class);
 

lib/Db/ShareMapper.php

@@ -195,4 +195,15 @@ public function changeReceiverForNode(string $nodeType, int $nodeId, string $new
 			->andWhere($qb->expr()->eq('receiver_type', $qb->createNamedParameter('user', IQueryBuilder::PARAM_STR)))
 			->executeStatement();
 	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function deleteByReceiver(string $receiver, string $receiverType): int {
+		$qb = $this->db->getQueryBuilder();
+		return $qb->delete($this->table)
+			->where($qb->expr()->eq('receiver', $qb->createNamedParameter($receiver, IQueryBuilder::PARAM_STR)))
+			->andWhere($qb->expr()->eq('receiver_type', $qb->createNamedParameter($receiverType, IQueryBuilder::PARAM_STR)))
+			->executeStatement();
+	}
 }

lib/Listener/ReceiverCleanupListener.php

@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Tables\Listener;
+
+use OCA\Circles\Events\CircleDestroyedEvent;
+use OCA\Tables\Constants\ShareReceiverType;
+use OCA\Tables\Db\ShareMapper;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\Group\Events\GroupDeletedEvent;
+use OCP\User\Events\UserDeletedEvent;
+use Psr\Log\LoggerInterface;
+
+/** @template-implements IEventListener<Event|UserDeletedEvent|GroupDeletedEvent|CircleDestroyedEvent> */
+class ReceiverCleanupListener implements IEventListener {
+	public function __construct(
+		private ShareMapper $shareMapper,
+		private LoggerInterface $logger,
+	) {
+	}
+
+	public function handle(Event $event): void {
+		if ($event instanceof UserDeletedEvent) {
+			$this->cleanupByParticipant(ShareReceiverType::USER, $event->getUser()->getUID());
+		} elseif ($event instanceof GroupDeletedEvent) {
+			$this->cleanupByParticipant(ShareReceiverType::GROUP, $event->getGroup()->getGID());
+		} elseif ($event instanceof CircleDestroyedEvent) {
+			$this->cleanupByParticipant(ShareReceiverType::CIRCLE, $event->getCircle()->getSingleId());
+		}
+	}
+
+	private function cleanupByParticipant(string $type, string $participant): void {
+		try {
+			$this->shareMapper->deleteByReceiver($participant, $type);
+		} catch (\Throwable $e) {
+			$this->logger->warning('cleanup table shares for deleted receiver has failed: ' . $e->getMessage(), [
+				'exception' => $e,
+				'receiver_type' => $type,
+				'receiver' => $participant,
+			]);
+		}
+	}
+}

tests/stub.phpstub

@@ -21,6 +21,12 @@ namespace OCA\Circles\Model {
 	}
 }
 
+namespace OCA\Circles\Events {
+	class CircleDestroyedEvent extends \OCP\EventDispatcher\Event {
+		public function getCircle(): \OCA\Circles\Model\Circle {}
+	}
+}
+
 namespace OC\Collaboration\Reference {
     class LinkReferenceProvider implements IReferenceProvider {
         abstract public function matchReference(string $referenceText): bool {}