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

Added delete user feature #225 (#249)

Browse Source
This commit is contained in:
Kevin Papst
2018-07-31 13:16:40 +02:00
committed by GitHub
parent 0996eca3c5
commit a8a8424ced
29 changed files with 879 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Voter/UserVoter.php
View File

@@ -93,7 +93,7 @@ class UserVoter extends AbstractVoter
*/
protected function canEditPreferences(User $profile, User $user, TokenInterface $token)
{
return $profile->getId() == $user->getId();
return $profile->getId() === $user->getId();
}
/**
@@ -107,7 +107,7 @@ class UserVoter extends AbstractVoter
return true;
}
return $profile->getId() == $user->getId();
return $profile->getId() === $user->getId();
}
/**
@@ -121,7 +121,7 @@ class UserVoter extends AbstractVoter
return true;
}
return $profile->getId() == $user->getId();
return $profile->getId() === $user->getId();
}
/**
@@ -131,7 +131,11 @@ class UserVoter extends AbstractVoter
*/
protected function canDelete(User $profile, User $user, TokenInterface $token)
{
return false;
if (!$this->canAdminUsers($token)) {
return false;
}
return $profile->getId() !== $user->getId();
}
/**
@@ -140,6 +144,6 @@ class UserVoter extends AbstractVoter
*/
protected function canAdminUsers(TokenInterface $token)
{
return $this->isFullyAuthenticated($token) && $this->hasRole('ROLE_SUPER_ADMIN', $token);
return $this->isFullyAuthenticated($token) && $this->hasRole(User::ROLE_SUPER_ADMIN, $token);
}
}