From b7fef38afdbd1fa110522a4826b7db0ab7f4da2d Mon Sep 17 00:00:00 2001 From: DariusIII Date: Sat, 22 Sep 2018 21:24:33 +0200 Subject: [PATCH] Fix user login by email --- Changelog | 2 ++ app/Http/Controllers/Auth/LoginController.php | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Changelog b/Changelog index 924bb5f32..a7cec57d3 100755 --- 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 index a00221829..87a887a9b 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -53,7 +53,15 @@ class LoginController extends Controller ]); $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 @@ class LoginController extends Controller $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!'); }