summaryrefslogtreecommitdiffstats
path: root/core/Controller
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2018-10-17 20:03:44 +0200
committerJulius Härtl <jus@bitgrid.net>2019-03-01 20:56:15 +0100
commit136d2c39ac72f837a3ea9a3f698be963fefb69a3 (patch)
tree5b6f44f7a8e49a23533060fd50c0bbeccd292ba2 /core/Controller
parent65a9ab47ea233701b559d08d89e36649a3d5a30b (diff)
downloadnextcloud-server-136d2c39ac72f837a3ea9a3f698be963fefb69a3.tar.gz
nextcloud-server-136d2c39ac72f837a3ea9a3f698be963fefb69a3.zip
Provider functionality
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'core/Controller')
-rw-r--r--core/Controller/CollaborationResourcesController.php21
1 files changed, 16 insertions, 5 deletions
diff --git a/core/Controller/CollaborationResourcesController.php b/core/Controller/CollaborationResourcesController.php
index b56d67d8454..bd8c8442ae5 100644
--- a/core/Controller/CollaborationResourcesController.php
+++ b/core/Controller/CollaborationResourcesController.php
@@ -31,19 +31,26 @@ use OCP\Collaboration\Resources\IManager;
use OCP\Collaboration\Resources\IResource;
use OCP\Collaboration\Resources\ResourceException;
use OCP\IRequest;
+use OCP\IUserSession;
class CollaborationResourcesController extends OCSController {
+
/** @var IManager */
private $manager;
+ /** @var IUserSession */
+ private $userSession;
+
public function __construct(
- $appName,
+ string $appName,
IRequest $request,
- IManager $manager
+ IManager $manager,
+ IUserSession $userSession
) {
parent::__construct($appName, $request);
$this->manager = $manager;
+ $this->userSession = $userSession;
}
/**
@@ -54,7 +61,7 @@ class CollaborationResourcesController extends OCSController {
protected function getCollection(int $collectionId): ICollection {
$collection = $this->manager->getCollection($collectionId);
- if (false) { // TODO auth checking
+ if (!$collection->canAccess($this->userSession->getUser())) {
throw new CollectionException('Not found');
}
@@ -141,12 +148,15 @@ class CollaborationResourcesController extends OCSController {
*/
public function getCollectionsByResource(string $resourceType, string $resourceId): DataResponse {
try {
- // TODO auth checking
$resource = $this->manager->getResource($resourceType, $resourceId);
} catch (CollectionException $e) {
return new DataResponse([], Http::STATUS_NOT_FOUND);
}
+ if (!$resource->canAccess($this->userSession->getUser())) {
+ return new DataResponse([], Http::STATUS_NOT_FOUND);
+ }
+
return new DataResponse(array_map([$this, 'prepareCollection'], $resource->getCollections()));
}
@@ -157,7 +167,8 @@ class CollaborationResourcesController extends OCSController {
protected function prepareResources(IResource $resource): array {
return [
'type' => $resource->getType(),
- 'id' => $resource->getId()
+ 'id' => $resource->getId(),
+ 'name' => $resource->getName(),
];
}
}