diff options
author | Sean Molenaar <SMillerDev@users.noreply.github.com> | 2018-07-04 08:54:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-04 08:54:08 +0200 |
commit | 53a43e9a9627536e8cbfe32896eee2f5a4f7e578 (patch) | |
tree | e7f1b0b6f4b76485201a8036da968702e81c757e /lib/Controller/FolderApiController.php | |
parent | 9e960afbd39f84101d67d36718436d66901f7363 (diff) | |
parent | 5c4185e22155687740e44d58c5c6bc9dc793cab7 (diff) |
Merge pull request #303 from David-Guillot/fix.adapt-to-new-login-flow
API: support new OC core login flow
Diffstat (limited to 'lib/Controller/FolderApiController.php')
-rw-r--r-- | lib/Controller/FolderApiController.php | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/Controller/FolderApiController.php b/lib/Controller/FolderApiController.php index b24ae9acb..348fefda6 100644 --- a/lib/Controller/FolderApiController.php +++ b/lib/Controller/FolderApiController.php @@ -7,13 +7,16 @@ * * @author Alessandro Cosentino <cosenal@gmail.com> * @author Bernhard Posselt <dev@bernhard-posselt.com> + * @author David Guillot <david@guillot.me> * @copyright 2012 Alessandro Cosentino * @copyright 2012-2014 Bernhard Posselt + * @copyright 2018 David Guillot */ namespace OCA\News\Controller; use \OCP\IRequest; +use \OCP\IUserSession; use \OCP\AppFramework\Http; use \OCA\News\Service\FolderService; @@ -30,19 +33,17 @@ class FolderApiController extends ApiController private $folderService; private $itemService; - private $userId; private $serializer; public function __construct($appName, IRequest $request, + IUserSession $userSession, FolderService $folderService, - ItemService $itemService, - $UserId + ItemService $itemService ) { - parent::__construct($appName, $request); + parent::__construct($appName, $request, $userSession); $this->folderService = $folderService; $this->itemService = $itemService; - $this->userId = $UserId; $this->serializer = new EntityApiSerializer('folders'); } @@ -55,7 +56,7 @@ class FolderApiController extends ApiController public function index() { return $this->serializer->serialize( - $this->folderService->findAll($this->userId) + $this->folderService->findAll($this->getUserId()) ); } @@ -71,9 +72,9 @@ class FolderApiController extends ApiController public function create($name) { try { - $this->folderService->purgeDeleted($this->userId, false); + $this->folderService->purgeDeleted($this->getUserId(), false); return $this->serializer->serialize( - $this->folderService->create($name, $this->userId) + $this->folderService->create($name, $this->getUserId()) ); } catch(ServiceValidationException $ex) { return $this->error($ex, Http::STATUS_UNPROCESSABLE_ENTITY); @@ -94,7 +95,7 @@ class FolderApiController extends ApiController public function delete($folderId) { try { - $this->folderService->delete($folderId, $this->userId); + $this->folderService->delete($folderId, $this->getUserId()); } catch(ServiceNotFoundException $ex) { return $this->error($ex, Http::STATUS_NOT_FOUND); } @@ -114,7 +115,7 @@ class FolderApiController extends ApiController public function update($folderId, $name) { try { - $this->folderService->rename($folderId, $name, $this->userId); + $this->folderService->rename($folderId, $name, $this->getUserId()); } catch(ServiceValidationException $ex) { return $this->error($ex, Http::STATUS_UNPROCESSABLE_ENTITY); @@ -138,7 +139,7 @@ class FolderApiController extends ApiController */ public function read($folderId, $newestItemId) { - $this->itemService->readFolder($folderId, $newestItemId, $this->userId); + $this->itemService->readFolder($folderId, $newestItemId, $this->getUserId()); } |