X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/c2a35920b8751374e24723703026f57a62ef41b6..8ca7256d7db44ec347b2324d2fabc928a99b3d5e:/Checker/UserChecker.php diff --git a/Checker/UserChecker.php b/Checker/UserChecker.php index e34284e..dc1e531 100644 --- a/Checker/UserChecker.php +++ b/Checker/UserChecker.php @@ -11,13 +11,13 @@ namespace Rapsys\UserBundle\Checker; +use Rapsys\UserBundle\Entity\User; +use Rapsys\UserBundle\Exception\UnactivatedException; + use Symfony\Component\Security\Core\User\InMemoryUserChecker; use Symfony\Component\Security\Core\Exception\DisabledException; use Symfony\Component\Security\Core\User\UserInterface; -use Rapsys\UserBundle\Entity\User; -use Rapsys\UserBundle\Exception\UnactivatedException; - /** * {@inheritdoc} */ @@ -32,17 +32,20 @@ class UserChecker extends InMemoryUserChecker { } //With not activated user - if (!$user->isActivated()) { - $ex = new UnactivatedException('Account is not activated'); - $ex->setUser($user); - throw $ex; - } - - //With disabled user - if ($user->isDisabled()) { - $ex = new DisabledException('Account is disabled'); - $ex->setUser($user); - throw $ex; - } + if (!$user->isActivated()) { + $ex = new UnactivatedException('User Account is not activated'); + $ex->setUser($user); + throw $ex; + } + + //With not enabled user + if (!$user->isEnabled()) { + $ex = new DisabledException('User account is not enabled'); + $ex->setUser($user); + throw $ex; + } + + //Call parent checkPreAuth + parent::checkPostAuth($user); } }