From 02c300e9f9cc369affc4e37a163206de46ae976d Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 30 Oct 2016 11:23:36 +0200
Subject: [PATCH] Prevent session history from showing as blank

---
 app/Http/Kernel.php                           |  1 -
 .../Middleware/SessionDataCheckMiddleware.php | 31 -------------------
 app/Http/Middleware/StartupCheck.php          |  4 +--
 3 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 app/Http/Middleware/SessionDataCheckMiddleware.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 23ed4f62cab4..b20e0b754465 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -18,7 +18,6 @@ class Kernel extends HttpKernel {
 		'App\Http\Middleware\VerifyCsrfToken',
         'App\Http\Middleware\DuplicateSubmissionCheck',
 		'App\Http\Middleware\QueryLogging',
-        'App\Http\Middleware\SessionDataCheckMiddleware',
         'App\Http\Middleware\StartupCheck',
 	];
 
diff --git a/app/Http/Middleware/SessionDataCheckMiddleware.php b/app/Http/Middleware/SessionDataCheckMiddleware.php
deleted file mode 100644
index c626fa6ee88f..000000000000
--- a/app/Http/Middleware/SessionDataCheckMiddleware.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php namespace App\Http\Middleware;
-
-use Closure;
-use Auth;
-use Session;
-
-// https://arjunphp.com/laravel5-inactivity-idle-session-logout/
-class SessionDataCheckMiddleware {
-
-    /**
-     * Check session data, if role is not valid logout the request
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $bag = Session::getMetadataBag();
-        $max = env('IDLE_TIMEOUT_MINUTES', 6 * 60) * 60; // minute to second conversion
-        $elapsed = time() - $bag->getLastUsed();
-
-        if ( ! $bag || $elapsed > $max) {
-            $request->session()->flush();
-            Auth::logout();
-            $request->session()->flash('warning', trans('texts.inactive_logout'));
-        }
-
-        return $next($request);
-    }
-}
diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php
index 54d81033e1fd..776974a8946c 100644
--- a/app/Http/Middleware/StartupCheck.php
+++ b/app/Http/Middleware/StartupCheck.php
@@ -13,7 +13,7 @@ use Event;
 use Schema;
 use App\Models\Language;
 use App\Models\InvoiceDesign;
-use App\Events\UserSettingsChanged;
+use App\Events\UserLoggedIn;
 use App\Libraries\CurlUtils;
 
 /**
@@ -118,7 +118,7 @@ class StartupCheck
 
         // Make sure the account/user localization settings are in the session
         if (Auth::check() && !Session::has(SESSION_TIMEZONE)) {
-            Event::fire(new UserSettingsChanged());
+            Event::fire(new UserLoggedIn());
         }
 
         // Check if the user is claiming a license (ie, additional invoices, white label, etc.)