kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix for #1002

Browse Source
This commit is contained in:
James Cole
2017-11-18 16:30:45 +01:00
parent 5f127b7bec
commit e8e0a44cca
11 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Middleware/AuthenticateTwoFactor.php
View File

@@ -64,8 +64,8 @@ class AuthenticateTwoFactor
$is2faEnabled = Preferences::get('twoFactorAuthEnabled', false)->data;
$has2faSecret = null !== Preferences::get('twoFactorAuthSecret');
// grab 2auth information from cookie, not from session.
$is2faAuthed = 'true' === Cookie::get('twoFactorAuthenticated');
// grab 2auth information from session.
$is2faAuthed = true === $request->session()->get('twoFactorAuthenticated');
if ($is2faEnabled && $has2faSecret && !$is2faAuthed) {
Log::debug('Does not seem to be 2 factor authed, redirect.');

4
app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php
View File

@@ -47,8 +47,8 @@ class RedirectIfTwoFactorAuthenticated
$is2faEnabled = Preferences::get('twoFactorAuthEnabled', false)->data;
$has2faSecret = null !== Preferences::get('twoFactorAuthSecret');
// grab 2auth information from cookie
$is2faAuthed = 'true' === Cookie::get('twoFactorAuthenticated');
// grab 2auth information from session.
$is2faAuthed = true === $request->session()->get('twoFactorAuthenticated');
if ($is2faEnabled && $has2faSecret && $is2faAuthed) {
return redirect('/');