Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable21] gracefully handle deleteFromSelf when share is already gone #26382

Merged
merged 1 commit into from
Mar 31, 2021
Merged

[stable21] gracefully handle deleteFromSelf when share is already gone #26382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion lib/private/Share20/DefaultShareProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions tests/lib/Share20/DefaultShareProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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([
Expand Down