mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
This fixes #572
This commit is contained in:
parent
c8f6b42ce6
commit
8bfcc3315a
@ -17,6 +17,7 @@ use Carbon\Carbon;
|
||||
use FireflyIII\Exceptions\FireflyException;
|
||||
use FireflyIII\Http\Controllers\Controller;
|
||||
use FireflyIII\Http\Requests\TokenFormRequest;
|
||||
use Illuminate\Http\Request;
|
||||
use Log;
|
||||
use Preferences;
|
||||
use Session;
|
||||
@ -30,11 +31,14 @@ class TwoFactorController extends Controller
|
||||
{
|
||||
|
||||
/**
|
||||
* @return mixed
|
||||
* @param Request $request
|
||||
*
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View
|
||||
* @throws FireflyException
|
||||
*/
|
||||
public function index()
|
||||
public function index(Request $request)
|
||||
{
|
||||
|
||||
$user = auth()->user();
|
||||
|
||||
// to make sure the validator in the next step gets the secret, we push it in session
|
||||
@ -50,7 +54,7 @@ class TwoFactorController extends Controller
|
||||
if (strlen(strval($secret)) === 0) {
|
||||
throw new FireflyException('Your two factor authentication secret is empty, which it cannot be at this point. Please check the log files.');
|
||||
}
|
||||
Session::flash('two-factor-secret', $secret);
|
||||
$request->session()->flash('two-factor-secret', $secret);
|
||||
|
||||
return view('auth.two-factor', compact('user', 'title'));
|
||||
}
|
||||
|
@ -13,6 +13,7 @@ namespace FireflyIII\Http\Controllers;
|
||||
|
||||
use Amount;
|
||||
use FireflyIII\Exceptions\FireflyException;
|
||||
use Illuminate\Http\Request;
|
||||
use Navigation;
|
||||
use Preferences;
|
||||
use Session;
|
||||
@ -28,7 +29,7 @@ class JavascriptController extends Controller
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function variables()
|
||||
public function variables(Request $request)
|
||||
{
|
||||
$picker = $this->getDateRangePicker();
|
||||
$start = Session::get('start');
|
||||
@ -52,6 +53,7 @@ class JavascriptController extends Controller
|
||||
'localeconv' => $localeconv,
|
||||
'language' => $lang,
|
||||
];
|
||||
$request->session()->keep(['two-factor-secret']);
|
||||
|
||||
return response()
|
||||
->view('javascript.variables', $data, 200)
|
||||
|
@ -56,9 +56,9 @@ class PreferencesController extends Controller
|
||||
{
|
||||
$domain = $this->getDomain();
|
||||
/** @noinspection PhpMethodParametersCountMismatchInspection */
|
||||
$secret = $google2fa->generateSecretKey(16, auth()->user()->id);
|
||||
$secret = $google2fa->generateSecretKey(32, auth()->user()->id);
|
||||
Session::flash('two-factor-secret', $secret);
|
||||
$image = $google2fa->getQRCodeInline('Firefly III at ' . $domain, null, $secret, 150);
|
||||
$image = $google2fa->getQRCodeInline('Firefly III at ' . $domain, auth()->user()->email, $secret, 150);
|
||||
|
||||
|
||||
return view('preferences.code', compact('image'));
|
||||
|
Loading…
Reference in New Issue
Block a user