From 616d921bef715e7b1cf429e68b1469067b3f1159 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 4 Aug 2019 07:09:51 +0200 Subject: [PATCH] Can disable MFA --- app/Http/Controllers/ProfileController.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index a82fe7065b..fcb89adbc0 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -231,9 +231,13 @@ class ProfileController extends Controller */ public function deleteCode() { - die('this method is deprecated.'); - app('preferences')->delete('twoFactorAuthEnabled'); - app('preferences')->delete('twoFactorAuthSecret'); + /** @var UserRepositoryInterface $repository */ + $repository = app(UserRepositoryInterface::class); + + /** @var User $user */ + $user = auth()->user(); + + $repository->setMFACode($user, null); session()->flash('success', (string)trans('firefly.pref_two_factor_auth_disabled')); session()->flash('info', (string)trans('firefly.pref_two_factor_auth_remove_it')); @@ -413,6 +417,9 @@ class ProfileController extends Controller session()->flash('success', (string)trans('firefly.saved_preferences')); app('preferences')->mark(); + // make sure MFA is logged out. + Google2FA::logout(); + return redirect(route('profile.index')); }