kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 22:58:09 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-05-24

Browse Source
This commit is contained in:
JC5
2025-05-24 06:24:17 +02:00
parent 1ec5ee08aa
commit 63d051d9ba
63 changed files with 203 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Profile/MfaController.php
View File

@@ -25,8 +25,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Profile;
use Carbon\Carbon;
use Cookie;
use Google2FA;
use FireflyIII\Events\Security\DisabledMFA;
use FireflyIII\Events\Security\EnabledMFA;
use FireflyIII\Events\Security\MFANewBackupCodes;
@@ -184,7 +182,7 @@ class MfaController extends Controller
// also logout current 2FA tokens.
$cookieName = config('google2fa.cookie_name', 'google2fa_token');
Cookie::forget($cookieName);
\Cookie::forget($cookieName);
// send user notification.
Log::channel('audit')->info(sprintf('User "%s" has disabled MFA', $user->email));
@@ -217,8 +215,8 @@ class MfaController extends Controller
}
$domain = $this->getDomain();
$secret = Google2FA::generateSecretKey();
$image = Google2FA::getQRCodeInline($domain, auth()->user()->email, $secret);
$secret = \Google2FA::generateSecretKey();
$image = \Google2FA::getQRCodeInline($domain, auth()->user()->email, $secret);
app('preferences')->set('temp-mfa-secret', $secret);
@@ -274,7 +272,7 @@ class MfaController extends Controller
// make sure MFA is logged out.
if ('testing' !== config('app.env')) {
Google2FA::logout();
\Google2FA::logout();
}
// drop all info from session: