jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added team permissions (#996)

Browse Source
This commit is contained in:
Kevin Papst
2019-08-16 01:22:33 +02:00
committed by GitHub
parent 9611646bc6
commit 561ec3b1e9
124 changed files with 4122 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/Voter/AbstractVoterTest.php
View File

@@ -52,6 +52,7 @@ abstract class AbstractVoterTest extends TestCase
$user = $this->getMockBuilder(User::class)->getMock();
$user->method('getId')->willReturn($id);
$user->method('getRoles')->willReturn($roles);
$user->method('getTeams')->willReturn([]);
return $user;
}
@@ -65,8 +66,11 @@ abstract class AbstractVoterTest extends TestCase
{
if (!$overwrite) {
$activities = ['view_activity', 'edit_activity', 'budget_activity', 'delete_activity', 'create_activity'];
$activitiesTeam = ['view_activity', 'create_activity', 'edit_teamlead_activity', 'budget_teamlead_activity'];
$projects = ['view_project', 'edit_project', 'budget_project', 'delete_project', 'create_project'];
$projectsTeam = ['view_project', 'edit_teamlead_project', 'budget_teamlead_project', 'permissions_teamlead_project'];
$customers = ['view_customer', 'edit_customer', 'budget_customer', 'delete_customer', 'create_customer'];
$customersTeam = ['view_customer', 'edit_teamlead_customer', 'budget_teamlead_customer'];
$invoice = ['view_invoice', 'create_invoice'];
$invoiceTemplate = ['view_invoice_template', 'create_invoice_template', 'edit_invoice_template', 'delete_invoice_template'];
$timesheet = ['view_own_timesheet', 'start_own_timesheet', 'stop_own_timesheet', 'create_own_timesheet', 'edit_own_timesheet', 'export_own_timesheet', 'delete_own_timesheet'];
@@ -76,17 +80,18 @@ abstract class AbstractVoterTest extends TestCase
$user = ['view_user', 'create_user', 'delete_user'];
$rate = ['view_rate_own_timesheet', 'edit_rate_own_timesheet'];
$rateOther = ['view_rate_other_timesheet', 'edit_rate_other_timesheet'];
$teams = ['view_team', 'create_team', 'edit_team', 'delete_team'];
$roleUser = [];
$roleUser = ['edit_team_activity', 'edit_team_project', 'edit_team_customer'];
$roleTeamlead = ['view_rate_own_timesheet', 'view_rate_other_timesheet', 'hourly-rate_own_profile'];
$roleAdmin = ['hourly-rate_own_profile', 'edit_exported_timesheet'];
$roleSuperAdmin = ['hourly-rate_own_profile', 'hourly-rate_other_profile', 'delete_own_profile', 'roles_own_profile', 'system_information', 'system_configuration', 'plugins', 'edit_exported_timesheet'];
$permissions = [
'ROLE_USER' => array_merge($timesheet, $profile, $roleUser),
'ROLE_TEAMLEAD' => array_merge($invoice, $timesheet, $timesheetOthers, $profile, $roleTeamlead),
'ROLE_ADMIN' => array_merge($activities, $projects, $customers, $invoice, $invoiceTemplate, $timesheet, $timesheetOthers, $profile, $rate, $rateOther, $roleAdmin),
'ROLE_SUPER_ADMIN' => array_merge($activities, $projects, $customers, $invoice, $invoiceTemplate, $timesheet, $timesheetOthers, $profile, $profileOther, $user, $rate, $rateOther, $roleSuperAdmin),
'ROLE_TEAMLEAD' => array_merge($invoice, $timesheet, $timesheetOthers, $profile, $roleTeamlead, $activitiesTeam, $projectsTeam, $customersTeam),
'ROLE_ADMIN' => array_merge($activities, $projects, $customers, $invoice, $invoiceTemplate, $timesheet, $timesheetOthers, $profile, $rate, $rateOther, $roleAdmin, $teams),
'ROLE_SUPER_ADMIN' => array_merge($activities, $projects, $customers, $invoice, $invoiceTemplate, $timesheet, $timesheetOthers, $profile, $profileOther, $user, $rate, $rateOther, $roleSuperAdmin, $teams),
];
}

83
tests/Voter/ActivityVoterTest.php
View File

@@ -10,6 +10,9 @@
namespace App\Tests\Voter;
use App\Entity\Activity;
use App\Entity\Customer;
use App\Entity\Project;
use App\Entity\Team;
use App\Entity\User;
use App\Voter\ActivityVoter;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
@@ -24,6 +27,11 @@ class ActivityVoterTest extends AbstractVoterTest
* @dataProvider getTestData
*/
public function testVote(User $user, $subject, $attribute, $result)
{
$this->assertVote($user, $subject, $attribute, $result);
}
protected function assertVote(User $user, $subject, $attribute, $result)
{
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$sut = $this->getVoter(ActivityVoter::class, $user);
@@ -47,9 +55,19 @@ class ActivityVoterTest extends AbstractVoterTest
yield [$user, new Activity(), 'delete', $result];
}
$result = VoterInterface::ACCESS_DENIED;
foreach ([$user0, $user1, $user2] as $user) {
foreach ([$user2] as $user) {
yield [$user, new Activity(), 'view', $result];
}
$result = VoterInterface::ACCESS_DENIED;
foreach ([$user0, $user1] as $user) {
yield [$user, new Activity(), 'view', $result];
yield [$user, new Activity(), 'edit', $result];
yield [$user, new Activity(), 'budget', $result];
yield [$user, new Activity(), 'delete', $result];
}
foreach ([$user2] as $user) {
yield [$user, new Activity(), 'edit', $result];
yield [$user, new Activity(), 'budget', $result];
yield [$user, new Activity(), 'delete', $result];
@@ -66,4 +84,65 @@ class ActivityVoterTest extends AbstractVoterTest
yield [$user, $user, 'delete', $result];
}
}
public function testTeamlead()
{
$team = new Team();
$user = new User();
$user->addRole(User::ROLE_TEAMLEAD);
$team->setTeamLead($user);
$activity = new Activity();
$project = new Project();
$customer = new Customer();
$project->setCustomer($customer);
$activity->setProject($project);
$customer->addTeam($team);
$this->assertVote($user, $activity, 'edit', VoterInterface::ACCESS_GRANTED);
$activity = new Activity();
$project = new Project();
$customer = new Customer();
$project->setCustomer($customer);
$activity->setProject($project);
$project->addTeam($team);
$this->assertVote($user, $activity, 'edit', VoterInterface::ACCESS_GRANTED);
$activity = new Activity();
$this->assertVote($user, $activity, 'edit', VoterInterface::ACCESS_DENIED);
}
public function testTeamMember()
{
$team = new Team();
$user = new User();
$user->addRole(User::ROLE_USER);
$team->setTeamLead($user);
$activity = new Activity();
$project = new Project();
$customer = new Customer();
$customer->addTeam($team);
$project->setCustomer($customer);
$activity->setProject($project);
$this->assertVote($user, $activity, 'edit', VoterInterface::ACCESS_GRANTED);
$activity = new Activity();
$team = new Team();
$user = new User();
$user->addRole(User::ROLE_USER);
$team->addUser($user);
$project = new Project();
$customer = new Customer();
$project->addTeam($team);
$project->setCustomer($customer);
$activity->setProject($project);
$this->assertVote($user, $activity, 'edit', VoterInterface::ACCESS_GRANTED);
}
}

