nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2024-09-20 14:56:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added capability on the api revisions endpoint to get shared item revisions by target user

Browse source
This commit is contained in:
Marcos Zuriaga 2016-10-05 18:47:25 +02:00
parent 5ff5414f2c
commit 77587e5598
No known key found for this signature in database
GPG key ID: 7D15585354D072FF
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appinfo/routes.php
View file

@ -39,7 +39,7 @@ return [
['name' => 'credential#deleteCredential', 'url' => '/api/v2/credentials/{credential_id}', 'verb' => 'DELETE'],
//Revisions
['name' => 'credential#getRevision', 'url' => '/api/v2/credentials/{credential_id}/revision', 'verb' => 'GET'],
['name' => 'credential#getRevision', 'url' => '/api/v2/credentials/{credential_guid}/revision', 'verb' => 'GET'],
['name' => 'credential#deleteRevision', 'url' => '/api/v2/credentials/{credential_id}/revision/{revision_id}', 'verb' => 'DELETE'],
['name' => 'credential#updateRevision', 'url' => '/api/v2/credentials/{credential_id}/revision/{revision_id}', 'verb' => 'PATCH'],

28
controller/credentialcontroller.php
View file

@ -13,6 +13,7 @@ namespace OCA\Passman\Controller;
use OCA\Files_External\NotFoundException;
use OCA\Passman\Db\SharingACL;
use OCA\Passman\Utility\NotFoundJSONResponse;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
@ -24,6 +25,7 @@ use OCA\Passman\Activity;
use OCA\Passman\Service\ActivityService;
use OCA\Passman\Service\CredentialRevisionService;
use OCA\Passman\Service\ShareService;
use OCP\IUser;
class CredentialController extends ApiController {
private $userId;
@ -34,7 +36,7 @@ class CredentialController extends ApiController {
public function __construct($AppName,
IRequest $request,
$UserId,
IUser $UserId,
CredentialService $credentialService,
ActivityService $activityService,
CredentialRevisionService $credentialRevisionService,
@ -244,8 +246,28 @@ class CredentialController extends ApiController {
/**
* @NoAdminRequired
*/
public function getRevision($credential_id) {
$result = $this->credentialRevisionService->getRevisions($credential_id, $this->userId);
public function getRevision($credential_guid) {
try {
$credential = $this->credentialService->getCredentialByGUID($credential_guid);
}
catch (DoesNotExistException $ex){
return new NotFoundJSONResponse();
}
// If the request was made by the owner of the credential
if ($this->userId->getUID() == $credential->getUserId()) {
$result = $this->credentialRevisionService->getRevisions($credential->getId(), $this->userId);
}
else {
$acl = $this->sharingService->getACL($this->userId->getUID(), $credential_guid);
if ($acl->hasPermission(SharingACL::HISTORY)){
$result = $this->credentialRevisionService->getRevisions($credential->getId());
}
else {
return new NotFoundJSONResponse();
}
}
return new JSONResponse($result);
}