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

Fix ACL and archived REST endpoints (#1111)

Browse Source 
Fix ACL and archived REST endpoints
This commit is contained in:
Julius Härtl
2019-06-30 13:48:02 +02:00
committed by GitHub
parent db59150d74 8b8db54309
commit 22087fddc3
8 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appinfo/routes.php
View File

@@ -88,8 +88,8 @@ return [
['name' => 'board_api#update', 'url' => '/api/v1.0/boards/{boardId}', 'verb' => 'PUT'], ['name' => 'board_api#update', 'url' => '/api/v1.0/boards/{boardId}', 'verb' => 'PUT'],
['name' => 'board_api#undo_delete', 'url' => '/api/v1.0/boards/{boardId}/undo_delete', 'verb' => 'POST'], ['name' => 'board_api#undo_delete', 'url' => '/api/v1.0/boards/{boardId}/undo_delete', 'verb' => 'POST'],
['name' => 'board_api#addAcl', 'url' => '/api/v1.0/boards/{boardId}/acl', 'verb' => 'POST'], ['name' => 'board_api#addAcl', 'url' => '/api/v1.0/boards/{boardId}/acl', 'verb' => 'POST'],
['name' => 'board_api#deleteAcl', 'url' => '/api/v1.0/boards/{boardId}/acl', 'verb' => 'DELETE'], ['name' => 'board_api#deleteAcl', 'url' => '/api/v1.0/boards/{boardId}/acl/{aclId}', 'verb' => 'DELETE'],
['name' => 'board_api#updateAcl', 'url' => '/api/v1.0/boards/{boardId}/acl', 'verb' => 'PUT'], ['name' => 'board_api#updateAcl', 'url' => '/api/v1.0/boards/{boardId}/acl/{aclId}', 'verb' => 'PUT'],
['name' => 'stack_api#index', 'url' => '/api/v1.0/boards/{boardId}/stacks', 'verb' => 'GET'], ['name' => 'stack_api#index', 'url' => '/api/v1.0/boards/{boardId}/stacks', 'verb' => 'GET'],

6
js/service/BoardService.js
View File

@@ -172,7 +172,8 @@ app.factory('BoardService', function (ApiService, $http, $q) {
var deferred = $q.defer(); var deferred = $q.defer();
var self = this; var self = this;
$http.delete(this.baseUrl + '/' + acl.boardId + '/acl/' + acl.id).then(function (response) { $http.delete(this.baseUrl + '/' + acl.boardId + '/acl/' + acl.id).then(function (response) {
delete board.acl[response.data.id]; var index = board.acl.findIndex((item) => item.id === response.data.id);
delete board.acl[index];
if (response.data.type === OC.Share.SHARE_TYPE_USER) { if (response.data.type === OC.Share.SHARE_TYPE_USER) {
self._updateUsers(); self._updateUsers();
} else { } else {
@@ -192,7 +193,8 @@ app.factory('BoardService', function (ApiService, $http, $q) {
var self = this; var self = this;
var _acl = acl; var _acl = acl;
$http.put(this.baseUrl + '/' + acl.boardId + '/acl', _acl).then(function (response) { $http.put(this.baseUrl + '/' + acl.boardId + '/acl', _acl).then(function (response) {
board.acl[_acl.id] = response.data; var index = board.acl.findIndex((item) => item.id === _acl.id);
board.acl[index] = response.data;
if (response.data.type === OC.Share.SHARE_TYPE_USER) { if (response.data.type === OC.Share.SHARE_TYPE_USER) {
self._updateUsers(); self._updateUsers();
} else { } else {

4
lib/Controller/CardApiController.php
View File

@@ -86,8 +86,8 @@ class CardApiController extends ApiController {
* *
* Update a card * Update a card
*/ */
public function update($title, $type, $order = 0, $description = '', $owner, $duedate = null) { public function update($title, $type, $order = 0, $description = '', $owner, $duedate = null, $archived = null) {
$card = $this->cardService->update($this->request->getParam('cardId'), $title, $this->request->getParam('stackId'), $type, $order, $description, $owner, $duedate, 0); $card = $this->cardService->update($this->request->getParam('cardId'), $title, $this->request->getParam('stackId'), $type, $order, $description, $owner, $duedate, 0, $archived);
return new DataResponse($card, HTTP::STATUS_OK); return new DataResponse($card, HTTP::STATUS_OK);
} }

2
lib/Db/Board.php
View File

@@ -76,7 +76,7 @@ class Board extends RelationalEntity {
*/ */
public function setAcl($acl) { public function setAcl($acl) {
foreach ($acl as $a) { foreach ($acl as $a) {
$this->acl[$a->id] = $a; $this->acl[] = $a;
} }
} }
} }

12
lib/Service/CardService.php
View File

@@ -249,7 +249,7 @@ class CardService {
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException
* @throws BadRequestException * @throws BadRequestException
*/ */
public function update($id, $title, $stackId, $type, $order = 0, $description = '', $owner, $duedate = null, $deletedAt) { public function update($id, $title, $stackId, $type, $order = 0, $description = '', $owner, $duedate = null, $deletedAt = null, $archived = null) {
if (is_numeric($id) === false) { if (is_numeric($id) === false) {
throw new BadRequestException('card id must be a number'); throw new BadRequestException('card id must be a number');
@@ -276,7 +276,7 @@ class CardService {
throw new StatusException('Operation not allowed. This board is archived.'); throw new StatusException('Operation not allowed. This board is archived.');
} }
$card = $this->cardMapper->find($id); $card = $this->cardMapper->find($id);
if ($card->getArchived()) { if ($archived !== null && $card->getArchived() && $archived === true) {
throw new StatusException('Operation not allowed. This card is archived.'); throw new StatusException('Operation not allowed. This card is archived.');
} }
$changes = new ChangeSet($card); $changes = new ChangeSet($card);
@@ -301,7 +301,13 @@ class CardService {
$card->setOrder($order); $card->setOrder($order);
$card->setOwner($owner); $card->setOwner($owner);
$card->setDuedate($duedate); $card->setDuedate($duedate);
$card->setDeletedAt($deletedAt); if ($deletedAt) {
$card->setDeletedAt($deletedAt);
}
if ($archived !== null) {
$card->setArchived($archived);
}
// Trigger update events before setting description as it is handled separately // Trigger update events before setting description as it is handled separately
$changes->setAfter($card); $changes->setAfter($card);

5
tests/unit/Db/BoardMapperTest.php
View File

@@ -158,10 +158,7 @@ class BoardMapperTest extends MapperTestUtility {
public function testFindWithAcl() { public function testFindWithAcl() {
$actual = $this->boardMapper->find($this->boards[0]->getId(), false, true); $actual = $this->boardMapper->find($this->boards[0]->getId(), false, true);
$expected = [ $expected = [$this->acls[1], $this->acls[2]];
$this->acls[1]->getId() => $this->acls[1],
$this->acls[2]->getId() => $this->acls[2]
];
$this->assertEquals($expected, $actual->getAcl()); $this->assertEquals($expected, $actual->getAcl());
} }

2
tests/unit/Db/BoardTest.php
View File

@@ -57,7 +57,7 @@ class BoardTest extends TestCase {
$acl->setId(1); $acl->setId(1);
$board = $this->createBoard(); $board = $this->createBoard();
$board->setAcl(array($acl)); $board->setAcl(array($acl));
$result = $board->getAcl()[1]; $result = $board->getAcl()[0];
$this->assertEquals($acl, $result); $this->assertEquals($acl, $result);
} }
public function testSetShared() { public function testSetShared() {

2
tests/unit/Service/CardServiceTest.php
View File

@@ -197,7 +197,7 @@ class CardServiceTest extends TestCase {
$this->cardMapper->expects($this->once())->method('find')->willReturn($card); $this->cardMapper->expects($this->once())->method('find')->willReturn($card);
$this->cardMapper->expects($this->never())->method('update'); $this->cardMapper->expects($this->never())->method('update');
$this->expectException(StatusException::class); $this->expectException(StatusException::class);
$this->cardService->update(123, 'newtitle', 234, 'text', 999, 'foo', 'admin', '2017-01-01 00:00:00', null); $this->cardService->update(123, 'newtitle', 234, 'text', 999, 'foo', 'admin', '2017-01-01 00:00:00', null, true);
} }
public function testRename() { public function testRename() {