Skip to content

Shares are displayed to users with resharing rights #12105

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
rullzer merged 10 commits into from
Nov 4, 2018
Merged

Shares are displayed to users with resharing rights #12105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
68c44bb
shares are displayed to users with resharing rights
ArtificialOwl Oct 29, 2018
72ad2d6
display shares to circles moderator
ArtificialOwl Oct 30, 2018
275cea5
limit to circles moderator
ArtificialOwl Oct 30, 2018
b73e037
Show share settings for owner and reshare owners only
juliusknorr Oct 30, 2018
59377db
Remove reshare owner entry from the share list
juliusknorr Oct 30, 2018
2804f3a
Add uid_owner to enable permission settings on the views
juliusknorr Oct 31, 2018
2a17811
Use property to check if a share entry is shared with the current user
juliusknorr Oct 31, 2018
236a293
check parents resharing rights
ArtificialOwl Nov 1, 2018
0fc8a0f
user can have his resharing rights revoked, yet seeing created shares
ArtificialOwl Nov 1, 2018
77b95cc
revert tests
ArtificialOwl Nov 1, 2018
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
revert tests 
Signed-off-by: Maxence Lange <[email protected]>
  • Loading branch information
@ArtificialOwl @juliusknorr
ArtificialOwl authored and juliusknorr committed Nov 2, 2018
commit 77b95ccd12bb946cba96486d859b8241649868ca
10 changes: 4 additions & 6 deletions apps/files_sharing/tests/ApiTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,21 +811,19 @@ function testGetShareMultipleSharedFolder() {
$result1 = $ocs->getShares('false','false','false', $this->subfolder);
$ocs->cleanup();

// // test should return 2 shares within $this->folder, as the viewer have resharing rights:
// // one from the owner, the second from the reshare
// test should return one share within $this->folder
$data1 = $result1->getData();
$this->assertCount(2, $data1);
$this->assertCount(1, $data1);
$s1 = reset($data1);

//$request = $this->createRequest(['path' => $this->folder.$this->subfolder]);
$ocs = $this->createOCS(self::TEST_FILES_SHARING_API_USER2);
$result2 = $ocs->getShares('false', 'false', 'false', $this->folder . $this->subfolder);
$ocs->cleanup();

// // test should return 2 shares within $this->folder, as the viewer have resharing rights:
// // one from the owner, the second from the reshare
// test should return one share within $this->folder
$data2 = $result2->getData();
$this->assertCount(2, $data2);
$this->assertCount(1, $data2);
$s2 = reset($data2);

$this->assertEquals($this->subfolder, $s1['path']);
Expand Down
12 changes: 7 additions & 5 deletions lib/private/Share20/DefaultShareProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,18 +617,20 @@ public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offs
/**
* Reshares for this user are shares where they are the owner.
*/
if ($node === null) {
if ($reshares === false) {
$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
} else {
if ($reshares === false) {
$qb->andWhere($qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId)));
} else {
if ($node === null) {
$qb->andWhere(
$qb->expr()->orX(
$qb->expr()->eq('uid_owner', $qb->createNamedParameter($userId)),
$qb->expr()->eq('uid_initiator', $qb->createNamedParameter($userId))
)
);
}
} else {
}

if ($node !== null) {
$qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
}

Expand Down