From b0d5306023aac78416ac9373b55565b975826ecf Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sat, 8 Oct 2016 16:39:53 +0100
Subject: [PATCH 1/2] Add remember me functionality to login

---
 app/Http/Controllers/AuthController.php | 11 +++++------
 resources/lang/en/forms.php             |  1 +
 resources/views/auth/login.blade.php    |  6 ++++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 2c9e0689..ecfec734 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -44,26 +44,25 @@ class AuthController extends Controller
      */
     public function postLogin()
     {
-        $loginData = Binput::only(['username', 'password']);
+        $loginData = Binput::only(['username', 'password', 'remember_me']);
 
         // Login with username or email.
         $loginKey = filter_var($loginData['username'], FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
         $loginData[$loginKey] = array_pull($loginData, 'username');
 
+        $rememberUser = array_pull($loginData, 'remember_me') === '1';
+
         // Validate login credentials.
         if (Auth::validate($loginData)) {
-            // Log the user in for one request.
             Auth::once($loginData);
-            // Do we have Two Factor Auth enabled?
+
             if (Auth::user()->hasTwoFactor) {
-                // Temporarily store the user.
                 Session::put('2fa_id', Auth::user()->id);
 
                 return Redirect::route('auth.two-factor');
             }
 
-            // We probably want to add support for "Remember me" here.
-            Auth::attempt($loginData);
+            Auth::attempt($loginData, $rememberUser);
 
             event(new UserLoggedInEvent(Auth::user()));
 
diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php
index 6064a1a8..b2acf8d0 100644
--- a/resources/lang/en/forms.php
+++ b/resources/lang/en/forms.php
@@ -40,6 +40,7 @@ return [
         'invalid-token' => 'Invalid token',
         'cookies'       => 'You must enable cookies to login.',
         'rate-limit'    => 'Rate limit exceeded.',
+        'remember_me'   => 'Remember me',
     ],
 
     // Incidents form fields
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index a4537f53..28d2d60e 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -27,6 +27,12 @@
                     <label class="sr-only">{{ trans('forms.login.password') }}</label>
                     <input autocomplete="off" class="form-control login-input" placeholder="{{ trans('forms.login.password') }}" required="required" name="password" type="password" value="">
                 </div>
+                <div class="checkbox">
+                    <input type="hidden" name="remember_me" value="0">
+                    <label>
+                        <input name="remember_me" type="checkbox" value="1"> {{ trans('forms.login.remember_me') }}
+                    </label>
+                </div>
                 <div class="form-group">
                     <div class="row">
                         <div class="col-xs-2">

From e0fa69bc375882b8013792ae1640e08d9b91f6fc Mon Sep 17 00:00:00 2001
From: James Brooks <james@alt-three.com>
Date: Sat, 8 Oct 2016 15:40:07 +0000
Subject: [PATCH 2/2] Applied fixes from StyleCI

[ci skip] [skip ci]
---
 app/Http/Controllers/AuthController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index ecfec734..5593310a 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -19,7 +19,6 @@ use GrahamCampbell\Binput\Facades\Binput;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Redirect;
-use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\View;
 use PragmaRX\Google2FA\Vendor\Laravel\Facade as Google2FA;