Compare commits

...

6 Commits

Author SHA1 Message Date
github-actions[bot]
ef6ffb6f2d Merge pull request #12150 from firefly-iii/release-1776534459
🤖 Automatically merge the PR into the develop branch.
2026-04-18 19:47:47 +02:00
JC5
a158e4596c 🤖 Auto commit for release 'develop' on 2026-04-18 2026-04-18 19:47:39 +02:00
James Cole
e6f616880a Fix call to header. 2026-04-18 19:42:04 +02:00
github-actions[bot]
c57233a5f7 Merge pull request #12149 from firefly-iii/release-1776514174
🤖 Automatically merge the PR into the develop branch.
2026-04-18 14:09:41 +02:00
JC5
c1816e2136 🤖 Auto commit for release 'develop' on 2026-04-18 2026-04-18 14:09:34 +02:00
James Cole
fdcf73b775 Fix broken oauth controller 2026-04-18 14:04:12 +02:00
5 changed files with 13 additions and 15 deletions

View File

@@ -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 = [];

View File

@@ -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')) {

View File

@@ -8,7 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
<!-- 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

View File

@@ -79,7 +79,7 @@ return [
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2026-04-18',
'build_time' => 1776513742,
'build_time' => 1776534459,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.

18
package-lock.json generated
View File

@@ -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"