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

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