Merge pull request #1144 from gdebrauwer/find-and-validate-for-passport-password-grant

[8.x] Modify UserRepository to check for 'findAndValidateForPassport' method

Author: taylorotwell

src/Bridge/UserRepository.php

@@ -38,6 +38,16 @@ public function getUserEntityByUserCredentials($username, $password, $grantType,
             throw new RuntimeException('Unable to determine authentication model from configuration.');
         }
 
+        if (method_exists($model, 'findAndValidateForPassport')) {
+            $user = (new $model)->findAndValidateForPassport($username, $password);
+
+            if (! $user) {
+                return;
+            }
+
+            return new User($user->getAuthIdentifier());
+        }
+
         if (method_exists($model, 'findForPassport')) {
             $user = (new $model)->findForPassport($username);
         } else {