Merge pull request #50 from NottingHack/login-username-or-email

Login: allow both username and email to be used during login

Author: geeksareforlife

app/Http/Controllers/Auth/LoginController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Auth;
 
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 
@@ -36,4 +37,34 @@ public function __construct()
     {
         $this->middleware('guest', ['except' => 'logout']);
     }
+
+    /**
+     * Get the login username to be used by the controller.
+     * Overirden as you allow both username and email during login
+     * 
+     * @return string
+     */
+    public function username()
+    {
+        return 'login';
+    }
+
+    /**
+     * Get the needed authorization credentials from the request.
+     * Overirden as you allow both username and email during login
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    protected function credentials(Request $request)
+    {
+        $login = $request->get('login');
+        $field = filter_var($login, FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
+
+        return [
+            $field => $login,
+            'password' => $request->get('password'),
+        ];
+    }
+
 }

resources/views/auth/login.blade.php

@@ -4,19 +4,19 @@
 
 <h2>Log In</h2>
 
-<p>Enter your email address and password to log in.</p>
+<p>Enter your email address or username and password to log in.</p>
 
 <form role="form" method="POST" action="{{ url('/login') }}">
   {{ csrf_field() }}
 
   <div class="row">
-    <label for="email" class="form-label">E-Mail</label>
+    <label for="login" class="form-label">E-Mail or Username</label>
     <div class="form-control">
-      <input id="email" type="email" name="email" value="{{ old('email') }}" required autofocus>
+      <input id="login" type="text" name="login" value="{{ old('login') }}" required autofocus>
 
-      @if ($errors->has('email'))
+      @if ($errors->has('login'))
       <p class="help-text">
-        <strong>{{ $errors->first('email') }}</strong>
+        <strong>{{ $errors->first('login') }}</strong>
       </p>
       @endif
     </div>