Merge pull request #960 from nextcloud/enhancement/954/rest

REST API enhancements

lib/Controller/BoardApiController.php

@@ -40,7 +40,7 @@ use Sabre\HTTP\Util;
  */
 class BoardApiController extends ApiController {
 
-	private $service;
+	private $boardService;
 
 	/**
 	 * @param string $appName
@@ -50,7 +50,7 @@ class BoardApiController extends ApiController {
 	 */
 	public function __construct($appName, IRequest $request, BoardService $service, $userId) {
 		parent::__construct($appName, $request);
-		$this->service = $service;
+		$this->boardService = $service;
 		$this->userId = $userId;
 	}
 
@@ -62,16 +62,16 @@ class BoardApiController extends ApiController {
 	 * Return all of the boards that the current user has access to.
 	 * @throws StatusException
 	 */
-	public function index() {
+	public function index($details = null) {
 		$modified = $this->request->getHeader('If-Modified-Since');
 		if ($modified === null || $modified === '') {
-			$boards = $this->service->findAll();
+			$boards = $this->boardService->findAll(0, $details);
 		} else {
 			$date = Util::parseHTTPDate($modified);
 			if (!$date) {
 				throw new StatusException('Invalid If-Modified-Since header provided.');
 			}
-			$boards = $this->service->findAll($date->getTimestamp());
+			$boards = $this->boardService->findAll($date->getTimestamp(), $details);
 		}
 		return new DataResponse($boards, HTTP::STATUS_OK);
 	 }
@@ -85,7 +85,7 @@ class BoardApiController extends ApiController {
 	 * Return the board specified by $this->request->getParam('boardId').
 	 */
 	public function get() {
-		$board = $this->service->find($this->request->getParam('boardId'));
+		$board = $this->boardService->find($this->request->getParam('boardId'));
 		return new DataResponse($board, HTTP::STATUS_OK);
 	}
 
@@ -100,7 +100,7 @@ class BoardApiController extends ApiController {
 	 * Create a board with the specified title and color.
 	 */
 	public function create($title, $color) {
-		$board = $this->service->create($title, $this->userId, $color);
+		$board = $this->boardService->create($title, $this->userId, $color);
 		return new DataResponse($board, HTTP::STATUS_OK);
 	}
 
@@ -116,7 +116,7 @@ class BoardApiController extends ApiController {
 	 * Update a board with the specified boardId, title and color, and archived state.
 	 */
 	public function update($title, $color, $archived = false) {
-		$board = $this->service->update($this->request->getParam('boardId'), $title, $color, $archived);
+		$board = $this->boardService->update($this->request->getParam('boardId'), $title, $color, $archived);
 		return new DataResponse($board, HTTP::STATUS_OK);
 	}
 
@@ -129,7 +129,7 @@ class BoardApiController extends ApiController {
 	 * Delete the board specified by $boardId.  Return the board that was deleted.
 	 */
 	public function delete() {
-		$board = $this->service->delete($this->request->getParam('boardId'));
+		$board = $this->boardService->delete($this->request->getParam('boardId'));
 		return new DataResponse($board, HTTP::STATUS_OK);
 	}
 
@@ -142,8 +142,38 @@ class BoardApiController extends ApiController {
 	 * Undo the deletion of the board specified by $boardId.
 	 */
 	public function undoDelete() {
-		$board = $this->service->deleteUndo($this->request->getParam('boardId'));
+		$board = $this->boardService->deleteUndo($this->request->getParam('boardId'));
 		return new DataResponse($board, HTTP::STATUS_OK);
 	}
 
+	/**
+	 * @NoAdminRequired
+	 * @CORS
+	 * @NoCSRFRequired
+	 */
+	public function addAcl($boardId, $type, $participant, $permissionEdit, $permissionShare, $permissionManage) {
+		$acl = $this->boardService->addAcl($boardId, $type, $participant, $permissionEdit, $permissionShare, $permissionManage);
+		return new DataResponse($acl, HTTP::STATUS_OK);
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @CORS
+	 * @NoCSRFRequired
+	 */
+	public function updateAcl($aclId, $permissionEdit, $permissionShare, $permissionManage) {
+		$acl = $this->boardService->updateAcl($aclId, $permissionEdit, $permissionShare, $permissionManage);
+		return new DataResponse($acl, HTTP::STATUS_OK);
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @CORS
+	 * @NoCSRFRequired
+	 */
+	public function deleteAcl($aclId) {
+		$acl = $this->boardService->deleteAcl($aclId);
+		return new DataResponse($acl, HTTP::STATUS_OK);
+	}
+
 }

lib/Service/BoardService.php

@@ -94,7 +94,7 @@ class BoardService {
 	/**
 	 * @return array
 	 */
-	public function findAll($since = 0) {
+	public function findAll($since = 0, $details = null) {
 		$userInfo = $this->getBoardPrerequisites();
 		$userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null, $since);
 		$groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null,  $since);
@@ -110,7 +110,11 @@ class BoardService {
 						$this->boardMapper->mapAcl($acl);
 					}
 				}
-				$this->enrichWithStacks($item);
+				if ($details !== null) {
+					$this->enrichWithStacks($item);
+					$this->enrichWithLabels($item);
+					$this->enrichWithUsers($item);
+				}
 				$permissions = $this->permissionService->matchPermissions($item);
 				$item->setPermissions([
 					'PERMISSION_READ' => $permissions[Acl::PERMISSION_READ],
@@ -154,8 +158,7 @@ class BoardService {
 			'PERMISSION_MANAGE' => $permissions[Acl::PERMISSION_MANAGE],
 			'PERMISSION_SHARE' => $permissions[Acl::PERMISSION_SHARE]
 		]);
-		$boardUsers = $this->permissionService->findUsers($boardId);
-		$board->setUsers(array_values($boardUsers));
+		$this->enrichWithUsers($board);
 		return $board;
 	}
 
@@ -558,4 +561,22 @@ class BoardService {
 		$board->setStacks($stacks);
 	}
 
+	private function enrichWithLabels($board, $since = -1) {
+		$labels = $this->labelMapper->findAll($board->getId(), null, null, $since);
+
+		if(\count($labels) === 0) {
+			return;
+		}
+
+		$board->setLabels($labels);
+	}
+
+	private function enrichWithUsers($board, $since = -1) {
+		$boardUsers = $this->permissionService->findUsers($board->getId());
+		if(\count($boardUsers) === 0) {
+			return;
+		}
+		$board->setUsers(array_values($boardUsers));
+	}
+
 }