56
tests/Voter/CustomerVoterTest.php
View File

@@ -10,6 +10,7 @@
namespace App\Tests\Voter;
use App\Entity\Customer;
use App\Entity\Team;
use App\Entity\User;
use App\Voter\CustomerVoter;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
@@ -24,6 +25,11 @@ class CustomerVoterTest extends AbstractVoterTest
* @dataProvider getTestData
*/
public function testVote(User $user, $subject, $attribute, $result)
{
$this->assertVote($user, $subject, $attribute, $result);
}
protected function assertVote(User $user, $subject, $attribute, $result)
{
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$sut = $this->getVoter(CustomerVoter::class, $user);
@@ -47,9 +53,19 @@ class CustomerVoterTest extends AbstractVoterTest
yield [$user, new Customer(), 'delete', $result];
}
$result = VoterInterface::ACCESS_DENIED;
foreach ([$user0, $user1, $user2] as $user) {
foreach ([$user2] as $user) {
yield [$user, new Customer(), 'view', $result];
}
$result = VoterInterface::ACCESS_DENIED;
foreach ([$user0, $user1] as $user) {
yield [$user, new Customer(), 'view', $result];
yield [$user, new Customer(), 'edit', $result];
yield [$user, new Customer(), 'budget', $result];
yield [$user, new Customer(), 'delete', $result];
}
foreach ([$user2] as $user) {
yield [$user, new Customer(), 'edit', $result];
yield [$user, new Customer(), 'budget', $result];
yield [$user, new Customer(), 'delete', $result];
@@ -66,4 +82,40 @@ class CustomerVoterTest extends AbstractVoterTest
yield [$user, $user, 'delete', $result];
}
}
public function testTeamlead()
{
$team = new Team();
$user = new User();
$user->addRole(User::ROLE_TEAMLEAD);
$team->setTeamLead($user);
$customer = new Customer();
$customer->addTeam($team);
$this->assertVote($user, $customer, 'edit', VoterInterface::ACCESS_GRANTED);
}
public function testTeamMember()
{
$team = new Team();
$user = new User();
$user->addRole(User::ROLE_USER);
$team->setTeamLead($user);
$customer = new Customer();
$customer->addTeam($team);
$this->assertVote($user, $customer, 'edit', VoterInterface::ACCESS_GRANTED);
$team = new Team();
$user = new User();
$user->addRole(User::ROLE_USER);
$team->addUser($user);
$customer = new Customer();
$customer->addTeam($team);
$this->assertVote($user, $customer, 'edit', VoterInterface::ACCESS_GRANTED);
}
}

