Skip to content
Snippets Groups Projects
Commit bc40a033 authored by Roeland Jago Douma's avatar Roeland Jago Douma Committed by GitHub
Browse files

Merge pull request #1250 from nextcloud/remote_ocs 

Move remote_shares OCS endpoint to AppFramework
parents 96d176d1 ba104233
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/files_sharing/appinfo/routes.php
+ 33
− 30
View file @ bc40a033
...@@ -77,6 +77,39 @@ $application->registerRoutes($this, [ ...@@ -77,6 +77,39 @@ $application->registerRoutes($this, [
'url' => '/api/v1/sharees', 'url' => '/api/v1/sharees',
'verb' => 'GET', 'verb' => 'GET',
], ],
/*
* Remote Shares
*/
[
'name' => 'Remote#getShares',
'url' => '/api/v1/remote_shares',
'verb' => 'GET',
],
[
'name' => 'Remote#getOpenShares',
'url' => '/api/v1/remote_shares/pending',
'verb' => 'GET',
],
[
'name' => 'Remote#acceptShare',
'url' => '/api/v1/remote_shares/pending/{id}',
'verb' => 'POST',
],
[
'name' => 'Remote#declineShare',
'url' => '/api/v1/remote_shares/pending/{id}',
'verb' => 'DELETE',
],
[
'name' => 'Remote#getShare',
'url' => '/api/v1/remote_shares/{id}',
'verb' => 'GET',
],
[
'name' => 'Remote#unshare',
'url' => '/api/v1/remote_shares/{id}',
'verb' => 'DELETE',
],
], ],
]); ]);
...@@ -96,33 +129,3 @@ $this->create('sharing_external_shareinfo', '/shareinfo') ...@@ -96,33 +129,3 @@ $this->create('sharing_external_shareinfo', '/shareinfo')
// OCS API // OCS API
//TODO: SET: mail notification, waiting for PR #4689 to be accepted //TODO: SET: mail notification, waiting for PR #4689 to be accepted
API::register('get',
'/apps/files_sharing/api/v1/remote_shares',
array('\OCA\Files_Sharing\API\Remote', 'getShares'),
'files_sharing');
API::register('get',
'/apps/files_sharing/api/v1/remote_shares/pending',
array('\OCA\Files_Sharing\API\Remote', 'getOpenShares'),
'files_sharing');
API::register('post',
'/apps/files_sharing/api/v1/remote_shares/pending/{id}',
array('\OCA\Files_Sharing\API\Remote', 'acceptShare'),
'files_sharing');
API::register('delete',
'/apps/files_sharing/api/v1/remote_shares/pending/{id}',
array('\OCA\Files_Sharing\API\Remote', 'declineShare'),
'files_sharing');
API::register('get',
'/apps/files_sharing/api/v1/remote_shares/{id}',
array('\OCA\Files_Sharing\API\Remote', 'getShare'),
'files_sharing');
API::register('delete',
'/apps/files_sharing/api/v1/remote_shares/{id}',
array('\OCA\Files_Sharing\API\Remote', 'unshare'),
'files_sharing');
apps/files_sharing/lib/AppInfo/Application.php
+ 1
− 0
View file @ bc40a033
...@@ -111,6 +111,7 @@ class Application extends App { ...@@ -111,6 +111,7 @@ class Application extends App {
$uid $uid
); );
}); });
$container->registerAlias('OCA\Files_Sharing\External\Manager', 'ExternalManager');
/** /**
* Middleware * Middleware
......
apps/files_sharing/lib/API/Remote.php → apps/files_sharing/lib/Controller/RemoteController.php
+ 183
− 0
View file @ bc40a033
...@@ -22,98 +22,86 @@ ...@@ -22,98 +22,86 @@
* *
*/ */
namespace OCA\Files_Sharing\API; namespace OCA\Files_Sharing\Controller;
use OC\Files\Filesystem;
use OCA\FederatedFileSharing\DiscoveryManager;
use OCA\Files_Sharing\External\Manager; use OCA\Files_Sharing\External\Manager;
use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCS\OCSForbiddenException;
use OCP\AppFramework\OCS\OCSNotFoundException;
use OCP\AppFramework\OCSController;
use OCP\IRequest;
class Remote { class RemoteController extends OCSController {
/** @var Manager */
private $externalManager;
/**
* @NoAdminRequired
*
* Remote constructor.
*
* @param string $appName
* @param IRequest $request
* @param Manager $externalManager
*/
public function __construct($appName,
IRequest $request,
Manager $externalManager) {
parent::__construct($appName, $request);
$this->externalManager = $externalManager;
}
/** /**
* @NoAdminRequired
*
* Get list of pending remote shares * Get list of pending remote shares
* *
* @param array $params empty * @return DataResponse
* @return \OC_OCS_Result
*/ */
public static function getOpenShares($params) { public function getOpenShares() {
$discoveryManager = new DiscoveryManager( return new DataResponse($this->externalManager->getOpenShares());
\OC::$server->getMemCacheFactory(),
\OC::$server->getHTTPClientService()
);
$externalManager = new Manager(
\OC::$server->getDatabaseConnection(),
Filesystem::getMountManager(),
Filesystem::getLoader(),
\OC::$server->getHTTPClientService(),
\OC::$server->getNotificationManager(),
$discoveryManager,
\OC_User::getUser()
);
return new \OC_OCS_Result($externalManager->getOpenShares());
} }
/** /**
* @NoAdminRequired
*
* Accept a remote share * Accept a remote share
* *
* @param array $params contains the shareID 'id' which should be accepted * @param int $id
* @return \OC_OCS_Result * @return DataResponse
* @throws OCSNotFoundException
*/ */
public static function acceptShare($params) { public function acceptShare($id) {
$discoveryManager = new DiscoveryManager( if ($this->externalManager->acceptShare($id)) {
\OC::$server->getMemCacheFactory(), return new DataResponse();
\OC::$server->getHTTPClientService()
);
$externalManager = new Manager(
\OC::$server->getDatabaseConnection(),
Filesystem::getMountManager(),
Filesystem::getLoader(),
\OC::$server->getHTTPClientService(),
\OC::$server->getNotificationManager(),
$discoveryManager,
\OC_User::getUser()
);
if ($externalManager->acceptShare((int) $params['id'])) {
return new \OC_OCS_Result();
} }
// Make sure the user has no notification for something that does not exist anymore. // Make sure the user has no notification for something that does not exist anymore.
$externalManager->processNotification((int) $params['id']); $this->externalManager->processNotification($id);
return new \OC_OCS_Result(null, 404, "wrong share ID, share doesn't exist."); throw new OCSNotFoundException('wrong share ID, share doesn\'t exist.');
} }
/** /**
* @NoAdminRequired
*
* Decline a remote share * Decline a remote share
* *
* @param array $params contains the shareID 'id' which should be declined * @param int $id
* @return \OC_OCS_Result * @return DataResponse
* @throws OCSNotFoundException
*/ */
public static function declineShare($params) { public function declineShare($id) {
$discoveryManager = new DiscoveryManager( if ($this->externalManager->declineShare($id)) {
\OC::$server->getMemCacheFactory(), return new DataResponse();
\OC::$server->getHTTPClientService()
);
$externalManager = new Manager(
\OC::$server->getDatabaseConnection(),
Filesystem::getMountManager(),
Filesystem::getLoader(),
\OC::$server->getHTTPClientService(),
\OC::$server->getNotificationManager(),
$discoveryManager,
\OC_User::getUser()
);
if ($externalManager->declineShare((int) $params['id'])) {
return new \OC_OCS_Result();
} }
// Make sure the user has no notification for something that does not exist anymore. // Make sure the user has no notification for something that does not exist anymore.
$externalManager->processNotification((int) $params['id']); $this->externalManager->processNotification($id);
return new \OC_OCS_Result(null, 404, "wrong share ID, share doesn't exist."); throw new OCSNotFoundException('wrong share ID, share doesn\'t exist.');
} }
/** /**
...@@ -125,7 +113,7 @@ class Remote { ...@@ -125,7 +113,7 @@ class Remote {
$info = $view->getFileInfo($share['mountpoint']); $info = $view->getFileInfo($share['mountpoint']);
$share['mimetype'] = $info->getMimetype(); $share['mimetype'] = $info->getMimetype();
$share['mtime'] = $info->getMtime(); $share['mtime'] = $info->getMTime();
$share['permissions'] = $info->getPermissions(); $share['permissions'] = $info->getPermissions();
$share['type'] = $info->getType(); $share['type'] = $info->getType();
$share['file_id'] = $info->getId(); $share['file_id'] = $info->getId();
...@@ -134,97 +122,62 @@ class Remote { ...@@ -134,97 +122,62 @@ class Remote {
} }
/** /**
* @NoAdminRequired
*
* List accepted remote shares * List accepted remote shares
* *
* @param array $params * @return DataResponse
* @return \OC_OCS_Result
*/ */
public static function getShares($params) { public function getShares() {
$discoveryManager = new DiscoveryManager( $shares = $this->externalManager->getAcceptedShares();
\OC::$server->getMemCacheFactory(),
\OC::$server->getHTTPClientService()
);
$externalManager = new Manager(
\OC::$server->getDatabaseConnection(),
Filesystem::getMountManager(),
Filesystem::getLoader(),
\OC::$server->getHTTPClientService(),
\OC::$server->getNotificationManager(),
$discoveryManager,
\OC_User::getUser()
);
$shares = $externalManager->getAcceptedShares();
$shares = array_map('self::extendShareInfo', $shares); $shares = array_map('self::extendShareInfo', $shares);
return new \OC_OCS_Result($shares); return new DataResponse($shares);
} }
/** /**
* @NoAdminRequired
*
* Get info of a remote share * Get info of a remote share
* *
* @param array $params contains the shareID 'id' * @param int $id
* @return \OC_OCS_Result * @return DataResponse
* @throws OCSNotFoundException
*/ */
public static function getShare($params) { public function getShare($id) {
$discoveryManager = new DiscoveryManager( $shareInfo = $this->externalManager->getShare($id);
\OC::$server->getMemCacheFactory(),
\OC::$server->getHTTPClientService()
);
$externalManager = new Manager(
\OC::$server->getDatabaseConnection(),
Filesystem::getMountManager(),
Filesystem::getLoader(),
\OC::$server->getHTTPClientService(),
\OC::$server->getNotificationManager(),
$discoveryManager,
\OC_User::getUser()
);
$shareInfo = $externalManager->getShare($params['id']);
if ($shareInfo === false) { if ($shareInfo === false) {
return new \OC_OCS_Result(null, 404, 'share does not exist'); throw new OCSNotFoundException('share does not exist');
} else { } else {
$shareInfo = self::extendShareInfo($shareInfo); $shareInfo = self::extendShareInfo($shareInfo);
return new \OC_OCS_Result($shareInfo); return new DataResponse($shareInfo);
} }
} }
/** /**
* @NoAdminRequired
*
* Unshare a remote share * Unshare a remote share
* *
* @param array $params contains the shareID 'id' which should be unshared * @param int $id
* @return \OC_OCS_Result * @return DataResponse
* @throws OCSNotFoundException
* @throws OCSForbiddenException
*/ */
public static function unshare($params) { public function unshare($id) {
$discoveryManager = new DiscoveryManager( $shareInfo = $this->externalManager->getShare($id);
\OC::$server->getMemCacheFactory(),
\OC::$server->getHTTPClientService()
);
$externalManager = new Manager(
\OC::$server->getDatabaseConnection(),
Filesystem::getMountManager(),
Filesystem::getLoader(),
\OC::$server->getHTTPClientService(),
\OC::$server->getNotificationManager(),
$discoveryManager,
\OC_User::getUser()
);
$shareInfo = $externalManager->getShare($params['id']);
if ($shareInfo === false) { if ($shareInfo === false) {
return new \OC_OCS_Result(null, 404, 'Share does not exist'); throw new OCSNotFoundException('Share does not exist');
} }
$mountPoint = '/' . \OC_User::getUser() . '/files' . $shareInfo['mountpoint']; $mountPoint = '/' . \OC_User::getUser() . '/files' . $shareInfo['mountpoint'];
if ($externalManager->removeShare($mountPoint) === true) { if ($this->externalManager->removeShare($mountPoint) === true) {
return new \OC_OCS_Result(null); return new DataResponse();
} else { } else {
return new \OC_OCS_Result(null, 403, 'Could not unshare'); throw new OCSForbiddenException('Could not unshare');
} }
} }
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment