Update OCS Share API to use federated share provider

diff --git a/apps/files_sharing/api/share20ocs.php b/apps/files_sharing/api/share20ocs.php
index c03243d1d412fcabfb9e40ff7a952ad271682b8a..331c6d9e780c481bbb7ba1eaa5e7681e80574e80 100644 (file)
--- a/apps/files_sharing/api/share20ocs.php
+++ b/apps/files_sharing/api/share20ocs.php
@@ -26,6 +26,7 @@ use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\Files\IRootFolder;
+use OCP\Share;
 use OCP\Share\IManager;
 
 use OCP\Share\Exceptions\ShareNotFound;
@@ -164,8 +165,11 @@ class Share20OCS {
                }
 
                if ($share === null) {
-                       //For now federated shares are handled by the old endpoint.
-                       return \OCA\Files_Sharing\API\Local::getShare(['id' => $id]);
+                       try {
+                               $share = $this->shareManager->getShareById('ocFederatedSharing:' . $id);
+                       } catch (ShareNotFound $e) {
+                               return new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.');
+                       }
                }
 
                if ($this->canAccessShare($share)) {
@@ -195,7 +199,11 @@ class Share20OCS {
 
                // Could not find the share as internal share... maybe it is a federated share
                if ($share === null) {
-                       return \OCA\Files_Sharing\API\Local::deleteShare(['id' => $id]);
+                       try {
+                               $share = $this->shareManager->getShareById('ocFederatedSharing:' . $id);
+                       } catch (ShareNotFound $e) {
+                               return new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.');
+                       }
                }
 
                if (!$this->canAccessShare($share)) {
@@ -313,8 +321,8 @@ class Share20OCS {
                        }
 
                } else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
-                       //fixme Remote shares are handled by old code path for now
-                       return \OCA\Files_Sharing\API\Local::createShare([]);
+                       $share->setSharedWith($shareWith);
+                       $share->setPermissions($permissions);
                } else {
                        return new \OC_OCS_Result(null, 400, "unknown share type");
                }
@@ -368,11 +376,10 @@ class Share20OCS {
                /** @var \OCP\Share\IShare[] $shares */
                $shares = [];
                foreach ($nodes as $node) {
-                       $shares  = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_USER, $node, false, -1, 0));
+                       $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_USER, $node, false, -1, 0));
                        $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_GROUP, $node, false, -1, 0));
-                       $shares  = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_LINK, $node, false, -1, 0));
-                       //TODO: Add federated shares
-
+                       $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_LINK, $node, false, -1, 0));
+                       $shares = array_merge($shares, $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_REMOTE, $node, false, -1, 0));
                }
 
                $formatted = [];
@@ -427,9 +434,9 @@ class Share20OCS {
                $userShares = $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_USER, $path, $reshares, -1, 0);
                $groupShares = $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_GROUP, $path, $reshares, -1, 0);
                $linkShares = $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_LINK, $path, $reshares, -1, 0);
-               //TODO: Add federated shares
+               $federatedShares = $this->shareManager->getSharesBy($this->currentUser->getUID(), \OCP\Share::SHARE_TYPE_REMOTE, $path, $reshares, -1, 0);
 
-               $shares = array_merge($userShares, $groupShares, $linkShares);
+               $shares = array_merge($userShares, $groupShares, $linkShares, $federatedShares);
 
                $formatted = [];
                foreach ($shares as $share) {
@@ -456,7 +463,11 @@ class Share20OCS {
 
                // Could not find the share as internal share... maybe it is a federated share
                if ($share === null) {
-                       return \OCA\Files_Sharing\API\Local::updateShare(['id' => $id]);
+                       try {
+                               $share = $this->shareManager->getShareById('ocFederatedSharing:' . $id);
+                       } catch (ShareNotFound $e) {
+                               return new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.');
+                       }
                }
 
                if (!$this->canAccessShare($share)) {

diff --git a/apps/files_sharing/tests/api/share20ocstest.php b/apps/files_sharing/tests/api/share20ocstest.php
index 97abdca7ac3cedf29feb10b2d9a433959784d977..e6a78134734b7e494ebbef684d366bc6e625054c 100644 (file)
--- a/apps/files_sharing/tests/api/share20ocstest.php
+++ b/apps/files_sharing/tests/api/share20ocstest.php
@@ -97,10 +97,15 @@ class Share20OCSTest extends \Test\TestCase {
 
        public function testDeleteShareShareNotFound() {
                $this->shareManager
-                       ->expects($this->once())
+                       ->expects($this->exactly(2))
                        ->method('getShareById')
-                       ->with('ocinternal:42')
-                       ->will($this->throwException(new \OCP\Share\Exceptions\ShareNotFound()));
+                       ->will($this->returnCallback(function($id) {
+                               if ($id === 'ocinternal:42' || $id === 'ocFederatedSharing:42') {
+                                       throw new \OCP\Share\Exceptions\ShareNotFound();
+                               } else {
+                                       throw new \Exception();
+                               }
+                       }));
 
                $expected = new \OC_OCS_Result(null, 404, 'wrong share ID, share doesn\'t exist.');
                $this->assertEquals($expected, $this->ocs->deleteShare(42));