74
tests/Voter/ProjectVoterTest.php
View File

@@ -9,7 +9,9 @@
namespace App\Tests\Voter;
use App\Entity\Customer;
use App\Entity\Project;
use App\Entity\Team;
use App\Entity\User;
use App\Voter\ProjectVoter;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
@@ -24,10 +26,19 @@ class ProjectVoterTest extends AbstractVoterTest
* @dataProvider getTestData
*/
public function testVote(User $user, $subject, $attribute, $result)
{
$this->assertVote($user, $subject, $attribute, $result);
}
protected function assertVote(User $user, $subject, $attribute, $result)
{
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$sut = $this->getVoter(ProjectVoter::class, $user);
if ($subject instanceof Project && null === $subject->getCustomer()) {
$subject->setCustomer(new Customer());
}
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]));
}
@@ -47,9 +58,19 @@ class ProjectVoterTest extends AbstractVoterTest
yield [$user, new Project(), 'delete', $result];
}
$result = VoterInterface::ACCESS_DENIED;
foreach ([$user0, $user1, $user2] as $user) {
foreach ([$user2] as $user) {
yield [$user, new Project(), 'view', $result];
}
$result = VoterInterface::ACCESS_DENIED;
foreach ([$user0, $user1] as $user) {
yield [$user, new Project(), 'view', $result];
yield [$user, new Project(), 'edit', $result];
yield [$user, new Project(), 'budget', $result];
yield [$user, new Project(), 'delete', $result];
}
foreach ([$user2] as $user) {
yield [$user, new Project(), 'edit', $result];
yield [$user, new Project(), 'budget', $result];
yield [$user, new Project(), 'delete', $result];
@@ -67,4 +88,53 @@ class ProjectVoterTest extends AbstractVoterTest
yield [$user, $user, 'delete', $result];
}
}
public function testTeamlead()
{
$team = new Team();
$user = new User();
$user->addRole(User::ROLE_TEAMLEAD);
$team->setTeamLead($user);
$project = new Project();
$customer = new Customer();
$project->setCustomer($customer);
$customer->addTeam($team);
$this->assertVote($user, $project, 'edit', VoterInterface::ACCESS_GRANTED);
$project = new Project();
$customer = new Customer();
$project->setCustomer($customer);
$project->addTeam($team);
$this->assertVote($user, $project, 'edit', VoterInterface::ACCESS_GRANTED);
}
public function testTeamMember()
{
$team = new Team();
$user = new User();
$user->addRole(User::ROLE_USER);
$team->setTeamLead($user);
$project = new Project();
$customer = new Customer();
$customer->addTeam($team);
$project->setCustomer($customer);
$this->assertVote($user, $project, 'edit', VoterInterface::ACCESS_GRANTED);
$team = new Team();
$user = new User();
$user->addRole(User::ROLE_USER);
$team->addUser($user);
$project = new Project();
$customer = new Customer();
$project->addTeam($team);
$project->setCustomer($customer);
$this->assertVote($user, $project, 'edit', VoterInterface::ACCESS_GRANTED);
}
}

