IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Demo user cannot enable two factor auth.

Browse Source
This commit is contained in:
James Cole 2016-12-26 08:57:07 +01:00
parent 8f6a271cc0
commit 48209d0d22
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/HomeController.php
View File

@ -108,7 +108,7 @@ class HomeController extends Controller
$journal->save();
}
}
Session::forget(['start','end','viewRange','range','is_custom_range']);
Session::forget(['start', 'end', 'viewRange', 'range', 'is_custom_range']);
Session::clear();
Artisan::call('cache:clear');

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

@ -166,13 +166,17 @@ class PreferencesController extends Controller
Preferences::set('transactionPageSize', 50);
}
// two factor auth
$twoFactorAuthEnabled = intval($request->get('twoFactorAuthEnabled'));
$hasTwoFactorAuthSecret = !is_null(Preferences::get('twoFactorAuthSecret'));
$twoFactorAuthEnabled = false;
$hasTwoFactorAuthSecret = false;
if (!auth()->user()->hasRole('demo')) {
// two factor auth
$twoFactorAuthEnabled = intval($request->get('twoFactorAuthEnabled'));
$hasTwoFactorAuthSecret = !is_null(Preferences::get('twoFactorAuthSecret'));
// 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) {
Preferences::set('twoFactorAuthEnabled', $twoFactorAuthEnabled);
// 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) {
Preferences::set('twoFactorAuthEnabled', $twoFactorAuthEnabled);
}
}
// language: