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

Mail shares trigger the public key 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2017-04-13 15:14:30 +02:00
parent 6a519abde8
commit cab41118f6
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/sharebymail/lib/ShareByMailProvider.php
View File

@ -858,7 +858,7 @@ class ShareByMailProvider implements IShareProvider {
$mail = $cursor->fetch() !== false;
$cursor->closeCursor();
return ['mail' => $mail];
return ['public' => $mail];
}
}

32
apps/sharebymail/tests/ShareByMailProviderTest.php
View File

@ -676,11 +676,11 @@ class ShareByMailProviderTest extends TestCase {
$folder = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
$accessList = $provider->getAccessList([$folder], true);
$this->assertArrayHasKey('mail', $accessList);
$this->assertFalse($accessList['mail']);
$this->assertArrayHasKey('public', $accessList);
$this->assertFalse($accessList['public']);
$accessList = $provider->getAccessList([$folder], false);
$this->assertArrayHasKey('mail', $accessList);
$this->assertFalse($accessList['mail']);
$this->assertArrayHasKey('public', $accessList);
$this->assertFalse($accessList['public']);
$share1 = $this->shareManager->newShare();
$share1->setSharedWith('user@server.com')
@ -699,29 +699,29 @@ class ShareByMailProviderTest extends TestCase {
$share2 = $provider->create($share2);
$accessList = $provider->getAccessList([$folder], true);
$this->assertArrayHasKey('mail', $accessList);
$this->assertTrue($accessList['mail']);
$this->assertArrayHasKey('public', $accessList);
$this->assertTrue($accessList['public']);
$accessList = $provider->getAccessList([$folder], false);
$this->assertArrayHasKey('mail', $accessList);
$this->assertTrue($accessList['mail']);
$this->assertArrayHasKey('public', $accessList);
$this->assertTrue($accessList['public']);
$provider->delete($share2);
$accessList = $provider->getAccessList([$folder], true);
$this->assertArrayHasKey('mail', $accessList);
$this->assertTrue($accessList['mail']);
$this->assertArrayHasKey('public', $accessList);
$this->assertTrue($accessList['public']);
$accessList = $provider->getAccessList([$folder], false);
$this->assertArrayHasKey('mail', $accessList);
$this->assertTrue($accessList['mail']);
$this->assertArrayHasKey('public', $accessList);
$this->assertTrue($accessList['public']);
$provider->delete($share1);
$accessList = $provider->getAccessList([$folder], true);
$this->assertArrayHasKey('mail', $accessList);
$this->assertFalse($accessList['mail']);
$this->assertArrayHasKey('public', $accessList);
$this->assertFalse($accessList['public']);
$accessList = $provider->getAccessList([$folder], false);
$this->assertArrayHasKey('mail', $accessList);
$this->assertFalse($accessList['mail']);
$this->assertArrayHasKey('public', $accessList);
$this->assertFalse($accessList['public']);
$u1->delete();
$u2->delete();