Skip to content

Access list to share manager #2834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 29 commits into from
Apr 15, 2017
Merged

Access list to share manager #2834

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
d84df15
Add getAccessList to ShareManager
rullzer Sep 9, 2016
7dcc98e
Add owner to access list
rullzer Sep 9, 2016
88299ec
Added to public interface
rullzer Oct 19, 2016
a1edcc8
Port Encryption/file to new getAccessList
rullzer Oct 19, 2016
553b3b2
Fix tests
rullzer Oct 27, 2016
97f8ca6
Added ShareHelper
rullzer Oct 27, 2016
2cbac33
Offload acceslist creation to providers
rullzer Dec 22, 2016
12afd7d
Add mail element to access list
rullzer Jan 4, 2017
4437e00
Add shareHelper test
rullzer Jan 4, 2017
0c2dc3b
Fix comments
rullzer Mar 20, 2017
91e6507
Return the paths for the users without setting them all up
nickvergessen Mar 27, 2017
cf7c320
Also return the token
nickvergessen Mar 27, 2017
4bcb7d8
Return the token as well
nickvergessen Mar 28, 2017
3c1365c
Fix returned paths for remote shares
nickvergessen Mar 28, 2017
5df727d
Fix federated file sharing
nickvergessen Apr 10, 2017
2fcf334
Fix tests for ShareHelper
nickvergessen Apr 10, 2017
5b57bb9
Fix default share provider
nickvergessen Apr 10, 2017
4eeb194
Fix share manager test
nickvergessen Apr 10, 2017
6c23a5f
Add unit tests for sharebymail provider
nickvergessen Apr 11, 2017
629b7c0
Adjust docs and make !$currentAccess simpler
nickvergessen Apr 11, 2017
7d416ac
Activate the test
nickvergessen Apr 11, 2017
29f2088
Catch exceptions and use as many results as possible
nickvergessen Apr 11, 2017
e1d54e3
Add more tests for the share helper
nickvergessen Apr 11, 2017
f57ef55
Add samples to the docs
nickvergessen Apr 11, 2017
b96297e
Do not set full path if not currentAccess
rullzer Apr 13, 2017
aef95b9
Not needed in the DIContainer anymore
rullzer Apr 13, 2017
0f56823
Fix server container registration
rullzer Apr 13, 2017
6a519ab
Update autoloader
rullzer Apr 13, 2017
cab4111
Mail shares trigger the public key
rullzer Apr 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Mail shares trigger the public key 
Signed-off-by: Roeland Jago Douma <[email protected]>
  • Loading branch information
@rullzer
rullzer committed Apr 13, 2017
commit cab41118f67e6a4743bac2cfcfa69a4bee28f2a3
2 changes: 1 addition & 1 deletion apps/sharebymail/lib/ShareByMailProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ public function getAccessList($nodes, $currentAccess) {
$mail = $cursor->fetch() !== false;
$cursor->closeCursor();

return ['mail' => $mail];
return ['public' => $mail];
}

}
32 changes: 16 additions & 16 deletions apps/sharebymail/tests/ShareByMailProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('[email protected]')
Expand All @@ -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();
Expand Down