mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5367 from nextcloud/better-share-error 

Better error message on invalid sharing link
This commit is contained in:
Morris Jobke 2017-06-13 14:59:38 -05:00 committed by GitHub
parent 69fd3a3c7b 0f8c1b13a3
commit 101d1c0f81
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/Share20/Manager.php
View File

@ -1090,7 +1090,7 @@ class Manager implements IManager {
} }
if ($share === null) { if ($share === null) {
throw new ShareNotFound(); throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
} }
$this->checkExpireDate($share); $this->checkExpireDate($share);
@ -1110,7 +1110,7 @@ class Manager implements IManager {
if ($share->getExpirationDate() !== null && if ($share->getExpirationDate() !== null &&
$share->getExpirationDate() <= new \DateTime()) { $share->getExpirationDate() <= new \DateTime()) {
$this->deleteShare($share); $this->deleteShare($share);
throw new ShareNotFound(); throw new ShareNotFound($this->l->t('The requested share does not exist anymore'));
} }
} }

5
tests/lib/Share20/ManagerTest.php
View File

@ -2142,6 +2142,7 @@ class ManagerTest extends \Test\TestCase {
/** /**
* @expectedException \OCP\Share\Exceptions\ShareNotFound * @expectedException \OCP\Share\Exceptions\ShareNotFound
* @expectedExceptionMessage The requested share does not exist anymore
*/ */
public function testGetShareByTokenExpired() { public function testGetShareByTokenExpired() {
$this->config $this->config
@ -2150,6 +2151,10 @@ class ManagerTest extends \Test\TestCase {
->with('core', 'shareapi_allow_links', 'yes') ->with('core', 'shareapi_allow_links', 'yes')
->willReturn('yes'); ->willReturn('yes');
$this->l->expects($this->once())
->method('t')
->willReturnArgument(0);
$manager = $this->createManagerMock() $manager = $this->createManagerMock()
->setMethods(['deleteShare']) ->setMethods(['deleteShare'])
->getMock(); ->getMock();