Merge pull request #1572 from nextcloud/backport/1569/stable33

[stable33] fix(sharing): Delete share keys before its deletion

Author: susnux

lib/AppInfo/Application.php

@@ -38,7 +38,7 @@
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Security\CSP\AddContentSecurityPolicyEvent;
-use OCP\Share\Events\ShareDeletedEvent;
+use OCP\Share\Events\BeforeShareDeletedEvent;
 use OCP\User\Events\UserDeletedEvent;
 use Override;
 
@@ -64,7 +64,7 @@ public function register(IRegistrationContext $context): void {
 		$context->registerServiceAlias(IMetaDataStorageV1::class, MetaDataStorageV1::class);
 		$context->registerServiceAlias(IMetaDataStorage::class, MetaDataStorage::class);
 		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
-		$context->registerEventListener(ShareDeletedEvent::class, ShareDeletedListener::class);
+		$context->registerEventListener(BeforeShareDeletedEvent::class, ShareDeletedListener::class);
 		$context->registerEventListener(BeforeTemplateRenderedEvent::class, LoadAdditionalListener::class);
 		$context->registerEventListener(LoadAdditionalScriptsEvent::class, LoadAdditionalListener::class);
 		$context->registerEventListener(AddContentSecurityPolicyEvent::class, AllowBlobMediaInCSPListener::class);

lib/Listener/ShareDeletedListener.php

@@ -12,11 +12,11 @@
 use OCA\EndToEndEncryption\IKeyStorage;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
-use OCP\Share\Events\ShareDeletedEvent;
+use OCP\Share\Events\BeforeShareDeletedEvent;
 use Psr\Log\LoggerInterface;
 
 /**
- * @template-implements IEventListener<ShareDeletedEvent>
+ * @template-implements IEventListener<BeforeShareDeletedEvent>
  */
 class ShareDeletedListener implements IEventListener {
 
@@ -27,7 +27,7 @@ public function __construct(
 	}
 
 	public function handle(Event $event): void {
-		if (!($event instanceof ShareDeletedEvent)) {
+		if (!($event instanceof BeforeShareDeletedEvent)) {
 			return;
 		}