Merge pull request #5220 from turbo124/v5-develop

Fixes for default timeouts

app/Http/Controllers/Auth/LoginController.php

@@ -193,9 +193,9 @@ class LoginController extends BaseController
             }
 
             $user->setCompany($user->account->default_company);
-            $timeout = auth()->user()->company()->default_password_timeout;
+            // $timeout = auth()->user()->company()->default_password_timeout;
 
-            Cache::put(auth()->user()->hashed_id.'_logged_in', Str::random(64), $timeout);
+            // Cache::put(auth()->user()->hashed_id.'_logged_in', Str::random(64), $timeout);
 
             $cu = CompanyUser::query()
                   ->where('user_id', auth()->user()->id);

app/Http/Controllers/ConnectedAccountController.php

@@ -19,6 +19,7 @@ use App\Transformers\CompanyUserTransformer;
 use App\Transformers\UserTransformer;
 use Google_Client;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 
 class ConnectedAccountController extends BaseController
 {
@@ -111,6 +112,10 @@ class ConnectedAccountController extends BaseController
             auth()->user()->email_verified_at = now();
             auth()->user()->save();
             
+            $timeout = auth()->user()->company()->default_password_timeout;
+            Cache::put(auth()->user()->hashed_id.'_logged_in', Str::random(64), $timeout);
+
+
             return $this->itemResponse(auth()->user());
 
         }

app/Jobs/Company/CreateCompany.php

@@ -59,6 +59,7 @@ class CreateCompany
         $company->enabled_modules = config('ninja.enabled_modules');
         $company->subdomain = isset($this->request['subdomain']) ? $this->request['subdomain'] : '';
         $company->custom_fields = new \stdClass;
+        $company->default_password_timeout = 1800000;
         $company->save();
 
         return $company;

app/Mail/SupportMessageSent.php

@@ -45,7 +45,7 @@ class SupportMessageSent extends Mailable
 
             $log_file->seek(PHP_INT_MAX);
             $last_line = $log_file->key();
-            $lines = new LimitIterator($log_file, $last_line - 10, $last_line);
+            $lines = new LimitIterator($log_file, $last_line - 100, $last_line);
 
             $log_lines = iterator_to_array($lines);
         }