Skip to content

[UserManager] Some minor improvements #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hackzilla merged 1 commit into from
Apr 7, 2018
Merged

[UserManager] Some minor improvements #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions Manager/UserManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,39 @@

namespace Hackzilla\Bundle\TicketBundle\Manager;

use Doctrine\ORM\EntityRepository;
use Doctrine\Common\Persistence\ObjectRepository;
use Hackzilla\Bundle\TicketBundle\Model\TicketInterface;
use Hackzilla\Bundle\TicketBundle\Model\UserInterface;
use Hackzilla\Bundle\TicketBundle\TicketRole;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;

class UserManager implements UserManagerInterface
{
/**
* @var \Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface
* @var TokenStorageInterface
*/
private $tokenStorage;

/**
* @var \Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface
* @var AuthorizationCheckerInterface
*/
private $authorizationChecker;

/**
* @var \Doctrine\ORM\EntityRepository
* @var ObjectRepository
*/
private $userRepository;

/**
* @param TokenStorage $tokenStorage
* @param TokenStorageInterface $tokenStorage
* @param ObjectRepository $userRepository
* @param AuthorizationCheckerInterface $authorizationChecker
* @param EntityRepository $userRepository
*/
public function __construct(
TokenStorage $tokenStorage,
EntityRepository $userRepository,
TokenStorageInterface $tokenStorage,
ObjectRepository $userRepository,
AuthorizationCheckerInterface $authorizationChecker
) {
$this->tokenStorage = $tokenStorage;
Expand Down Expand Up @@ -66,9 +67,7 @@ public function getUserById($userId)
return;
}

$user = $this->userRepository->find($userId);

return $user;
return $this->userRepository->find($userId);
}

/**
Expand All @@ -85,8 +84,8 @@ public function hasRole(UserInterface $user, $role)
}

/**
* @param \Hackzilla\Bundle\TicketBundle\Model\UserInterface|string $user
* @param TicketInterface $ticket
* @param UserInterface|string $user
* @param TicketInterface $ticket
*/
public function hasPermission($user, TicketInterface $ticket)
{
Expand All @@ -95,7 +94,7 @@ public function hasPermission($user, TicketInterface $ticket)
TicketRole::ADMIN
) && $ticket->getUserCreated() != $user->getId())
) {
throw new \Symfony\Component\HttpKernel\Exception\HttpException(403);
throw new AccessDeniedHttpException();
}
}
}