Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Update cookie names.
James Cole14783702bce4
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.ymlindex 51942d5e26..39d3da1e21 100644--- a/.github/ISSUE_TEMPLATE/bug.yml+++ b/.github/ISSUE_TEMPLATE/bug.yml@@ -8,6 +8,13 @@ body:options:- label: I'm smart and I read the <!-- MZ2udTpin6FL --> [support guidelines](https://github.com/firefly-iii/firefly-iii/blob/main/.github/support.md)required: true+ - type: checkboxes+ attributes:+ label: Use of AI+ description: AI agents like Claude and CoPilot are not reliable tools. Do not use them.+ options:+ - label: I'm a real person and wrote this bug without assistance from AI.+ required: true- type: checkboxesattributes:@@ -22,6 +29,7 @@ body:attributes:label: Descriptiondescription: Please provide a brief description of the bug in 1-2 sentences.+ placeholder: Please DO NOT use AI / LLM to write the description for you.validations:required: true@@ -48,3 +56,4 @@ body:attributes:label: Additional infodescription: Please provide any additional information that seems useful.+ placeholder: Please DO NOT use AI / LLM to write the additional info for you.diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.phpindex 052197a2c0..d654448167 100644--- a/app/Http/Controllers/Auth/LoginController.php+++ b/app/Http/Controllers/Auth/LoginController.php@@ -161,7 +161,7 @@ final class LoginController extends Controller}// also logout current 2FA tokens.- $cookieName = config('google2fa.cookie_name', 'google2fa_token');+ $cookieName = config('google2fa.cookie_name', 'firefly_iii_mfa_token');Cookie::forget($cookieName);$this->guard()->logout();@@ -217,7 +217,7 @@ final class LoginController extends Controller$storeInCookie = config('google2fa.store_in_cookie', false);if (false !== $storeInCookie) {- $cookieName = config('google2fa.cookie_name', 'google2fa_token');+ $cookieName = config('google2fa.cookie_name', 'firefly_iii_mfa_token');Cookie::queue(Cookie::make($cookieName, 'invalid-'.Carbon::now()->getTimestamp()));}$usernameField = $this->username();diff --git a/app/Http/Controllers/Profile/MfaController.php b/app/Http/Controllers/Profile/MfaController.phpindex 3bc5cb6e8c..05d2d45e4d 100644--- a/app/Http/Controllers/Profile/MfaController.php+++ b/app/Http/Controllers/Profile/MfaController.php@@ -172,7 +172,7 @@ final class MfaController extends Controllersession()->flash('info', (string) trans('firefly.pref_two_factor_auth_remove_it'));// also logout current 2FA tokens.- $cookieName = config('google2fa.cookie_name', 'google2fa_token');+ $cookieName = config('google2fa.cookie_name', 'firefly_iii_mfa_token');Cookie::forget($cookieName);// send user notification.diff --git a/config/google2fa.php b/config/google2fa.phpindex 1e1d1d7402..cd615ccc3c 100644--- a/config/google2fa.php+++ b/config/google2fa.php@@ -46,7 +46,8 @@ return [// 2FA verified session var- 'session_var' => 'google2fa',+ 'session_var' => 'firefly_iii_mfa',+ 'cookie_name' => 'firefly_iii_mfa_token',// One Time Password request input name'otp_input' => 'one_time_password',