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

detail pages for customers and projects (#1371)

Browse Source
This commit is contained in:
Kevin Papst
2020-01-16 16:25:28 +01:00
committed by GitHub
parent 28c5357f11
commit 6a44dbfe83
131 changed files with 3055 additions and 1742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/Voter/AbstractVoterTest.php
View File

@@ -14,7 +14,6 @@ use App\Repository\RolePermissionRepository;
use App\Security\AclDecisionManager;
use App\Security\RolePermissionManager;
use App\Voter\AbstractVoter;
use Doctrine\Common\Collections\ArrayCollection;
use PHPUnit\Framework\TestCase;
abstract class AbstractVoterTest extends TestCase
@@ -41,20 +40,23 @@ abstract class AbstractVoterTest extends TestCase
/**
* @param int $id
* @param string $role
* @param string|null $role
* @return User
*/
protected function getUser($id, $role)
protected function getUser($id, ?string $role)
{
$roles = [];
if (!empty($role)) {
$roles[] = $role;
}
$user = $this->getMockBuilder(User::class)->getMock();
$user->method('getId')->willReturn($id);
$user->method('getRoles')->willReturn($roles);
$user->method('getTeams')->willReturn(new ArrayCollection());
$user = new User();
$user->setRoles($roles);
$reflection = new \ReflectionClass($user);
$property = $reflection->getProperty('id');
$property->setAccessible(true);
$property->setValue($user, $id);
return $user;
}
@@ -69,16 +71,16 @@ 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'];
$projects = ['view_project', 'create_project', 'edit_project', 'budget_project', 'delete_project', 'permissions_project', 'comments_project', 'details_project'];
$projectsTeam = ['view_teamlead_project', 'edit_teamlead_project', 'budget_teamlead_project', 'permissions_teamlead_project', 'comments_teamlead_project', 'details_teamlead_project'];
$customers = ['view_customer', 'create_customer', 'edit_customer', 'budget_customer', 'delete_customer', 'permissions_customer', 'comments_customer', 'details_customer'];
$customersTeam = ['view_teamlead_customer', 'edit_teamlead_customer', 'budget_teamlead_customer', 'comments_teamlead_customer', 'details_teamlead_customer'];
$invoice = ['view_invoice', 'create_invoice'];
$invoiceTemplate = ['manage_invoice_template'];
$timesheet = ['view_own_timesheet', 'start_own_timesheet', 'stop_own_timesheet', 'create_own_timesheet', 'edit_own_timesheet', 'export_own_timesheet', 'delete_own_timesheet'];
$timesheetOthers = ['view_other_timesheet', 'start_other_timesheet', 'stop_other_timesheet', 'create_other_timesheet', 'edit_other_timesheet', 'export_other_timesheet', 'delete_other_timesheet'];
$profile = ['view_own_profile', 'edit_own_profile', 'password_own_profile', 'preferences_own_profile', 'api-token_own_profile'];
$profileOther = ['view_other_profile', 'edit_other_profile', 'delete_other_profile', 'password_other_profile', 'roles_other_profile', 'preferences_other_profile', 'api-token_other_profile'];
$profileOther = ['view_other_profile', 'edit_other_profile', 'password_other_profile', 'roles_other_profile', 'preferences_other_profile', 'api-token_other_profile'];
$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'];
@@ -87,7 +89,7 @@ abstract class AbstractVoterTest extends TestCase
$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'];
$roleSuperAdmin = ['hourly-rate_own_profile', 'hourly-rate_other_profile', 'roles_own_profile', 'system_information', 'system_configuration', 'plugins', 'edit_exported_timesheet'];
$permissions = [
'ROLE_USER' => array_merge($timesheet, $profile, $roleUser),

78
tests/Voter/CustomerVoterTest.php
View File

@@ -21,65 +21,65 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
*/
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);
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]));
$actual = $sut->vote($token, $subject, [$attribute]);
$this->assertEquals($result, $actual, sprintf('Failed voting "%s" for User with roles %s.', $attribute, implode(', ', $user->getRoles())));
}
public function getTestData()
public function testVote()
{
$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);
$userNoRole = $this->getUser(0, 'foo');
$userStandard = $this->getUser(1, User::ROLE_USER);
$userTeamlead = $this->getUser(2, User::ROLE_TEAMLEAD);
$userAdmin = $this->getUser(3, User::ROLE_ADMIN);
$userSuperAdmin = $this->getUser(4, User::ROLE_SUPER_ADMIN);
$result = VoterInterface::ACCESS_GRANTED;
foreach ([$user3, $user4] 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 ([$userAdmin, $userSuperAdmin] as $user) {
$this->assertVote($user, new Customer(), 'view', $result);
$this->assertVote($user, new Customer(), 'edit', $result);
$this->assertVote($user, new Customer(), 'budget', $result);
$this->assertVote($user, new Customer(), 'delete', $result);
}
foreach ([$user2] as $user) {
yield [$user, new Customer(), 'view', $result];
$team = new Team();
$team->setTeamLead($userTeamlead);
foreach ([$userTeamlead] as $user) {
$customer = new Customer();
$team->addCustomer($customer);
$this->assertVote($user, $customer, 'view', $result);
$team->removeCustomer($customer);
}
$userTeamlead = $this->getUser(2, User::ROLE_TEAMLEAD);
$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 ([$userNoRole, $userStandard] as $user) {
$this->assertVote($user, new Customer(), 'view', $result);
$this->assertVote($user, new Customer(), 'edit', $result);
$this->assertVote($user, new Customer(), 'budget', $result);
$this->assertVote($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];
foreach ([$userTeamlead] as $user) {
$this->assertVote($user, new Customer(), 'edit', $result);
$this->assertVote($user, new Customer(), 'budget', $result);
$this->assertVote($user, new Customer(), 'delete', $result);
}
$result = VoterInterface::ACCESS_ABSTAIN;
foreach ([$user0, $user1, $user2] as $user) {
yield [$user, new Customer(), 'view_customer', $result];
yield [$user, new Customer(), 'edit_customer', $result];
yield [$user, new Customer(), 'budget_customer', $result];
yield [$user, new Customer(), 'delete_customer', $result];
yield [$user, new \stdClass(), 'view', $result];
yield [$user, null, 'edit', $result];
yield [$user, $user, 'delete', $result];
foreach ([$userNoRole, $userStandard, $userTeamlead] as $user) {
$this->assertVote($user, new Customer(), 'view_customer', $result);
$this->assertVote($user, new Customer(), 'edit_customer', $result);
$this->assertVote($user, new Customer(), 'budget_customer', $result);
$this->assertVote($user, new Customer(), 'delete_customer', $result);
$this->assertVote($user, new \stdClass(), 'view', $result);
$this->assertVote($user, null, 'edit', $result);
$this->assertVote($user, $user, 'delete', $result);
}
}

81
tests/Voter/ProjectVoterTest.php
View File

@@ -22,14 +22,6 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
*/
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());
@@ -39,53 +31,62 @@ class ProjectVoterTest extends AbstractVoterTest
$subject->setCustomer(new Customer());
}
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]));
$actual = $sut->vote($token, $subject, [$attribute]);
$this->assertEquals($result, $actual, sprintf('Failed voting "%s" for User with roles %s.', $attribute, implode(', ', $user->getRoles())));
}
public function getTestData()
public function testVote()
{
$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);
$userNoRole = $this->getUser(0, 'foo');
$userStandard = $this->getUser(1, User::ROLE_USER);
$userTeamlead = $this->getUser(2, User::ROLE_TEAMLEAD);
$userAdmin = $this->getUser(3, User::ROLE_ADMIN);
$userSuperAdmin = $this->getUser(4, User::ROLE_SUPER_ADMIN);
$result = VoterInterface::ACCESS_GRANTED;
foreach ([$user3, $user4] 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 ([$userAdmin, $userSuperAdmin] as $user) {
$this->assertVote($user, new Project(), 'view', $result);
$this->assertVote($user, new Project(), 'edit', $result);
$this->assertVote($user, new Project(), 'budget', $result);
$this->assertVote($user, new Project(), 'delete', $result);
}
foreach ([$user2] as $user) {
yield [$user, new Project(), 'view', $result];
$team = new Team();
$team->setTeamLead($userTeamlead);
foreach ([$userTeamlead] as $user) {
$project = new Project();
$team->addProject($project);
$this->assertVote($user, $project, 'view', $result);
$team->removeProject($project);
}
$userTeamlead = $this->getUser(2, User::ROLE_TEAMLEAD);
$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 ([$userNoRole, $userStandard] as $user) {
$this->assertVote($user, new Project(), 'view', $result);
$this->assertVote($user, new Project(), 'edit', $result);
$this->assertVote($user, new Project(), 'budget', $result);
$this->assertVote($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];
foreach ([$userTeamlead] as $user) {
$this->assertVote($user, new Project(), 'view', $result);
$this->assertVote($user, new Project(), 'edit', $result);
$this->assertVote($user, new Project(), 'budget', $result);
$this->assertVote($user, new Project(), 'delete', $result);
}
$result = VoterInterface::ACCESS_ABSTAIN;
foreach ([$user0, $user1, $user2] as $user) {
yield [$user, new Project(), 'create_project', $result];
yield [$user, new Project(), 'view_project', $result];
yield [$user, new Project(), 'edit_project', $result];
yield [$user, new Project(), 'budget_project', $result];
yield [$user, new Project(), 'delete_project', $result];
yield [$user, new \stdClass(), 'view', $result];
yield [$user, null, 'edit', $result];
yield [$user, $user, 'delete', $result];
foreach ([$userNoRole, $userStandard, $userTeamlead] as $user) {
$this->assertVote($user, new Project(), 'create_project', $result);
$this->assertVote($user, new Project(), 'view_project', $result);
$this->assertVote($user, new Project(), 'edit_project', $result);
$this->assertVote($user, new Project(), 'budget_project', $result);
$this->assertVote($user, new Project(), 'delete_project', $result);
$this->assertVote($user, new \stdClass(), 'view', $result);
$this->assertVote($user, null, 'edit', $result);
$this->assertVote($user, $user, 'delete', $result);
}
}

36
tests/Voter/RolePermissionVoterTest.php
View File

@@ -28,16 +28,17 @@ class RolePermissionVoterTest extends AbstractVoterTest
$token = new UsernamePasswordToken($user, 'foo', 'bar', $user->getRoles());
$sut = $this->getVoter(RolePermissionVoter::class, $user);
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]));
$actual = $sut->vote($token, $subject, [$attribute]);
$this->assertEquals($result, $actual, sprintf('Failed voting "%s" for User with roles %s.', $attribute, implode(', ', $user->getRoles())));
}
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);
$userNoRole = $this->getUser(0, 'foo');
$userStandard = $this->getUser(1, User::ROLE_USER);
$userTeamlead = $this->getUser(2, User::ROLE_TEAMLEAD);
$userAdmin = $this->getUser(3, User::ROLE_ADMIN);
$userSuperAdmin = $this->getUser(4, User::ROLE_SUPER_ADMIN);
$invoice = [
'manage_invoice_template' => null,
@@ -70,7 +71,7 @@ class RolePermissionVoterTest extends AbstractVoterTest
$result = VoterInterface::ACCESS_GRANTED;
$entries = array_merge($timesheet);
foreach ([$user1, $user2, $user3, $user4] as $user) {
foreach ([$userNoRole, $userStandard, $userTeamlead, $userAdmin, $userSuperAdmin] as $user) {
foreach ($entries as $permission => $entity) {
yield [$user, $entity, $permission, $result];
yield [$user, null, $permission, $result];
@@ -78,7 +79,7 @@ class RolePermissionVoterTest extends AbstractVoterTest
}
$entriesAdmin = array_merge($others, $timesheetOther, $invoice, $timesheet);
foreach ([$user3, $user4] as $user) {
foreach ([$userAdmin, $userSuperAdmin] as $user) {
foreach ($entriesAdmin as $permission => $entity) {
yield [$user, $entity, $permission, $result];
yield [$user, null, $permission, $result];
@@ -87,35 +88,30 @@ class RolePermissionVoterTest extends AbstractVoterTest
$entriesSuperAdmin = array_merge($users);
foreach ($entriesSuperAdmin as $permission => $entity) {
yield [$user4, $entity, $permission, $result];
yield [$user4, null, $permission, $result];
yield [$userSuperAdmin, $entity, $permission, $result];
yield [$userSuperAdmin, null, $permission, $result];
}
// ================== DENIED ==================
// this test might fail in the future due to the role permissions
$result = VoterInterface::ACCESS_DENIED;
foreach ([$user0, $user1, $user2] as $user) {
foreach ([$userNoRole, $userStandard, $userTeamlead] as $user) {
foreach ($others as $permission => $entity) {
yield [$user, $entity, $permission, $result];
}
}
foreach ([$user0, $user1] as $user) {
foreach ([$userNoRole, $userStandard] as $user) {
foreach (['view_activity' => null] as $permission => $entity) {
yield [$user, $entity, $permission, $result];
}
}
foreach ([$user0, $user1] as $user) {
foreach ([$userNoRole, $userStandard] as $user) {
foreach ($invoice as $permission => $entity) {
yield [$user, $entity, $permission, $result];
}
}
foreach ([$user0] as $user) {
foreach ($timesheet as $permission => $entity) {
yield [$user, $entity, $permission, $result];
}
}
foreach ([$user0, $user1] as $user) {
foreach ([$userNoRole, $userStandard] as $user) {
foreach ($timesheetOther as $permission => $entity) {
yield [$user, $entity, $permission, $result];
}
@@ -123,7 +119,7 @@ class RolePermissionVoterTest extends AbstractVoterTest
// ================== ABSTAIN ==================
$result = VoterInterface::ACCESS_ABSTAIN;
foreach ([$user3, $user4] as $user) {
foreach ([$userAdmin, $userSuperAdmin] as $user) {
yield [$user, new Activity(), 'view', $result];
yield [$user, new Activity(), 'edit', $result];
yield [$user, new Activity(), 'delete', $result];