From 7bae9e271f85ef24c70dc9e236d3369c0622101e Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Mon, 29 Jun 2020 18:26:33 +0300
Subject: [PATCH] =?UTF-8?q?#1733=20Patron=20yar=C4=B1s=C4=B1=20-=20expense?=
 =?UTF-8?q?=20showing=20data=20(rapor=20g=C3=B6sterilmesi)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Validation/ValidateCredentials.php        | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php b/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php
index 78d7307ce..8ffc7b96c 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php
@@ -4,31 +4,28 @@ use Anomaly\Streams\Platform\Addon\Extension\ExtensionCollection;
 use Anomaly\UsersModule\User\Authenticator\Contract\AuthenticatorExtensionInterface;
 use Anomaly\UsersModule\User\Contract\UserInterface;
 use Anomaly\UsersModule\User\Contract\UserRepositoryInterface;
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Http\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Visiosoft\ProfileModule\Profile\Events\SendEmptyPassword;
 use Visiosoft\ProfileModule\Profile\SignIn\SignInFormBuilder;
 
+
 class ValidateCredentials
 {
     private $extensions;
     private $repository;
     private $dispatcher;
-    private $config;
 
     public function __construct(
         ExtensionCollection $extensions,
         UserRepositoryInterface $userRepository,
-        Dispatcher $dispatcher,
-        Repository $config
+        Dispatcher $dispatcher
     )
     {
         $this->extensions = $extensions;
         $this->repository = $userRepository;
         $this->dispatcher = $dispatcher;
-        $this->config = $config;
     }
 
     public function authenticate(array $credentials)
@@ -40,22 +37,20 @@ class ValidateCredentials
         /* @var AuthenticatorExtensionInterface $authenticator */
         foreach ($authenticators as $authenticator) {
             if ($authenticator->slug == "default_authenticator") {
-                $method = $this->config->get('anomaly.module.users::config.login');
-
-                if (!isset($credentials['password']) && !isset($credentials[$method])) {
+                if (!isset($credentials['password']) && !isset($credentials['email'])) {
                     $response = null;
                 }
 
                 //Is email/username or phone number
-                if (!filter_var($credentials[$method], FILTER_VALIDATE_EMAIL)) {
-                    $possiblePhone = $credentials[$method];
-                    if (substr($credentials[$method], 0, 1) == 0) {
-                        $possiblePhone = substr($credentials[$method], 1);
+                if (!filter_var($credentials['email'], FILTER_VALIDATE_EMAIL)) {
+                    $possiblePhone = $credentials['email'];
+                    if (substr($credentials['email'], 0, 1) == 0) {
+                        $possiblePhone = substr($credentials['email'], 1);
                     }
                     if ($user = $this->repository
                         ->newQuery()
                         ->where('gsm_phone', 'LIKE', "%$possiblePhone")->first()) {
-                        $credentials[$method] = $user->email;
+                        $credentials['email'] = $user->email;
                     }
                 }
                 $response = $this->repository->findByCredentials($credentials);