diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 282d8f402a9f3..4193aef1fda64 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -477,6 +477,7 @@ 'OCP\\Settings\\ISubAdminSettings' => $baseDir . '/lib/public/Settings/ISubAdminSettings.php', 'OCP\\Share' => $baseDir . '/lib/public/Share.php', 'OCP\\Share\\Events\\ShareCreatedEvent' => $baseDir . '/lib/public/Share/Events/ShareCreatedEvent.php', + 'OCP\\Share\\Events\\ShareDeletedEvent' => $baseDir . '/lib/public/Share/Events/ShareDeletedEvent.php', 'OCP\\Share\\Events\\VerifyMountPointEvent' => $baseDir . '/lib/public/Share/Events/VerifyMountPointEvent.php', 'OCP\\Share\\Exceptions\\GenericShareException' => $baseDir . '/lib/public/Share/Exceptions/GenericShareException.php', 'OCP\\Share\\Exceptions\\IllegalIDChangeException' => $baseDir . '/lib/public/Share/Exceptions/IllegalIDChangeException.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index bb11975d089de..da56fe2d8b64d 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -506,6 +506,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OCP\\Settings\\ISubAdminSettings' => __DIR__ . '/../../..' . '/lib/public/Settings/ISubAdminSettings.php', 'OCP\\Share' => __DIR__ . '/../../..' . '/lib/public/Share.php', 'OCP\\Share\\Events\\ShareCreatedEvent' => __DIR__ . '/../../..' . '/lib/public/Share/Events/ShareCreatedEvent.php', + 'OCP\\Share\\Events\\ShareDeletedEvent' => __DIR__ . '/../../..' . '/lib/public/Share/Events/ShareDeletedEvent.php', 'OCP\\Share\\Events\\VerifyMountPointEvent' => __DIR__ . '/../../..' . '/lib/public/Share/Events/VerifyMountPointEvent.php', 'OCP\\Share\\Exceptions\\GenericShareException' => __DIR__ . '/../../..' . '/lib/public/Share/Exceptions/GenericShareException.php', 'OCP\\Share\\Exceptions\\IllegalIDChangeException' => __DIR__ . '/../../..' . '/lib/public/Share/Exceptions/IllegalIDChangeException.php', diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 0787f6d32aaa9..9a2b413896b00 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -1138,6 +1138,7 @@ protected function deleteChildren(IShare $share) { $deletedShares = array_merge($deletedShares, $deletedChildren); $provider->delete($child); + $this->dispatcher->dispatchTyped(new Share\Events\ShareDeletedEvent($child)); $deletedShares[] = $child; } @@ -1168,6 +1169,8 @@ public function deleteShare(IShare $share) { $provider = $this->factory->getProviderForType($share->getShareType()); $provider->delete($share); + $this->dispatcher->dispatchTyped(new Share\Events\ShareDeletedEvent($share)); + // All the deleted shares caused by this delete $deletedShares[] = $share; diff --git a/lib/public/Share/Events/ShareDeletedEvent.php b/lib/public/Share/Events/ShareDeletedEvent.php new file mode 100644 index 0000000000000..4dca946aff321 --- /dev/null +++ b/lib/public/Share/Events/ShareDeletedEvent.php @@ -0,0 +1,60 @@ + + * + * @author Maxence Lange + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace OCP\Share\Events; + +use OCP\EventDispatcher\Event; +use OCP\Share\IShare; + +/** + * @since 21.0.0 + */ +class ShareDeletedEvent extends Event { + + /** @var IShare */ + private $share; + + /** + * + * @param IShare $share + * @param IShare[] $children + * + * @since 21.0.0 + */ + public function __construct(IShare $share) { + parent::__construct(); + + $this->share = $share; + } + + /** + * @return IShare + * @since 21.0.0 + */ + public function getShare(): IShare { + return $this->share; + } +} diff --git a/tests/lib/Share20/ManagerTest.php b/tests/lib/Share20/ManagerTest.php index efae909b99f32..372f49ddf87ee 100644 --- a/tests/lib/Share20/ManagerTest.php +++ b/tests/lib/Share20/ManagerTest.php @@ -209,6 +209,8 @@ public function testDelete($shareType, $sharedWith) { ->setMethods(['getShareById', 'deleteChildren']) ->getMock(); + $manager->method('deleteChildren')->willReturn([]); + $path = $this->createMock(File::class); $path->method('getId')->willReturn(1); @@ -254,6 +256,8 @@ public function testDeleteLazyShare() { ->setMethods(['getShareById', 'deleteChildren']) ->getMock(); + $manager->method('deleteChildren')->willReturn([]); + $share = $this->manager->newShare(); $share->setId(42) ->setProviderId('prov')