Mail shares trigger the public key

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
nextcloud · Apr 13, 2017 · cab4111 · cab4111
1 parent 6a519ab
commit cab4111
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -858,7 +858,7 @@ public function getAccessList($nodes, $currentAccess) {
  $mail = $cursor->fetch() !== false;
  $cursor->closeCursor();
 
- return ['mail' => $mail];
+ return ['public' => $mail];
  }
 
 }
diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php
@@ -676,11 +676,11 @@ public function testGetAccessList() {
  $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 @@ public function testGetAccessList() {
  $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();