Merge pull request #26382 from nextcloud/backport/26372/stable21

[stable21] gracefully handle deleteFromSelf when share is already gone
nextcloud · Mar 31, 2021 · 3e5fbd4 · 3e5fbd4
2 parents 6d70bd9 + caec3a8
commit 3e5fbd4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
@@ -470,7 +470,8 @@ public function deleteFromSelf(IShare $share, $recipient) {
 			}
 
 			if (!$group->inGroup($user)) {
-				throw new ProviderException('Recipient not in receiving group');
+				// nothing left to do
+				return;
 			}
 
 			// Try to fetch user specific share

diff --git a/tests/lib/Share20/DefaultShareProviderTest.php b/tests/lib/Share20/DefaultShareProviderTest.php
@@ -1558,9 +1558,6 @@ public function testDeleteFromSelfGroupAlreadyCustomShare() {
 
 
 	public function testDeleteFromSelfGroupUserNotInGroup() {
-		$this->expectException(\OC\Share20\Exception\ProviderException::class);
-		$this->expectExceptionMessage('Recipient not in receiving group');
-
 		$qb = $this->dbConn->getQueryBuilder();
 		$stmt = $qb->insert('share')
 			->values([