From b22774a599eef3aed53922f61fe9c51f50b0cf75 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 7 Feb 2016 07:36:31 +0100
Subject: [PATCH] Logout blocked accounts.

---
 app/Http/Controllers/Auth/AuthController.php |  2 +-
 app/Http/Middleware/Authenticate.php         | 12 +++++++-----
 resources/lang/en_US/firefly.php             |  1 +
 resources/views/auth/login.twig              | 12 ++++++++++++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index c72dabfde4..10912a0eda 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -75,7 +75,7 @@ class AuthController extends Controller
         $foundUser = User::where('email', $credentials['email'])->where('blocked', 1)->first();
         if (!is_null($foundUser)) {
             // if it exists, show message:
-            $code = $foundUser->blocked_code;
+            $code = $foundUser->blocked_code ?? '';
 
             if (strlen($code) == 0) {
                 $code = 'general_blocked';
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index abc6be5c39..b0a1f9af9a 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -6,7 +6,7 @@ namespace FireflyIII\Http\Middleware;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-
+use Session;
 /**
  * Class Authenticate
  *
@@ -32,10 +32,12 @@ class Authenticate
                 return redirect()->guest('login');
             }
         } else {
-//            if (intval(Auth::user()->blocked) === 1) {
-//                Auth::guard($this->getGuard())->logout();
-//                return redirect()->guest('login');
-//            }
+            if (intval(Auth::user()->blocked) === 1) {
+                Auth::guard($guard)->logout();
+                Session::flash('logoutMessage', trans('firefly.block_account_logout'));
+
+                return redirect()->guest('login');
+            }
         }
 
         return $next($request);
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index e66602d6c2..6d090a6714 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -37,6 +37,7 @@ return [
     'new_revenue_account'                       => 'New revenue account',
     'new_budget'                                => 'New budget',
     'new_bill'                                  => 'New bill',
+    'block_account_logout'                      => 'You have been logged out. Blocked accounts cannot use this site. Did you register with a valid email address?',
 
     // export data:
     'import_and_export'                         => 'Import and export',
diff --git a/resources/views/auth/login.twig b/resources/views/auth/login.twig
index 7390c87879..c40e0b50af 100644
--- a/resources/views/auth/login.twig
+++ b/resources/views/auth/login.twig
@@ -14,6 +14,18 @@
         </div>
     {% endif %}
 
+    {% if session('logoutMessage') %}
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="alert alert-info alert-dismissible" role="alert">
+                    <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
+                    </button>
+                    {{ session('logoutMessage') }}
+                </div>
+            </div>
+        </div>
+    {% endif %}
+
     <div class="login-box-body">
         <p class="login-box-msg">Sign in to start your session</p>