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

Better 2fa handling

Browse Source
This commit is contained in:
James Cole
2017-02-17 20:15:17 +01:00
parent 48c26c5837
commit f7642beb7c
6 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ use Config;
use FireflyConfig;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\User;
use Illuminate\Cookie\CookieJar;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Http\Request;
use Lang;
@@ -74,23 +75,26 @@ class LoginController extends Controller
}
/**
* @param Request $request
* @param Request $request
* @param CookieJar $cookieJar
*
* @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @return $this
*/
public function logout(Request $request)
public function logout(Request $request, CookieJar $cookieJar)
{
if (intval(getenv('SANDSTORM')) === 1) {
return view('error')->with('message', strval(trans('firefly.sandstorm_not_available')));
}
$cookie = $cookieJar->forever('twoFactorAuthenticated', 'false');
$this->guard()->logout();
$request->session()->flush();
$request->session()->regenerate();
return redirect('/');
return redirect('/')->withCookie($cookie);
}
/**

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

@@ -13,14 +13,13 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Controllers\Auth;
use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Requests\TokenFormRequest;
use Illuminate\Cookie\CookieJar;
use Illuminate\Http\Request;
use Log;
use Preferences;
use Session;
/**
* Class TwoFactorController
@@ -84,12 +83,12 @@ class TwoFactorController extends Controller
*
* @return mixed
*/
public function postIndex(TokenFormRequest $request)
public function postIndex(TokenFormRequest $request, CookieJar $cookieJar)
{
Session::put('twoFactorAuthenticated', true);
Session::put('twoFactorAuthenticatedDate', new Carbon);
// set cookie!
$cookie = $cookieJar->forever('twoFactorAuthenticated', 'true');
return redirect(route('home'));
return redirect(route('home'))->withCookie($cookie);
}
}