aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-10-26 19:42:54 +0100
committerGitHub <noreply@github.com>2020-10-26 19:42:54 +0100
commit7570daf123169e0a0b17a01b3d7b762e7b1500d4 (patch)
tree31372b7feaa80d80e458b9e8102f1481530ce2f7
parenta744583545cbc12909a34684edcd62c66f201907 (diff)
parent0390a90d70104c2b3237feb05c3398f8ea1612c9 (diff)
downloadnextcloud-server-7570daf123169e0a0b17a01b3d7b762e7b1500d4.tar.gz
nextcloud-server-7570daf123169e0a0b17a01b3d7b762e7b1500d4.zip
Merge pull request #23696 from nextcloud/fix/noid/fix-share-download-error-message
Return correct error message on share download without read permission
-rw-r--r--apps/files_sharing/lib/Controller/ShareController.php2
-rw-r--r--apps/files_sharing/tests/Controller/ShareControllerTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
index fdf69abd9ac..3e514b3a74d 100644
--- a/apps/files_sharing/lib/Controller/ShareController.php
+++ b/apps/files_sharing/lib/Controller/ShareController.php
@@ -556,7 +556,7 @@ class ShareController extends AuthPublicShareController {
$share = $this->shareManager->getShareByToken($token);
if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
- return new \OCP\AppFramework\Http\DataResponse('Share is read-only');
+ return new \OCP\AppFramework\Http\DataResponse('Share has no read permission');
}
$files_list = null;
diff --git a/apps/files_sharing/tests/Controller/ShareControllerTest.php b/apps/files_sharing/tests/Controller/ShareControllerTest.php
index 33dff13cafe..270f38a1148 100644
--- a/apps/files_sharing/tests/Controller/ShareControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareControllerTest.php
@@ -840,7 +840,7 @@ class ShareControllerTest extends \Test\TestCase {
// Test with a password protected share and no authentication
$response = $this->shareController->downloadShare('validtoken');
- $expectedResponse = new DataResponse('Share is read-only');
+ $expectedResponse = new DataResponse('Share has no read permission');
$this->assertEquals($expectedResponse, $response);
}