Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Check for viaRemember

Browse Source
This commit is contained in:
Hillel Coren 2017-07-30 22:35:22 +03:00
parent 0487f4a677
commit 3fa08417e0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Middleware/DatabaseLookup.php
View File

@ -23,7 +23,11 @@ class DatabaseLookup
if ($code = $request->confirmation_code) { if ($code = $request->confirmation_code) {
LookupUser::setServerByField('confirmation_code', $code); LookupUser::setServerByField('confirmation_code', $code);
} elseif (session(SESSION_DB_SERVER)) { } elseif (session(SESSION_DB_SERVER)) {
// do nothing if (Auth::viaRemember()) {
Auth::logout();
} else {
// do nothing
}
} elseif (! Auth::check() && $email = $request->email) { } elseif (! Auth::check() && $email = $request->email) {
LookupUser::setServerByField('email', $email); LookupUser::setServerByField('email', $email);
} else { } else {

2
config/session.php
View File

@ -31,7 +31,7 @@ return [
'lifetime' => env('SESSION_LIFETIME', (60 * 8)), 'lifetime' => env('SESSION_LIFETIME', (60 * 8)),
'expire_on_close' => false, 'expire_on_close' => true,
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------