Mail shares trigger the public key
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
6a519abde8
commit
cab41118f6
|
@ -858,7 +858,7 @@ class ShareByMailProvider implements IShareProvider {
|
||||||
$mail = $cursor->fetch() !== false;
|
$mail = $cursor->fetch() !== false;
|
||||||
$cursor->closeCursor();
|
$cursor->closeCursor();
|
||||||
|
|
||||||
return ['mail' => $mail];
|
return ['public' => $mail];
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -676,11 +676,11 @@ class ShareByMailProviderTest extends TestCase {
|
||||||
$folder = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
|
$folder = $rootFolder->getUserFolder($u1->getUID())->newFolder('foo');
|
||||||
|
|
||||||
$accessList = $provider->getAccessList([$folder], true);
|
$accessList = $provider->getAccessList([$folder], true);
|
||||||
$this->assertArrayHasKey('mail', $accessList);
|
$this->assertArrayHasKey('public', $accessList);
|
||||||
$this->assertFalse($accessList['mail']);
|
$this->assertFalse($accessList['public']);
|
||||||
$accessList = $provider->getAccessList([$folder], false);
|
$accessList = $provider->getAccessList([$folder], false);
|
||||||
$this->assertArrayHasKey('mail', $accessList);
|
$this->assertArrayHasKey('public', $accessList);
|
||||||
$this->assertFalse($accessList['mail']);
|
$this->assertFalse($accessList['public']);
|
||||||
|
|
||||||
$share1 = $this->shareManager->newShare();
|
$share1 = $this->shareManager->newShare();
|
||||||
$share1->setSharedWith('user@server.com')
|
$share1->setSharedWith('user@server.com')
|
||||||
|
@ -699,29 +699,29 @@ class ShareByMailProviderTest extends TestCase {
|
||||||
$share2 = $provider->create($share2);
|
$share2 = $provider->create($share2);
|
||||||
|
|
||||||
$accessList = $provider->getAccessList([$folder], true);
|
$accessList = $provider->getAccessList([$folder], true);
|
||||||
$this->assertArrayHasKey('mail', $accessList);
|
$this->assertArrayHasKey('public', $accessList);
|
||||||
$this->assertTrue($accessList['mail']);
|
$this->assertTrue($accessList['public']);
|
||||||
$accessList = $provider->getAccessList([$folder], false);
|
$accessList = $provider->getAccessList([$folder], false);
|
||||||
$this->assertArrayHasKey('mail', $accessList);
|
$this->assertArrayHasKey('public', $accessList);
|
||||||
$this->assertTrue($accessList['mail']);
|
$this->assertTrue($accessList['public']);
|
||||||
|
|
||||||
$provider->delete($share2);
|
$provider->delete($share2);
|
||||||
|
|
||||||
$accessList = $provider->getAccessList([$folder], true);
|
$accessList = $provider->getAccessList([$folder], true);
|
||||||
$this->assertArrayHasKey('mail', $accessList);
|
$this->assertArrayHasKey('public', $accessList);
|
||||||
$this->assertTrue($accessList['mail']);
|
$this->assertTrue($accessList['public']);
|
||||||
$accessList = $provider->getAccessList([$folder], false);
|
$accessList = $provider->getAccessList([$folder], false);
|
||||||
$this->assertArrayHasKey('mail', $accessList);
|
$this->assertArrayHasKey('public', $accessList);
|
||||||
$this->assertTrue($accessList['mail']);
|
$this->assertTrue($accessList['public']);
|
||||||
|
|
||||||
$provider->delete($share1);
|
$provider->delete($share1);
|
||||||
|
|
||||||
$accessList = $provider->getAccessList([$folder], true);
|
$accessList = $provider->getAccessList([$folder], true);
|
||||||
$this->assertArrayHasKey('mail', $accessList);
|
$this->assertArrayHasKey('public', $accessList);
|
||||||
$this->assertFalse($accessList['mail']);
|
$this->assertFalse($accessList['public']);
|
||||||
$accessList = $provider->getAccessList([$folder], false);
|
$accessList = $provider->getAccessList([$folder], false);
|
||||||
$this->assertArrayHasKey('mail', $accessList);
|
$this->assertArrayHasKey('public', $accessList);
|
||||||
$this->assertFalse($accessList['mail']);
|
$this->assertFalse($accessList['public']);
|
||||||
|
|
||||||
$u1->delete();
|
$u1->delete();
|
||||||
$u2->delete();
|
$u2->delete();
|
||||||
|
|
Loading…
Reference in New Issue