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 some logic in the preferences controller.

Browse Source
This commit is contained in:
James Cole
2016-03-07 20:14:24 +01:00
parent 8828aa0621
commit e06dc86bf7
2 changed files with 50 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
app/Http/Controllers/PreferencesController.php
View File

@@ -2,14 +2,13 @@
use Auth; use Auth;
use Config; use Config;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use FireflyIII\Http\Requests\TokenFormRequest; use FireflyIII\Http\Requests\TokenFormRequest;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
use Input; use Input;
use PragmaRX\Google2FA\Contracts\Google2FA;
use Preferences; use Preferences;
use Response;
use Session; use Session;
use View; use View;
use PragmaRX\Google2FA\Contracts\Google2FA;
/** /**
* Class PreferencesController * Class PreferencesController
@@ -29,6 +28,15 @@ class PreferencesController extends Controller
View::share('mainTitleIcon', 'fa-gear'); View::share('mainTitleIcon', 'fa-gear');
} }
public function code(Google2FA $google2fa)
{
$secret = $google2fa->generateSecretKey(16, Auth::user()->id);
$image = $google2fa->getQRCodeInline("FireflyIII", null, $secret, 150);
return view('preferences.code', compact('secret', 'image'));
}
/** /**
* @param ARI $repository * @param ARI $repository
* *
@@ -36,31 +44,46 @@ class PreferencesController extends Controller
*/ */
public function index(ARI $repository) public function index(ARI $repository)
{ {
$accounts = $repository->getAccounts(['Default account', 'Asset account']); $accounts = $repository->getAccounts(['Default account', 'Asset account']);
$viewRangePref = Preferences::get('viewRange', '1M'); $viewRangePref = Preferences::get('viewRange', '1M');
$viewRange = $viewRangePref->data; $viewRange = $viewRangePref->data;
$frontPageAccounts = Preferences::get('frontPageAccounts', []); $frontPageAccounts = Preferences::get('frontPageAccounts', []);
$budgetMax = Preferences::get('budgetMaximum', 1000); $budgetMax = Preferences::get('budgetMaximum', 1000);
$language = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data; $language = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data;
$budgetMaximum = $budgetMax->data; $budgetMaximum = $budgetMax->data;
$customFiscalYear = Preferences::get('customFiscalYear', 0)->data; $customFiscalYear = Preferences::get('customFiscalYear', 0)->data;
$fiscalYearStartStr = Preferences::get('fiscalYearStart', '01-01')->data; $fiscalYearStartStr = Preferences::get('fiscalYearStart', '01-01')->data;
$fiscalYearStart = date('Y') . '-' . $fiscalYearStartStr; $fiscalYearStart = date('Y') . '-' . $fiscalYearStartStr;
$twoFactorAuthEnabled = Preferences::get('twoFactorAuthEnabled', 0)->data; $twoFactorAuthEnabled = Preferences::get('twoFactorAuthEnabled', 0)->data;
$hasTwoFactorAuthSecret = !is_null(Preferences::get('twoFactorAuthSecret'));
$hasTwoFactorAuthSecret = Preferences::get('twoFactorAuthSecret') != null && !empty(Preferences::get('twoFactorAuthSecret')->data); $showIncomplete = env('SHOW_INCOMPLETE_TRANSLATIONS', false) === true;
$showIncomplete = env('SHOW_INCOMPLETE_TRANSLATIONS', false) === true;
return view( return view(
'preferences.index', 'preferences.index',
compact( compact(
'budgetMaximum', 'language', 'accounts', 'frontPageAccounts', 'viewRange', 'customFiscalYear', 'fiscalYearStart', 'twoFactorAuthEnabled', 'hasTwoFactorAuthSecret', 'budgetMaximum', 'language', 'accounts', 'frontPageAccounts',
'showIncomplete' 'viewRange', 'customFiscalYear', 'fiscalYearStart', 'twoFactorAuthEnabled',
'hasTwoFactorAuthSecret', 'showIncomplete'
) )
); );
} }
/**
* @param TokenFormRequest $request
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function postCode(TokenFormRequest $request)
{
Preferences::set('twoFactorAuthEnabled', 1);
Preferences::set('twoFactorAuthSecret', $request->input('secret'));
Session::flash('success', 'Preferences saved!');
Preferences::mark();
return redirect(route('preferences'));
}
/** /**
* @return \Illuminate\Http\RedirectResponse * @return \Illuminate\Http\RedirectResponse
*/ */
@@ -88,18 +111,16 @@ class PreferencesController extends Controller
// custom fiscal year // custom fiscal year
$customFiscalYear = (int)Input::get('customFiscalYear'); $customFiscalYear = (int)Input::get('customFiscalYear');
$fiscalYearStart = date('m-d', strtotime(Input::get('fiscalYearStart')));
Preferences::set('customFiscalYear', $customFiscalYear); Preferences::set('customFiscalYear', $customFiscalYear);
$fiscalYearStart = date('m-d', strtotime(Input::get('fiscalYearStart')));
Preferences::set('fiscalYearStart', $fiscalYearStart); Preferences::set('fiscalYearStart', $fiscalYearStart);
// two factor auth // two factor auth
$twoFactorAuthEnabled = (int)Input::get('twoFactorAuthEnabled'); $twoFactorAuthEnabled = intval(Input::get('twoFactorAuthEnabled'));
$hasTwoFactorAuthSecret = !is_null(Preferences::get('twoFactorAuthSecret'));
$hasTwoFactorAuthSecret = Preferences::get('twoFactorAuthSecret') != null && !empty(Preferences::get('twoFactorAuthSecret')->data);
// If we already have a secret, just set the two factor auth enabled to 1, and let the user continue with the existing secret. // If we already have a secret, just set the two factor auth enabled to 1, and let the user continue with the existing secret.
if($hasTwoFactorAuthSecret) if ($hasTwoFactorAuthSecret) {
{
Preferences::set('twoFactorAuthEnabled', $twoFactorAuthEnabled); Preferences::set('twoFactorAuthEnabled', $twoFactorAuthEnabled);
} }
@@ -114,43 +135,12 @@ class PreferencesController extends Controller
Preferences::mark(); Preferences::mark();
// if we don't have a valid secret yet, redirect to the code page. // if we don't have a valid secret yet, redirect to the code page.
if(!$hasTwoFactorAuthSecret) // AND USER HAS ACTUALLY ENABLED 2FA
{ if (!$hasTwoFactorAuthSecret && $twoFactorAuthEnabled === 1) {
return redirect(route('preferences.code')); return redirect(route('preferences.code'));
} }
return redirect(route('preferences')); return redirect(route('preferences'));
} }
/*
* @param TokenFormRequest $request
*
* @return $this|\Illuminate\View\View
*/
public function postCode(TokenFormRequest $request)
{
Preferences::set('twoFactorAuthEnabled', 1);
Preferences::set('twoFactorAuthSecret', $request->input('secret'));
Session::flash('success', 'Preferences saved!');
Preferences::mark();
return redirect(route('preferences'));
}
/*
* @param Google2FA $google2fa
*
* @return $this|\Illuminate\View\View
*/
public function code(Google2FA $google2fa)
{
$secret = $google2fa->generateSecretKey(16, Auth::user()->id);
$image = $google2fa->getQRCodeInline("FireflyIII", null, $secret, 150);
return view('preferences.code', compact('secret', 'image'));
}
} }

2
resources/views/preferences/index.twig
View File

@@ -155,7 +155,7 @@
</div> </div>
</div> </div>
{% if twoFactorAuthEnabled == '1' and hasTwoFactorAuthSecret == true %} {% if twoFactorAuthEnabled == 1 and hasTwoFactorAuthSecret == true %}
<div class="col-sm-10"> <div class="col-sm-10">
<div class="checkbox"> <div class="checkbox">