Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 08:51:34 +02:00
Code Issues Releases Activity

Merge pull request #5220 from turbo124/v5-develop

Browse Source 
Fixes for default timeouts
This commit is contained in:
David Bomba 2021-03-22 21:55:25 +11:00 committed by GitHub
commit 22f81a036f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Auth/LoginController.php
View File

@ -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);

5
app/Http/Controllers/ConnectedAccountController.php
View File

@ -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());
}

1
app/Jobs/Company/CreateCompany.php
View File

@ -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;

2
app/Mail/SupportMessageSent.php
View File

@ -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);
}