Remove guestid and guestgroup in favour of more reliable defaultgroup

[userbundle] / Checker / UserChecker.php

diff --git a/Checker/UserChecker.php b/Checker/UserChecker.php
index 744a35e37403228eb6a87b6030b93e346ffd0a09..dc1e531046993e3bfad695122aa0dc612b782b5b 100644 (file)
--- 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}
  */
@@ -38,6 +38,13 @@ class UserChecker extends InMemoryUserChecker {
                        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);
        }