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

Fix Acl

Browse Source
This commit is contained in:
Julius Haertl
2017-01-19 13:09:16 +01:00
parent 40f179fe48
commit 581ca05554
2 changed files with 92 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lib/Db/Acl.php
View File

@@ -30,14 +30,17 @@ class Acl extends Entity implements \JsonSerializable {
const PERMISSION_SHARE = 2;
const PERMISSION_MANAGE = 3;
const PERMISSION_TYPE_USER = 0;
const PERMISSION_TYPE_GROUP = 1;
public $id;
protected $participant;
protected $type;
protected $boardId;
protected $permissionEdit;
protected $permissionShare;
protected $permissionManage;
protected $owner;
protected $permissionEdit = false;
protected $permissionShare = false;
protected $permissionManage = false;
protected $owner = false;
public function __construct() {
$this->addType('id', 'integer');
@@ -46,6 +49,7 @@ class Acl extends Entity implements \JsonSerializable {
$this->addType('permissionShare', 'boolean');
$this->addType('permissionManage', 'boolean');
$this->addType('owner', 'boolean');
$this->addType('type', 'integer');
$this->addRelation('owner');
$this->setPermissionEdit(false);
$this->setPermissionShare(false);
@@ -70,12 +74,33 @@ class Acl extends Entity implements \JsonSerializable {
return [
'id' => $this->id,
'participant' => $this->participant,
'type' => $this->type,
'type' => $this->getType(),
'boardId' => $this->boardId,
'permissionEdit' => $this->permissionEdit,
'permissionShare' => $this->permissionShare,
'permissionManage' => $this->permissionManage,
'owner' => $this->owner
'permissionEdit' => $this->getPermissionEdit(),
'permissionShare' => $this->getPermissionShare(),
'permissionManage' => $this->getPermissionManage(),
'owner' => $this->getOwner()
];
}
/*
* FIXME: migrate other code to const PERMISSION_TYPE_ instead of strings
* iirc js uses those strings as well
*/
public function getType() {
if ($this->type === Acl::PERMISSION_TYPE_GROUP) {
return 'group';
}
return 'user';
}
public function setType($type) {
if ($type === 'group') {
$typeInt = Acl::PERMISSION_TYPE_GROUP;
} else {
$typeInt = Acl::PERMISSION_TYPE_USER;
}
$this->markFieldUpdated('type');
$this->type = $typeInt;
}
}

42
tests/unit/Db/AclTest.php
View File

@@ -30,9 +30,9 @@ class AclTest extends \PHPUnit_Framework_TestCase {
$acl->setParticipant("admin");
$acl->setType("user");
$acl->setBoardId(1);
$acl->setPermissionEdit(1);
$acl->setPermissionShare(1);
$acl->setPermissionManage(1);
$acl->setPermissionEdit(true);
$acl->setPermissionShare(true);
$acl->setPermissionManage(true);
return $acl;
}
private function createAclGroup() {
@@ -41,9 +41,9 @@ class AclTest extends \PHPUnit_Framework_TestCase {
$acl->setParticipant("administrators");
$acl->setType("group");
$acl->setBoardId(1);
$acl->setPermissionEdit(1);
$acl->setPermissionShare(1);
$acl->setPermissionManage(1);
$acl->setPermissionEdit(true);
$acl->setPermissionShare(true);
$acl->setPermissionManage(true);
return $acl;
}
public function testJsonSerialize() {
@@ -53,10 +53,10 @@ class AclTest extends \PHPUnit_Framework_TestCase {
'participant' => 'admin',
'type' => 'user',
'boardId' => 1,
'permissionEdit' => 1,
'permissionShare' => 1,
'permissionManage' => 1,
'owner' => 0
'permissionEdit' => true,
'permissionShare' => true,
'permissionManage' => true,
'owner' => false
], $acl->jsonSerialize());
$acl = $this->createAclGroup();
$this->assertEquals([
@@ -64,10 +64,10 @@ class AclTest extends \PHPUnit_Framework_TestCase {
'participant' => 'administrators',
'type' => 'group',
'boardId' => 1,
'permissionEdit' => 1,
'permissionShare' => 1,
'permissionManage' => 1,
'owner' => 0
'permissionEdit' => true,
'permissionShare' => true,
'permissionManage' => true,
'owner' => false
], $acl->jsonSerialize());
}
public function testSetOwner() {
@@ -78,10 +78,10 @@ class AclTest extends \PHPUnit_Framework_TestCase {
'participant' => 'admin',
'type' => 'user',
'boardId' => 1,
'permissionEdit' => 1,
'permissionShare' => 1,
'permissionManage' => 1,
'owner' => 1
'permissionEdit' => true,
'permissionShare' => true,
'permissionManage' => true,
'owner' => true
], $acl->jsonSerialize());
}
@@ -92,9 +92,9 @@ class AclTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals(true, $acl->getPermission(Acl::PERMISSION_EDIT));
$this->assertEquals(true, $acl->getPermission(Acl::PERMISSION_MANAGE));
$this->assertEquals(true, $acl->getPermission(Acl::PERMISSION_SHARE));
$acl->setPermissionEdit(0);
$acl->setPermissionShare(0);
$acl->setPermissionManage(0);
$acl->setPermissionEdit(false);
$acl->setPermissionShare(false);
$acl->setPermissionManage(false);
$this->assertEquals(true, $acl->getPermission(Acl::PERMISSION_READ));
$this->assertEquals(false, $acl->getPermission(Acl::PERMISSION_EDIT));
$this->assertEquals(false, $acl->getPermission(Acl::PERMISSION_MANAGE));