diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 9a41c4d7..fff386bb 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -18,6 +18,7 @@ use Illuminate\Support\Facades\Redirect;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\View;
+use Illuminate\Support\Str;
use PragmaRX\Google2FA\Vendor\Laravel\Facade as Google2FA;
class AuthController extends Controller
@@ -40,7 +41,12 @@ class AuthController extends Controller
*/
public function postLogin()
{
- $loginData = Binput::only(['email', 'password']);
+ $loginData = Binput::only(['login', 'password']);
+
+ // Login with username or email.
+ $loginKey = Str::contains($loginData['login'], '@') ? 'email' : 'username';
+ $loginData[$loginKey] = array_pull($loginData, 'login');
+
// Validate login credentials.
if (Auth::validate($loginData)) {
// Log the user in for one request.
diff --git a/resources/lang/da/forms.php b/resources/lang/da/forms.php
index 347c6074..f79130b2 100755
--- a/resources/lang/da/forms.php
+++ b/resources/lang/da/forms.php
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
+ 'login' => 'Username or Email',
'email' => 'Email',
'password' => 'Kodeord',
'2fauth' => 'Godkendelses kode',
diff --git a/resources/lang/de/forms.php b/resources/lang/de/forms.php
index 0c7224ee..ce85d3e2 100755
--- a/resources/lang/de/forms.php
+++ b/resources/lang/de/forms.php
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
+ 'login' => 'Username or Email',
'email' => 'E-Mail',
'password' => 'Passwort',
'2fauth' => 'Authentifizierungscode',
diff --git a/resources/lang/en-UD/forms.php b/resources/lang/en-UD/forms.php
index 282a8bf5..2148e9da 100755
--- a/resources/lang/en-UD/forms.php
+++ b/resources/lang/en-UD/forms.php
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
+ 'login' => 'Username or Email',
'email' => 'crwdns217:0crwdne217:0',
'password' => 'crwdns381:0crwdne381:0',
'2fauth' => 'crwdns382:0crwdne382:0',
diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php
index 0cc9c2b0..df98ac38 100755
--- a/resources/lang/en/forms.php
+++ b/resources/lang/en/forms.php
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
+ 'login' => 'Username or Email',
'email' => 'Email',
'password' => 'Password',
'2fauth' => 'Authentication Code',
diff --git a/resources/lang/es/forms.php b/resources/lang/es/forms.php
index e2a586b5..3260a414 100755
--- a/resources/lang/es/forms.php
+++ b/resources/lang/es/forms.php
@@ -25,6 +25,7 @@ return [
// Login form fields
'login' => [
+ 'login' => 'Username or Email',
'email' => 'Correo electrónico',
'password' => 'Contraseña',
'2fauth' => 'Código de Autenticación',
diff --git a/resources/lang/fr/forms.php b/resources/lang/fr/forms.php
index f2d7e27f..0118276c 100755
--- a/resources/lang/fr/forms.php
+++ b/resources/lang/fr/forms.php
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
+ 'login' => 'Username or Email',
'email' => 'Email',
'password' => 'Mot de passe ',
'2fauth' => 'Code d\'authentification',
diff --git a/resources/lang/id/forms.php b/resources/lang/id/forms.php
index 37531b2b..4408f4e8 100755
--- a/resources/lang/id/forms.php
+++ b/resources/lang/id/forms.php
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
+ 'login' => 'Username or Email',
'email' => 'Email',
'password' => 'Password',
'2fauth' => 'Kode Otentikasi',
diff --git a/resources/lang/it/forms.php b/resources/lang/it/forms.php
index fbcca971..9d5794f3 100644
--- a/resources/lang/it/forms.php
+++ b/resources/lang/it/forms.php
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
+ 'login' => 'Username or Email',
'email' => 'Email',
'password' => 'Password',
'2fauth' => 'Codice di autenticazione',
diff --git a/resources/lang/ko/forms.php b/resources/lang/ko/forms.php
index 2f2e52cb..71373a00 100755
--- a/resources/lang/ko/forms.php
+++ b/resources/lang/ko/forms.php
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
+ 'login' => 'Username or Email',
'email' => '이메일',
'password' => '비밀번호',
'2fauth' => '인증 코드',
diff --git a/resources/lang/nl/forms.php b/resources/lang/nl/forms.php
index c69ebfa3..1fe83cc1 100755
--- a/resources/lang/nl/forms.php
+++ b/resources/lang/nl/forms.php
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
+ 'login' => 'Username or Email',
'email' => 'E-mail',
'password' => 'Wachtwoord',
'2fauth' => 'Authenticatie Code',
diff --git a/resources/lang/pl/forms.php b/resources/lang/pl/forms.php
index 40b8752f..c564f43f 100755
--- a/resources/lang/pl/forms.php
+++ b/resources/lang/pl/forms.php
@@ -25,6 +25,7 @@ return [
// Login form fields
'login' => [
+ 'login' => 'Username or Email',
'email' => 'Email',
'password' => 'Hasło',
'2fauth' => 'Kod autentykacji',
diff --git a/resources/lang/pt-BR/forms.php b/resources/lang/pt-BR/forms.php
index e7a10928..3bf9c4b2 100755
--- a/resources/lang/pt-BR/forms.php
+++ b/resources/lang/pt-BR/forms.php
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
+ 'login' => 'Username or Email',
'email' => 'Email',
'password' => 'Senha',
'2fauth' => 'Código de autenticação',
diff --git a/resources/lang/ru/forms.php b/resources/lang/ru/forms.php
index 72cb5114..b3ef473e 100644
--- a/resources/lang/ru/forms.php
+++ b/resources/lang/ru/forms.php
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
+ 'login' => 'Username or Email',
'email' => 'Эл. почта',
'password' => 'Пароль',
'2fauth' => 'Код аутентификации',
diff --git a/resources/lang/zh-CN/forms.php b/resources/lang/zh-CN/forms.php
index a7160aad..c40de56e 100755
--- a/resources/lang/zh-CN/forms.php
+++ b/resources/lang/zh-CN/forms.php
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
+ 'login' => '用户名或电子邮箱',
'email' => '电子邮箱',
'password' => '密码',
'2fauth' => '双因素验证代码',
diff --git a/resources/lang/zh-TW/forms.php b/resources/lang/zh-TW/forms.php
index f7bee1b9..2131363e 100644
--- a/resources/lang/zh-TW/forms.php
+++ b/resources/lang/zh-TW/forms.php
@@ -27,6 +27,7 @@ return [
// Login form fields
'login' => [
+ 'login' => 'Username or Email',
'email' => '電子郵箱',
'password' => '密碼',
'2fauth' => '雙因素驗證代碼',
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 205e640c..0cf8a5e6 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -30,8 +30,8 @@
@endif
-
-
+
+