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

Index can now handle new MFA method.

Browse Source
This commit is contained in:
James Cole 2019-08-03 19:57:24 +02:00
parent e1e351aad7
commit 2554840714
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/ProfileController.php
View File

@ -257,12 +257,11 @@ class ProfileController extends Controller
*/
public function index()
{
die('remove or refactor references to 2FA before continuing.');
/** @var User $user */
$user = auth()->user();
$loginProvider = config('firefly.login_provider');
// check if client token thing exists (default one)
$count = DB::table('oauth_clients')
->where('personal_access_client', 1)
->whereNull('user_id')->count();
$count = DB::table('oauth_clients')->where('personal_access_client', 1)->whereNull('user_id')->count();
$this->createOAuthKeys();
@ -271,11 +270,9 @@ class ProfileController extends Controller
$repository = app(ClientRepository::class);
$repository->createPersonalAccessClient(null, config('app.name') . ' Personal Access Client', 'http://localhost');
}
$subTitle = auth()->user()->email;
$userId = auth()->user()->id;
$enabled2FA = 1 === (int)app('preferences')->get('twoFactorAuthEnabled', 0)->data;
/** @var User $user */
$user = auth()->user();
$subTitle = $user->email;
$userId = $user->id;
$enabled2FA = null !== $user->mfa_secret;
// get access token or create one.
$accessToken = app('preferences')->get('access_token', null);