sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23155 from owncloud/fed-unshare-with 

Specify the target user when unsharing a federated share
remotes/origin/files-consistentpermsformountpoint
Thomas Müller 2016-03-16 11:19:09 +07:00
parent 631ae2f0f4 7d42bdfde0
commit 225eebd8f9
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_sharing/api/server2server.php
Unescape Escape View File

@ -178,7 +178,7 @@ class Server2Server {
if ($share) {
// userId must be set to the user who unshares
\OCP\Share::unshare($share['item_type'], $share['item_source'], $share['share_type'], null, $share['uid_owner']);
\OCP\Share::unshare($share['item_type'], $share['item_source'], $share['share_type'], $share['share_with'], $share['uid_owner']);
list($file, $link) = $this->getFile($share['uid_owner'], $share['file_source']);

32
apps/files_sharing/tests/server2server.php
Unescape Escape View File

@ -147,6 +147,38 @@ class Test_Files_Sharing_S2S_OCS_API extends TestCase {
$this->assertEmpty($data);
}
function testDeclineShareMultiple() {
$dummy = \OCP\DB::prepare('
INSERT INTO `*PREFIX*share`
(`share_type`, `uid_owner`, `item_type`, `item_source`, `item_target`, `file_source`, `file_target`, `permissions`, `stime`, `token`, `share_with`)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
');
$dummy->execute(array(\OCP\Share::SHARE_TYPE_REMOTE, self::TEST_FILES_SHARING_API_USER1, 'test', '1', '/1', '1', '/test.txt', '1', time(), 'token1', 'foo@bar'));
$dummy->execute(array(\OCP\Share::SHARE_TYPE_REMOTE, self::TEST_FILES_SHARING_API_USER1, 'test', '1', '/1', '1', '/test.txt', '1', time(), 'token2', 'bar@bar'));
$verify = \OCP\DB::prepare('SELECT * FROM `*PREFIX*share`');
$result = $verify->execute();
$data = $result->fetchAll();
$this->assertCount(2, $data);
$_POST['token'] = 'token1';
$this->s2s->declineShare(array('id' => $data[0]['id']));
$verify = \OCP\DB::prepare('SELECT * FROM `*PREFIX*share`');
$result = $verify->execute();
$data = $result->fetchAll();
$this->assertCount(1, $data);
$this->assertEquals('bar@bar', $data[0]['share_with']);
$_POST['token'] = 'token2';
$this->s2s->declineShare(array('id' => $data[0]['id']));
$verify = \OCP\DB::prepare('SELECT * FROM `*PREFIX*share`');
$result = $verify->execute();
$data = $result->fetchAll();
$this->assertEmpty($data);
}
/**
* @dataProvider dataTestDeleteUser
*/