Fix user login by email

NNTmux · Sep 22, 2018 · b7fef38 · b7fef38
1 parent 656f0d6
commit b7fef38
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,5 @@
+2018-09-22 DariusIIi
+	* Fix: Fix user login by email
 2018-09-21 DariusIII
 	* Chg: Update install script to set admin as verified
 	* Chg: Update nesbot/carbon to version 1.34.0 and fancybox to latest

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -53,7 +53,15 @@ public function login(Request $request)
         ]);
 
         $error = '';
+        $login_type = filter_var($request->input('username'), FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
+
+        $request->merge([
+            $login_type => $request->input('username'),
+        ]);
         $user = User::getByUsername($request->input('username'));
+        if ($user === null) {
+            $user = User::getByEmail($request->input('username'));
+        }
 
         if ($user !== null && \Firewall::isBlacklisted($user->host) === false) {
             if (env('NOCAPTCHA_ENABLED') === true && (! empty(env('NOCAPTCHA_SECRET')) && ! empty(env('NOCAPTCHA_SITEKEY')))) {
@@ -64,12 +72,6 @@ public function login(Request $request)
 
             $rememberMe = $request->has('rememberme') && $request->input('rememberme') === 'on';
 
-            $login_type = filter_var($request->input('username'), FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
-
-            $request->merge([
-                $login_type => $request->input('username'),
-            ]);
-
             if ($user->isVerified() === false || $user->isPendingVerification()) {
                 return $this->showLoginForm('You have not verified your email address!');
             }