ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove dark magic middleware and check permission in services

Browse Source
This commit is contained in:
Julius Haertl
2017-01-13 16:36:36 +01:00
parent 6d0ebb7d73
commit b0627d8979
14 changed files with 158 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Service/CardService.php
View File

@@ -25,21 +25,31 @@ namespace OCA\Deck\Service;
use OCA\Deck\Db\Card;
use OCA\Deck\Db\CardMapper;
use OCA\Deck\Db\Acl;
use OCA\Deck\CardArchivedException;
use OCA\Deck\Db\StackMapper;
class CardService {
private $cardMapper;
public function __construct(CardMapper $cardMapper) {
public function __construct(
CardMapper $cardMapper,
StackMapper $stackMapper,
PermissionService $permissionService
) {
$this->cardMapper = $cardMapper;
$this->stackMapper = $stackMapper;
$this->permissionService = $permissionService;
}
public function find($cardId) {
$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_READ);
return $this->cardMapper->find($cardId);
}
public function create($title, $stackId, $type, $order, $owner) {
$this->permissionService->checkPermission($this->stackMapper, $stackId, Acl::PERMISSION_EDIT);
$card = new Card();
$card->setTitle($title);
$card->setStackId($stackId);
@@ -51,10 +61,12 @@ class CardService {
}
public function delete($id) {
$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
return $this->cardMapper->delete($this->cardMapper->find($id));
}
public function update($id, $title, $stackId, $type, $order, $description, $owner) {
$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
$card = $this->cardMapper->find($id);
if($card->getArchived()) {
throw new CardArchivedException();
@@ -69,6 +81,7 @@ class CardService {
}
public function rename($id, $title) {
$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
$card = $this->cardMapper->find($id);
if($card->getArchived()) {
throw new CardArchivedException();
@@ -77,6 +90,7 @@ class CardService {
return $this->cardMapper->update($card);
}
public function reorder($id, $stackId, $order) {
$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
$cards = $this->cardMapper->findAll($stackId);
$i = 0;
foreach ($cards as $card) {
@@ -102,18 +116,21 @@ class CardService {
}
public function archive($id) {
$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
$card = $this->cardMapper->find($id);
$card->setArchived(true);
return $this->cardMapper->update($card);
}
public function unarchive($id) {
$this->permissionService->checkPermission($this->cardMapper, $id, Acl::PERMISSION_EDIT);
$card = $this->cardMapper->find($id);
$card->setArchived(false);
return $this->cardMapper->update($card);
}
public function assignLabel($cardId, $labelId) {
$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
$card = $this->cardMapper->find($cardId);
if($card->getArchived()) {
throw new CardArchivedException();
@@ -122,6 +139,7 @@ class CardService {
}
public function removeLabel($cardId, $labelId) {
$this->permissionService->checkPermission($this->cardMapper, $cardId, Acl::PERMISSION_EDIT);
$card = $this->cardMapper->find($cardId);
if($card->getArchived()) {
throw new CardArchivedException();