minor #10448 Fixed the logic of the custom password authenticator (javiereguiluz)

javiereguiluz · javiereguiluz · commit e00007fa6075 · 2018-10-08T15:49:39.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- Fixed the logic of the custom password authenticator This finishes #10146. Commits ------- 2b1e5b5 Fixed the logic of the custom password authenticator
diff --git a/security/custom_password_authenticator.rst b/security/custom_password_authenticator.rst
@@ -68,29 +68,23 @@ the user::
                 }
             }
 
-            if ($isPasswordValid) {
-                $currentHour = date('G');
-                if ($currentHour < 14 || $currentHour > 16) {
-                    // CAUTION: this message will be returned to the client
-                    // (so don't put any un-trusted messages / error strings here)
-                    throw new CustomUserMessageAuthenticationException(
-                        'You can only log in between 2 and 4!',
-                        array(), // Message Data
-                        412 // HTTP 412 Precondition Failed
-                    );
-                }
-
-                return new UsernamePasswordToken(
-                    $user,
-                    $user->getPassword(),
-                    $providerKey,
-                    $user->getRoles()
+            $currentHour = date('G');
+            if ($currentHour < 14 || $currentHour > 16) {
+                // CAUTION: this message will be returned to the client
+                // (so don't put any un-trusted messages / error strings here)
+                throw new CustomUserMessageAuthenticationException(
+                    'You can only log in between 2 and 4!',
+                    array(), // Message Data
+                    412 // HTTP 412 Precondition Failed
                 );
             }
 
-            // CAUTION: this message will be returned to the client
-            // (so don't put any un-trusted messages / error strings here)
-            throw new CustomUserMessageAuthenticationException('Invalid username or password');
+            return new UsernamePasswordToken(
+                $user,
+                $user->getPassword(),
+                $providerKey,
+                $user->getRoles()
+            );
         }
 
         public function supportsToken(TokenInterface $token, $providerKey)
