Merge pull request #12163 from firefly-iii/release-1776658280

🤖 Automatically merge the PR into the develop branch.

app/Console/Commands/Upgrade/RepairsPostgresSequences.php

@@ -26,7 +26,9 @@ namespace FireflyIII\Console\Commands\Upgrade;
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;
+use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class RepairsPostgresSequences extends Command
 {
@@ -72,8 +74,6 @@ class RepairsPostgresSequences extends Command
             'locations',
             'migrations',
             'notes',
-            'oauth_clients',
-            'oauth_personal_access_clients',
             'object_groups',
             'permissions',
             'piggy_bank_events',
@@ -106,11 +106,23 @@ class RepairsPostgresSequences extends Command
         foreach ($tablesToCheck as $tableToCheck) {
             $this->friendlyLine(sprintf('Checking the next id sequence for table "%s".', $tableToCheck));
 
-            $highestId = DB::table($tableToCheck)->select(DB::raw('MAX(id)'))->first();
-            $nextId    = DB::table($tableToCheck)
-                ->select(DB::raw(sprintf('nextval(\'%s_id_seq\')', $tableToCheck)))
-                ->first()
-            ;
+            try {
+                $highestId = DB::table($tableToCheck)->select(DB::raw('MAX(id)'))->first();
+            } catch (QueryException $e) {
+                Log::warning(sprintf('Could not select max, but will ignore this: %s', $e->getMessage()));
+
+                continue;
+            }
+
+            try {
+                $nextId = DB::table($tableToCheck)
+                    ->select(DB::raw(sprintf('nextval(\'%s_id_seq\')', $tableToCheck)))
+                    ->first()
+                ;
+            } catch (QueryException $e) {
+                Log::warning(sprintf('Could not get nextval, but will ignore this: %s', $e->getMessage()));
+                $nextId = null;
+            }
             if (null === $nextId) {
                 $this->friendlyInfo(sprintf('nextval is NULL for table "%s", go to next table.', $tableToCheck));
 

app/Http/Controllers/Profile/OAuthController.php

@@ -25,7 +25,6 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Profile;
 
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Http\Middleware\IsDemoUser;
 use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\JsonResponse;
@@ -59,8 +58,6 @@ final class OAuthController extends Controller
         $authGuard          = config('firefly.authentication_guard');
         $this->internalAuth = 'web' === $authGuard;
         Log::debug(sprintf('ProfileController::__construct(). Authentication guard is "%s"', $authGuard));
-
-        $this->middleware(IsDemoUser::class)->except(['index']);
     }
 
     public function destroyClient(Request $request, string $clientId): Response
@@ -118,6 +115,7 @@ final class OAuthController extends Controller
 
     public function listClients(): JsonResponse
     {
+        Log::debug('Now in listClients()');
         // Retrieving all the OAuth app clients that belong to the user...
         $clients = auth()->user()->oauthApps()->where('revoked', false)->get();
         $array   = [];

app/Http/Middleware/SecureHeaders.php

@@ -129,7 +129,7 @@ class SecureHeaders
                 $response->header('Content-Security-Policy', implode('; ', $csp));
             }
             if (!method_exists($response, 'header')) {
-                $response->header('Content-Security-Policy', implode('; ', $csp));
+                $response->headers->set('Content-Security-Policy', implode('; ', $csp));
             }
         }
         if (method_exists($response, 'header')) {

changelog.md

@@ -3,12 +3,40 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## v6.6.1 - 2026-04-19
+
+<!-- summary: This releases upgrades many dependencies and will invalidate all of your OAuth-tokens and clients. -->
+
+> [!WARNING]
+> This releases will invalidate ALL of your OAuth-tokens and clients. Integrations with Home Assistant, AI-agents or the Firefly III Data Importer must be reconfigured with newly generated tokens. Old tokens and clients will no longer work. Sorry about that.
+
+### Changed
+
+- Updated many dependencies, amongst which are some backwards incompatible ones. Sorry about your OAuth-tokens.
+
+### Fixed
+
+- [Issue 12029](https://github.com/firefly-iii/firefly-iii/issues/12029) (PrimaryAmountRecalculationService - Attempt to read property "data" on null.) reported by @MihataBG
+- [Issue 12030](https://github.com/firefly-iii/firefly-iii/issues/12030) (Rule engine fires twice in some cases) reported by @Robubble
+- [Issue 12034](https://github.com/firefly-iii/firefly-iii/issues/12034) (The new Piggy Banks accounts are not being displayed properly grouped in the record creation form) reported by @jgmm81
+- [Issue 12035](https://github.com/firefly-iii/firefly-iii/issues/12035) (Foreign currency account value in primary currency does not update after changing exchange rates (Dashboard)) reported by @gattacus
+- [Issue 12043](https://github.com/firefly-iii/firefly-iii/issues/12043) (Detail in the Running balance indicator through the Liabilities accounts (multi currencies)) reported by @jgmm81
+- [Discussion 12044](https://github.com/orgs/firefly-iii/discussions/12044) (Very slow startup) started by @pelaxa
+- [Issue 12056](https://github.com/firefly-iii/firefly-iii/issues/12056) (Details regarding the Note records in the Database and the "Purge data from Firefly III" function) reported by @jgmm81
+- [Issue 12063](https://github.com/firefly-iii/firefly-iii/issues/12063) (Cannot set budget higher than 268435456) reported by @Permagate
+- [Issue 12066](https://github.com/firefly-iii/firefly-iii/issues/12066) (Email notifications ignore user language preferences) reported by @examosa
+- [Issue 12070](https://github.com/firefly-iii/firefly-iii/issues/12070) (can't add money to piggy bank) reported by @4e868df3
+- [Issue 12081](https://github.com/firefly-iii/firefly-iii/issues/12081) (Discord changes webhook domain) reported by @MinDBreaK
+- [Issue 12083](https://github.com/firefly-iii/firefly-iii/issues/12083) (Hide or remove the Ntfy fields if they dont work.) reported by @OrakMoya
+- [Issue 12107](https://github.com/firefly-iii/firefly-iii/issues/12107) (Exception sending test email notification) reported by @antrv
+- [Issue 12154](https://github.com/firefly-iii/firefly-iii/issues/12154) (Error on artisan firefly-iii:upgrade-database v6.6.0) reported by @Tealk
+
 ## v6.6.0 - 2026-04-19
 
 <!-- summary: This releases upgrades many dependencies and will invalidate all of your OAuth-tokens and clients. -->
 
 > [!WARNING]
-> This releases will invalidate ALL of your OAuth-tokens and clients. Sorry about that.
+> This releases will invalidate ALL of your OAuth-tokens and clients. Integrations with Home Assistant, AI-agents or the Firefly III Data Importer must be reconfigured with newly generated tokens. Old tokens and clients will no longer work. Sorry about that.
 
 ### Changed
 
@@ -28,6 +56,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - [Issue 12070](https://github.com/firefly-iii/firefly-iii/issues/12070) (can't add money to piggy bank) reported by @4e868df3
 - [Issue 12081](https://github.com/firefly-iii/firefly-iii/issues/12081) (Discord changes webhook domain) reported by @MinDBreaK
 - [Issue 12083](https://github.com/firefly-iii/firefly-iii/issues/12083) (Hide or remove the Ntfy fields if they dont work.) reported by @OrakMoya
+- [Issue 12107](https://github.com/firefly-iii/firefly-iii/issues/12107) (Exception sending test email notification) reported by @antrv
 
 ## v6.5.9 - 2026-03-23
 

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => (bool)envDefaultWhenEmpty(env('USE_RUNNING_BALANCE'), true), // this is only the default value, is not used.
         // see cer.php for exchange rates feature flag.
     ],
-'version' => 'develop/2026-04-18',
-'build_time' => 1776513742,
+'version' => 'develop/2026-04-20',
+'build_time' => 1776658280,
     'api_version'                          => '2.1.0', // field is no longer used.
     'db_version'                           => 28, // field is no longer used.
 

package-lock.json

@@ -3569,9 +3569,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.15.0",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.0.tgz",
-            "integrity": "sha512-wWyJDlAatxk30ZJer+GeCWS209sA42X+N5jU2jy6oHTp7ufw8uzUTVFBX9+wTfAlhiJXGS0Bq7X6efruWjuK9Q==",
+            "version": "1.15.1",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.1.tgz",
+            "integrity": "sha512-WOG+Jj8ZOvR0a3rAn+Tuf1UQJRxw5venr6DgdbJzngJE3qG7X0kL83CZGpdHMxEm+ZK3seAbvFsw4FfOfP9vxg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3681,9 +3681,9 @@
             "license": "MIT"
         },
         "node_modules/baseline-browser-mapping": {
-            "version": "2.10.19",
-            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.19.tgz",
-            "integrity": "sha512-qCkNLi2sfBOn8XhZQ0FXsT1Ki/Yo5P90hrkRamVFRS7/KV9hpfA4HkoWNU152+8w0zPjnxo5psx5NL3PSGgv5g==",
+            "version": "2.10.20",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.20.tgz",
+            "integrity": "sha512-1AaXxEPfXT+GvTBJFuy4yXVHWJBXa4OdbIebGN/wX5DlsIkU0+wzGnd2lOzokSk51d5LUmqjgBLRLlypLUqInQ==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -6646,9 +6646,9 @@
             }
         },
         "node_modules/i18next": {
-            "version": "26.0.5",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.0.5.tgz",
-            "integrity": "sha512-9uHb4T27TdV36phJXcbpnRPt5yzAfqHXVrdASvmHZyPuZJtrLythd+GyXhiaHV5LlpuuskbAqhwPjmfTbKbi8w==",
+            "version": "26.0.6",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.0.6.tgz",
+            "integrity": "sha512-A4U6eCXodIbrhf8EarRurB9/4ebyaurH4+fu4gig9bqxmpSt+fCAFm/GpRQDcN1Xzu/LdFCx4nYHsnM1edIIbg==",
             "funding": [
                 {
                     "type": "individual",
@@ -6686,9 +6686,9 @@
             }
         },
         "node_modules/i18next-http-backend": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-3.0.4.tgz",
-            "integrity": "sha512-udwrBIE6cNpqn1gRAqRULq3+7MzIIuaiKRWrz++dVz5SqWW2VwXmPJtAgkI0JtMLFaADC9qNmnZAxWAhsxXx2g==",
+            "version": "3.0.5",
+            "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-3.0.5.tgz",
+            "integrity": "sha512-QaWHnsxieEDcqKe+vo/RFqpiIFRi/KBqlOSPcUlvinBaISCeiTRCbtrazHAjtHtsLC66oDsROAH8frWkQzfMMQ==",
             "license": "MIT",
             "dependencies": {
                 "cross-fetch": "4.1.0"

resources/assets/v1/src/locales/fr.json

@@ -1,8 +1,8 @@
 {
     "firefly": {
-        "explain_pats": "Personal Access Tokens are long lived (with a maximum of 1 year) keys that allow direct and unlimited access to your Firefly III data. Tools like the Firefly III Data Importer and the Firefly III integration in Home Assistant use such tokens to connect to Firefly III and do their thing. When you create a token, it is only visible once. The token is also very long.",
-        "profile_oauth_clients_explain": "An OAuth client can be used to connect \"smart\" applications to Firefly III: applications that are capable of redirecting you to your Firefly III, get your permission, and return you back. The Firefly III Data Importer is such an application. OAuth clients can be generated with or without a \"secret\". This secret is used to authenticate the client. Since not all clients are capable of storing the secret, so you have the option to generate a client without one.",
-        "regenerate_secret": "Regenerate secret",
+        "explain_pats": "Les jetons d'acc\u00e8s personnels sont des cl\u00e9s de longue dur\u00e9e (avec un maximum de 1 an) qui permettent un acc\u00e8s direct et illimit\u00e9 \u00e0 vos donn\u00e9es Firefly III. Des outils comme l'importateur de donn\u00e9es Firefly III et l'int\u00e9gration de Firefly III dans Home Assistant utilisent de tels jetons pour se connecter \u00e0 Firefly III et faire leur travail. Lorsque vous cr\u00e9ez un jeton, il n'est visible qu'une seule fois. Le jeton est \u00e9galement tr\u00e8s long.",
+        "profile_oauth_clients_explain": "Un client OAuth peut \u00eatre utilis\u00e9 pour connecter des applications \"intelligentes\" \u00e0 Firefly III : des applications capables de vous rediriger vers votre Firefly III, obtenir votre permission, et vous faire revenir en arri\u00e8re. L'importateur de donn\u00e9es Firefly III en est un exemple. Les clients OAuth peuvent \u00eatre g\u00e9n\u00e9r\u00e9s avec ou sans \"secret\". Ce secret est utilis\u00e9 pour authentifier le client. Puisque tous les clients ne sont pas capables de stocker le secret, vous avez donc la possibilit\u00e9 de g\u00e9n\u00e9rer un client sans secret.",
+        "regenerate_secret": "Reg\u00e9n\u00e9rer le secret",
         "administrations_page_title": "Administrations financi\u00e8res",
         "administrations_index_menu": "Administrations financi\u00e8res",
         "expires_at": "Expire le",
@@ -75,8 +75,8 @@
         "profile_whoops": "Oups !",
         "profile_something_wrong": "Une erreur s'est produite !",
         "profile_try_again": "Une erreur s\u2019est produite. Merci d\u2019essayer \u00e0 nouveau.",
-        "profile_oauth_clients": "OAuth Clients and Applications",
-        "profile_oauth_no_clients": "You have not created any OAuth clients or applications.",
+        "profile_oauth_clients": "Clients et applications OAuth",
+        "profile_oauth_no_clients": "Vous n'avez pas cr\u00e9\u00e9 de clients ou d'applications OAuth.",
         "profile_oauth_clients_header": "Clients",
         "profile_oauth_client_id": "Identifiant",
         "profile_oauth_client_name": "Nom",
@@ -86,7 +86,7 @@
         "profile_oauth_edit_client": "Modifier le client",
         "profile_oauth_name_help": "Quelque chose que vos utilisateurs reconna\u00eetront et qui inspirera confiance.",
         "profile_oauth_redirect_url": "URL de redirection",
-        "profile_oauth_clients_external_auth": "Please note that if you're using an external authentication provider like Authelia, OAuth Clients will not work. You can use Personal Access Tokens only.",
+        "profile_oauth_clients_external_auth": "Si vous utilisez un fournisseur d'authentification externe comme Authelia, les clients OAuth ne fonctionneront pas. Vous ne pouvez utiliser que des jetons d'acc\u00e8s personnel.",
         "profile_oauth_redirect_url_help": "URL de callback de votre application.",
         "profile_authorized_apps": "Applications autoris\u00e9es",
         "profile_authorized_clients": "Clients autoris\u00e9s",
@@ -104,8 +104,8 @@
         "piggy_bank": "Tirelire",
         "profile_oauth_client_secret_title": "Secret du client",
         "profile_oauth_client_secret_expl": "Voici votre nouveau secret de client. C'est la seule fois qu'il sera affich\u00e9, donc ne le perdez pas ! Vous pouvez maintenant utiliser ce secret pour faire des requ\u00eates d'API.",
-        "profile_oauth_confidential": "Keep a secret?",
-        "profile_oauth_confidential_help": "Can the application you're using this for keep a secret? The Firefly III Data Importer CANNOT keep a secret, so UNCHECK the box. In other cases, it's up to you.",
+        "profile_oauth_confidential": "Garder un secret ?",
+        "profile_oauth_confidential_help": "L'application que vous utilisez peut garder un secret ? L'importateur de donn\u00e9es Firefly III ne peut PAS garder un secret, alors DECOCHEZ la case. Dans d'autres cas, c'est \u00e0 vous de voir.",
         "multi_account_warning_unknown": "Selon le type d'op\u00e9ration que vous cr\u00e9ez, le(s) compte(s) source et\/ou de destination des s\u00e9parations suivantes peuvent \u00eatre remplac\u00e9s par celui de la premi\u00e8re s\u00e9paration de l'op\u00e9ration.",
         "multi_account_warning_withdrawal": "Gardez en t\u00eate que le compte source des s\u00e9parations suivantes peut \u00eatre remplac\u00e9 par celui de la premi\u00e8re s\u00e9paration de la d\u00e9pense.",
         "multi_account_warning_deposit": "Gardez en t\u00eate que le compte de destination des s\u00e9parations suivantes peut \u00eatre remplac\u00e9 par celui de la premi\u00e8re s\u00e9paration du d\u00e9p\u00f4t.",