Version 0.5.2

[userbundle] / Checker / UserChecker.php

diff --git a/Checker/UserChecker.php b/Checker/UserChecker.php
index e34284e92e0cd94a0b0c4c6416e442fda865c920..dc1e531046993e3bfad695122aa0dc612b782b5b 100644 (file)
--- a/Checker/UserChecker.php
+++ b/Checker/UserChecker.php
@@ -11,13 +11,13 @@
 
 namespace Rapsys\UserBundle\Checker;
 
 
 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 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}
  */
 /**
  * {@inheritdoc}
  */


@@ -32,17 +32,20 @@ class UserChecker extends InMemoryUserChecker {
                }
 
                //With not activated user
                }
 
                //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);

        }
 }
        }
 }