diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index 30a8ded2a4a..35fe3ac81ab 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -908,7 +908,7 @@ class ShareAPIController extends OCSController { // First check if it is an internal share. try { - $share = $this->shareManager->getShareById('ocinternal:' . $id); + $share = $this->shareManager->getShareById('ocinternal:' . $id, $this->currentUser); return $share; } catch (ShareNotFound $e) { // Do nothing, just try the other share type @@ -917,7 +917,7 @@ class ShareAPIController extends OCSController { try { if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_CIRCLE)) { - $share = $this->shareManager->getShareById('ocCircleShare:' . $id); + $share = $this->shareManager->getShareById('ocCircleShare:' . $id, $this->currentUser); return $share; } } catch (ShareNotFound $e) { @@ -926,7 +926,7 @@ class ShareAPIController extends OCSController { try { if ($this->shareManager->shareProviderExists(\OCP\Share::SHARE_TYPE_EMAIL)) { - $share = $this->shareManager->getShareById('ocMailShare:' . $id); + $share = $this->shareManager->getShareById('ocMailShare:' . $id, $this->currentUser); return $share; } } catch (ShareNotFound $e) { @@ -936,7 +936,7 @@ class ShareAPIController extends OCSController { if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) { throw new ShareNotFound(); } - $share = $this->shareManager->getShareById('ocFederatedSharing:' . $id); + $share = $this->shareManager->getShareById('ocFederatedSharing:' . $id, $this->currentUser); return $share; } diff --git a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php index 89a21d7d1e4..2c638fe4ed6 100644 --- a/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php +++ b/apps/files_sharing/tests/Controller/ShareAPIControllerTest.php @@ -229,7 +229,7 @@ class ShareAPIControllerTest extends TestCase { $this->shareManager ->expects($this->once()) ->method('getShareById') - ->with('ocinternal:42') + ->with('ocinternal:42', 'currentUser') ->will($this->throwException(new \OC\Share20\Exception\ShareNotFound())); $expected = new \OC\OCS\Result(null, 404, 'wrong share ID, share doesn\'t exist.'); @@ -457,7 +457,7 @@ class ShareAPIControllerTest extends TestCase { $this->shareManager ->expects($this->once()) ->method('getShareById') - ->with($share->getFullId()) + ->with($share->getFullId(), 'currentUser') ->willReturn($share); $userFolder = $this->getMockBuilder('OCP\Files\Folder')->getMock(); @@ -517,7 +517,7 @@ class ShareAPIControllerTest extends TestCase { $this->shareManager ->expects($this->once()) ->method('getShareById') - ->with('ocinternal:42') + ->with('ocinternal:42', 'currentUser') ->willReturn($share); $this->ocs->getShare(42);