kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-06-09 03:44:57 +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

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

@@ -101,7 +101,7 @@ class LoginController extends Controller
}
// forget 2fa cookie:
$cookie = $cookieJar->forever('twoFactorAuthenticated', 'false');
$request->session()->forget('twoFactorAuthenticated');
// is allowed to?
$singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
@@ -114,6 +114,7 @@ class LoginController extends Controller
$email = $request->old('email');
$remember = $request->old('remember');
return view('auth.login', compact('allowRegistration', 'email', 'remember'))->withCookie($cookie);
return view('auth.login', compact('allowRegistration', 'email', 'remember'));//->withCookie($cookie);
}
}

6
app/Http/Controllers/Auth/TwoFactorController.php
View File

@@ -96,9 +96,9 @@ class TwoFactorController extends Controller
*/
public function postIndex(TokenFormRequest $request, CookieJar $cookieJar)
{
// set cookie!
$cookie = $cookieJar->forever('twoFactorAuthenticated', 'true');
// update session, not cookie:
$request->session()->put('twoFactorAuthenticated', true);
return redirect(route('home'))->withCookie($cookie);
return redirect(route('home'));
}
}