diff --git a/lib/Controller/BoardApiController.php b/lib/Controller/BoardApiController.php index 5222068d7..312590541 100644 --- a/lib/Controller/BoardApiController.php +++ b/lib/Controller/BoardApiController.php @@ -39,23 +39,17 @@ use OCA\Deck\Service\BoardService; class BoardApiController extends ApiController { private $service; - private $userInfo; /** * @param string $appName * @param IRequest $request - * @param IUserManager $userManager - * @param IGroupManager $groupManager * @param BoardService $service * @param $userId */ - public function __construct($appName, IRequest $request, IUserManager $userManager, IGroupManager $groupManager, BoardService $service, $userId) { + public function __construct($appName, IRequest $request, BoardService $service, $userId) { parent::__construct($appName, $request); $this->service = $service; $this->userId = $userId; - $this->userManager = $userManager; - $this->groupManager = $groupManager; - $this->userInfo = $this->service->getBoardPrerequisites(); } /** @@ -66,7 +60,7 @@ class BoardApiController extends ApiController { * Return all of the boards that the current user has access to. */ public function index() { - $boards = $this->service->findAll($this->userInfo); + $boards = $this->service->findAll(); return new DataResponse($boards); } diff --git a/lib/Controller/BoardController.php b/lib/Controller/BoardController.php index d447f849e..1d9eb28f7 100644 --- a/lib/Controller/BoardController.php +++ b/lib/Controller/BoardController.php @@ -38,7 +38,6 @@ class BoardController extends ApiController { private $userManager; private $groupManager; private $permissionService; - private $userInfo; public function __construct($appName, IRequest $request, IUserManager $userManager, IGroupManager $groupManager, BoardService $boardService, PermissionService $permissionService, $userId) { parent::__construct($appName, $request); @@ -47,14 +46,13 @@ class BoardController extends ApiController { $this->groupManager = $groupManager; $this->boardService = $boardService; $this->permissionService = $permissionService; - $this->userInfo = $this->boardSerivce->getBoardPrerequisites(); } /** * @NoAdminRequired */ public function index() { - return $this->boardService->findAll($this->userInfo); + return $this->boardService->findAll(); } /** diff --git a/lib/Service/BoardService.php b/lib/Service/BoardService.php index e9140d09a..5b3c07030 100644 --- a/lib/Service/BoardService.php +++ b/lib/Service/BoardService.php @@ -64,7 +64,8 @@ class BoardService { $this->assignedUsersMapper = $assignedUsersMapper; } - public function findAll($userInfo) { + public function findAll() { + $userInfo = $this->getBoardPrerequisites(); $userBoards = $this->boardMapper->findAllByUser($userInfo['user']); $groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups']); $complete = array_merge($userBoards, $groupBoards); @@ -112,7 +113,7 @@ class BoardService { return $board; } - public function getBoardPrerequisites() { + private function getBoardPrerequisites() { $groups = $this->groupManager->getUserGroupIds( $this->userManager->get($this->userId) );