Skip to content
Open
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
7 changes: 7 additions & 0 deletions lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -40,7 +42,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;
use Psr\Container\ContainerInterface;

class Application extends App implements IBootstrap {
Expand Down Expand Up @@ -87,6 +91,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);

Expand Down
11 changes: 11 additions & 0 deletions lib/Db/ShareMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -250,4 +250,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();
}
}
48 changes: 48 additions & 0 deletions lib/Listener/ReceiverCleanupListener.php
Original file line number Diff line number Diff line change
@@ -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,
]);
}
}
}
6 changes: 6 additions & 0 deletions tests/stub.phpstub
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
Expand Down
Loading