wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5823 from nextcloud/improve-error-handling

Browse source 
Improve error handling for accepting federated shares
This commit is contained in:
Morris Jobke 2017-07-21 22:54:14 +02:00 committed by GitHub
commit 50fc5a1e25
3 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/federatedfilesharing/lib/Controller/RequestHandlerController.php
View file

@ -194,12 +194,12 @@ class RequestHandlerController extends OCSController {
$declineAction = $notification->createAction();
$declineAction->setLabel('decline')
->setLink($urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'DELETE');
->setLink($urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'DELETE');
$notification->addAction($declineAction);
$acceptAction = $notification->createAction();
$acceptAction->setLabel('accept')
->setLink($urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'POST');
->setLink($urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'POST');
$notification->addAction($acceptAction);
$notificationManager->notify($notification);

12
apps/files_sharing/lib/Controller/RemoteController.php
View file

@ -29,6 +29,7 @@ use OCP\AppFramework\Http\DataResponse;
use OCP\AppFramework\OCS\OCSForbiddenException;
use OCP\AppFramework\OCS\OCSNotFoundException;
use OCP\AppFramework\OCSController;
use OCP\ILogger;
use OCP\IRequest;
class RemoteController extends OCSController {
@ -36,6 +37,9 @@ class RemoteController extends OCSController {
/** @var Manager */
private $externalManager;
/** @var ILogger */
private $logger;
/**
* @NoAdminRequired
*
@ -47,10 +51,12 @@ class RemoteController extends OCSController {
*/
public function __construct($appName,
IRequest $request,
Manager $externalManager) {
Manager $externalManager,
ILogger $logger) {
parent::__construct($appName, $request);
$this->externalManager = $externalManager;
$this->logger = $logger;
}
/**
@ -78,8 +84,8 @@ class RemoteController extends OCSController {
return new DataResponse();
}
// Make sure the user has no notification for something that does not exist anymore.
$this->externalManager->processNotification($id);
$this->logger->error('Could not accept federated share with id: ' . $id,
['app' => 'files_sharing']);
throw new OCSNotFoundException('wrong share ID, share doesn\'t exist.');
}

19
apps/files_sharing/lib/External/Manager.php vendored
View file

@ -197,6 +197,7 @@ class Manager {
public function acceptShare($id) {
$share = $this->getShare($id);
$result = false;
if ($share) {
\OC_Util::setupFS($this->uid);
@ -211,16 +212,18 @@ class Manager {
`mountpoint` = ?,
`mountpoint_hash` = ?
WHERE `id` = ? AND `user` = ?');
$acceptShare->execute(array(1, $mountPoint, $hash, $id, $this->uid));
$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'accept');
\OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $share['remote']]);
$this->processNotification($id);
return true;
$updated = $acceptShare->execute(array(1, $mountPoint, $hash, $id, $this->uid));
if ($updated === true) {
$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'accept');
\OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $share['remote']]);
$result = true;
}
}
return false;
// Make sure the user has no notification for something that does not exist anymore.
$this->processNotification($id);
return $result;
}
/**