6
tests/Voter/RolePermissionVoterTest.php
View File

@@ -57,7 +57,6 @@ class RolePermissionVoterTest extends AbstractVoterTest
];
$others = [
'create_activity' => null,
'create_customer' => null,
'create_project' => null,
];
@@ -101,6 +100,11 @@ class RolePermissionVoterTest extends AbstractVoterTest
yield [$user, $entity, $permission, $result];
}
}
foreach ([$user0, $user1] as $user) {
foreach (['view_activity' => null] as $permission => $entity) {
yield [$user, $entity, $permission, $result];
}
}
foreach ([$user0, $user1] as $user) {
foreach ($invoice as $permission => $entity) {
yield [$user, $entity, $permission, $result];

82
tests/Voter/TeamVoterTest.php Normal file
View File

@@ -0,0 +1,82 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Tests\Voter;
use App\Entity\Team;
use App\Entity\User;
use App\Voter\TeamVoter;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
/**
* @covers \App\Voter\TeamVoter
*/
class TeamVoterTest extends AbstractVoterTest
{
/**
* @dataProvider getTestData
*/
public function testVote(User $user, $subject, $attribute, $result)
{
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$sut = $this->getVoter(TeamVoter::class, $user);
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]));
}
public function getTestData()
{
$user0 = $this->getUser(0, null);
$user1 = $this->getUser(1, User::ROLE_USER);
$user2 = $this->getUser(2, User::ROLE_TEAMLEAD);
$user3 = $this->getUser(3, User::ROLE_ADMIN);
$user4 = $this->getUser(4, User::ROLE_SUPER_ADMIN);
$team = new Team();
$result = VoterInterface::ACCESS_ABSTAIN;
$allTeamPerms = ['view_team', 'create_team', 'edit_team', 'delete_team'];
foreach ($allTeamPerms as $fullPerm) {
yield [$user0, [], $fullPerm, $result];
yield [$user0, new \stdClass(), $fullPerm, $result];
yield [$user0, $team, $fullPerm, $result];
yield [$user1, $team, $fullPerm, $result];
yield [$user2, $team, $fullPerm, $result];
yield [$user3, $team, $fullPerm, $result];
yield [$user4, $team, $fullPerm, $result];
}
$result = VoterInterface::ACCESS_DENIED;
yield [$user0, $team, 'view', $result];
yield [$user0, $team, 'edit', $result];
yield [$user0, $team, 'delete', $result];
yield [$user1, $team, 'view', $result];
yield [$user1, $team, 'edit', $result];
yield [$user1, $team, 'delete', $result];
yield [$user2, $team, 'view', $result];
yield [$user2, $team, 'edit', $result];
yield [$user2, $team, 'delete', $result];
$result = VoterInterface::ACCESS_GRANTED;
yield [$user3, $team, 'view', $result];
yield [$user3, $team, 'edit', $result];
yield [$user3, $team, 'delete', $result];
yield [$user4, $team, 'view', $result];
yield [$user4, $team, 'edit', $result];
yield [$user4, $team, 'delete', $result];
}
}