X-Git-Url: https://git.rapsys.eu/.gitweb.cgi/userbundle/blobdiff_plain/49d823e99f9815fca231b76aceef894531e7b42c..HEAD:/Checker/UserChecker.php

diff --git a/Checker/UserChecker.php b/Checker/UserChecker.php
index 744a35e..51b6fa9 100644
--- a/Checker/UserChecker.php
+++ b/Checker/UserChecker.php
@@ -11,13 +11,14 @@
 
 namespace Rapsys\UserBundle\Checker;
 
-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;
 
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Exception\DisabledException;
+use Symfony\Component\Security\Core\User\InMemoryUserChecker;
+use Symfony\Component\Security\Core\User\UserInterface;
+
 /**
  * {@inheritdoc}
  */
@@ -25,7 +26,7 @@ class UserChecker extends InMemoryUserChecker {
 	/**
 	 * {@inheritdoc}
 	 */
-	public function checkPostAuth(UserInterface $user): void {
+	public function checkPostAuth(UserInterface $user, ?TokenInterface $token = null): void {
 		//Without User instance
 		if (!$user instanceof User) {
 			return;
@@ -38,6 +39,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);
 	}