summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/api/ocssharewrapper.php13
-rw-r--r--apps/files_sharing/api/share20ocs.php73
-rw-r--r--apps/files_sharing/tests/api/share20ocstest.php113
3 files changed, 196 insertions, 3 deletions
diff --git a/apps/files_sharing/api/ocssharewrapper.php b/apps/files_sharing/api/ocssharewrapper.php
index 14fc995cda5..8c0d8f7d150 100644
--- a/apps/files_sharing/api/ocssharewrapper.php
+++ b/apps/files_sharing/api/ocssharewrapper.php
@@ -22,8 +22,11 @@ namespace OCA\Files_Sharing\API;
class OCSShareWrapper {
+ /**
+ * @return Share20OCS
+ */
private function getShare20OCS() {
- return new share20OCS(new \OC\Share20\Manager(
+ return new Share20OCS(new \OC\Share20\Manager(
\OC::$server->getUserSession()->getUser(),
\OC::$server->getUserManager(),
\OC::$server->getGroupManager(),
@@ -31,7 +34,10 @@ class OCSShareWrapper {
\OC::$server->getAppConfig(),
\OC::$server->getUserFolder(),
new \OC\Share20\DefaultShareProvider(
- \OC::$server->getDatabaseConnection()
+ \OC::$server->getDatabaseConnection(),
+ \OC::$server->getUserManager(),
+ \OC::$server->getGroupManager(),
+ \OC::$server->getUserFolder()
)
),
\OC::$server->getGroupManager(),
@@ -57,6 +63,7 @@ class OCSShareWrapper {
}
public function deleteShare($params) {
- return \OCA\Files_Sharing\API\Local::deleteShare($params);
+ $id = (int)$params['id'];
+ return $this->getShare20OCS()->deleteShare($id);
}
}
diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/api/share20ocs.php
new file mode 100644
index 00000000000..aeeb3ee25b3
--- /dev/null
+++ b/apps/files_sharing/api/share20ocs.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+namespace OCA\Files_Sharing\API;
+
+class Share20OCS {
+
+ /** @var OC\Share20\Manager */
+ private $shareManager;
+
+ /** @var OCP\IGroupManager */
+ private $groupManager;
+
+ /** @var OCP\IUserManager */
+ private $userManager;
+
+ /** @var OCP\IRequest */
+ private $request;
+
+ /** @var OCP\Files\Folder */
+ private $userFolder;
+
+ public function __construct(\OC\Share20\Manager $shareManager,
+ \OCP\IGroupManager $groupManager,
+ \OCP\IUserManager $userManager,
+ \OCP\IRequest $request,
+ \OCP\Files\Folder $userFolder) {
+ $this->shareManager = $shareManager;
+ $this->userManager = $userManager;
+ $this->groupManager = $groupManager;
+ $this->request = $request;
+ $this->userFolder = $userFolder;
+ }
+
+ /**
+ * Delete a share
+ *
+ * @param int $id
+ * @return \OC_OCS_Result
+ */
+ public function deleteShare($id) {
+ try {
+ $share = $this->shareManager->getShareById($id);
+ } catch (\OC\Share20\Exception\ShareNotFound $e) {
+ return new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.');
+ }
+
+ try {
+ $this->shareManager->deleteShare($share);
+ } catch (\OC\Share20\Exception\BackendError $e) {
+ return new \OC_OCS_Result(null, 404, 'could not delete share');
+ }
+
+ return new \OC_OCS_Result();
+ }
+}
diff --git a/apps/files_sharing/tests/api/share20ocstest.php b/apps/files_sharing/tests/api/share20ocstest.php
new file mode 100644
index 00000000000..9c4377a2a7f
--- /dev/null
+++ b/apps/files_sharing/tests/api/share20ocstest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * @author Roeland Jago Douma <rullzer@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, ownCloud, Inc.
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+namespace OCA\Files_Sharing\Tests\API;
+
+use OCA\Files_Sharing\API\Share20OCS;
+
+class Share20OCSTest extends \Test\TestCase {
+
+ /** @var OC\Share20\Manager */
+ private $shareManager;
+
+ /** @var OCP\IGroupManager */
+ private $groupManager;
+
+ /** @var OCP\IUserManager */
+ private $userManager;
+
+ /** @var OCP\IRequest */
+ private $request;
+
+ /** @var OCP\Files\Folder */
+ private $userFolder;
+
+ /** @var OCS */
+ private $ocs;
+
+ protected function setUp() {
+ $this->shareManager = $this->getMockBuilder('OC\Share20\Manager')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->groupManager = $this->getMockBuilder('OCP\IGroupManager')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->userManager = $this->getMockBuilder('OCP\IUserManager')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->request = $this->getMockBuilder('OCP\IRequest')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->userFolder = $this->getMockBuilder('OCP\Files\Folder')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->ocs = new Share20OCS($this->shareManager,
+ $this->groupManager,
+ $this->userManager,
+ $this->request,
+ $this->userFolder);
+ }
+
+ public function testDeleteShareShareNotFound() {
+ $this->shareManager
+ ->expects($this->once())
+ ->method('getShareById')
+ ->with(42)
+ ->will($this->throwException(new \OC\Share20\Exception\ShareNotFound()));
+
+ $expected = new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.');
+ $this->assertEquals($expected, $this->ocs->deleteShare(42));
+ }
+
+ public function testDeleteShareCouldNotDelete() {
+ $share = $this->getMock('OC\Share20\IShare');
+ $this->shareManager
+ ->expects($this->once())
+ ->method('getShareById')
+ ->with(42)
+ ->willReturn($share);
+ $this->shareManager
+ ->expects($this->once())
+ ->method('deleteShare')
+ ->with($share)
+ ->will($this->throwException(new \OC\Share20\Exception\BackendError()));
+
+
+ $expected = new \OC_OCS_Result(null, 404, 'could not delete share');
+ $this->assertEquals($expected, $this->ocs->deleteShare(42));
+ }
+
+ public function testDeleteShare() {
+ $share = $this->getMock('OC\Share20\IShare');
+ $this->shareManager
+ ->expects($this->once())
+ ->method('getShareById')
+ ->with(42)
+ ->willReturn($share);
+ $this->shareManager
+ ->expects($this->once())
+ ->method('deleteShare')
+ ->with($share);
+
+ $expected = new \OC_OCS_Result();
+ $this->assertEquals($expected, $this->ocs->deleteShare(42));
+ }
+}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 12:59:53 +0000