IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-08-26 13:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow mfa_recovery to get a default value

Browse Source
This commit is contained in:
Sander Dorigo
2026-08-25 09:08:48 +02:00
parent fd11b4e6d2
commit 1fcc86c44a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ProfileController.php
+1 -1
View File
@@ -197,7 +197,7 @@ final class ProfileController extends Controller
$subTitle = $user->email;
$userId = $user->id;
$enabled2FA = null !== $user->mfa_secret;
$recoveryData = Preferences::get('mfa_recovery', [])->data;
$recoveryData = Preferences::get('mfa_recovery', [], true)->data;
if (!is_array($recoveryData)) {
$recoveryData = [];
}
app/Support/Preferences.php
+4 -4
View File
@@ -116,7 +116,7 @@ class Preferences
Cache::put($key, '', 5);
}
public function get(string $name, array|bool|int|string|null $default = null): ?Preference
public function get(string $name, array|bool|int|string|null $default = null, bool $overrule = false): ?Preference
{
/** @var null|User $user */
$user = auth()->user();
@@ -127,7 +127,7 @@ class Preferences
return $preference;
}
return $this->getForUser($user, $name, $default);
return $this->getForUser($user, $name, $default, $overrule);
}
public function getArrayForUser(User $user, array $list): array
@@ -207,7 +207,7 @@ class Preferences
return $result;
}
public function getForUser(User $user, string $name, array|bool|int|string|null $default = null): ?Preference
public function getForUser(User $user, string $name, array|bool|int|string|null $default = null, bool $overrule = false): ?Preference
{
// Log::debug(sprintf('getForUser(#%d, "%s")', $user->id, $name));
// don't care about user group ID, except for some specific preferences.
@@ -239,7 +239,7 @@ class Preferences
return null;
}
return $this->setForUser($user, $name, $default);
return $this->setForUser($user, $name, $default, $overrule);
}
public function getFresh(string $name, array|bool|int|string|null $default = null): ?Preference