kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-21 13:12:27 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2026-01-17

Browse Source
This commit is contained in:
JC5
2026-01-17 16:11:09 +01:00
parent 95c62d783a
commit a859ca4e38
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Support/System/OAuthKeys.php
View File

@@ -34,6 +34,7 @@ use Laravel\Passport\Console\KeysCommand;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Safe\Exceptions\FilesystemException;
use function Safe\file_get_contents;
use function Safe\file_put_contents;
@@ -64,8 +65,9 @@ class OAuthKeys
Log::debug(sprintf('Private key file at "%s" exists? %s', $private, var_export($privateExists, true)));
Log::debug(sprintf('Public key file at "%s" exists ? %s', $public, var_export($publicExists, true)));
$result = file_exists($private) && file_exists($public);
$result = file_exists($private) && file_exists($public);
Log::debug(sprintf('Method will return %s', var_export($result, true)));
return $result;
}
@@ -83,7 +85,7 @@ class OAuthKeys
try {
$privateKey = trim((string)FireflyConfig::get(self::PRIVATE_KEY)?->data);
$publicKey = trim((string)FireflyConfig::get(self::PUBLIC_KEY)?->data);
} catch (ContainerExceptionInterface | FireflyException | NotFoundExceptionInterface $e) {
} catch (ContainerExceptionInterface|FireflyException|NotFoundExceptionInterface $e) {
Log::error(sprintf('Could not validate keysInDatabase(): %s', $e->getMessage()));
Log::error($e->getTraceAsString());
}
@@ -100,7 +102,7 @@ class OAuthKeys
if ('' !== $publicKey) {
Log::debug(sprintf('SHA2 hash of public key in DB : %s', hash('sha256', $publicKey)));
}
$return = '' !== $privateKey && '' !== $publicKey;
$return = '' !== $privateKey && '' !== $publicKey;
Log::debug(sprintf('keysInDatabase will return %s', var_export($return, true)));
return $return;
@@ -136,10 +138,11 @@ class OAuthKeys
FireflyConfig::delete(self::PRIVATE_KEY);
FireflyConfig::delete(self::PUBLIC_KEY);
Log::debug('Done with generateKeysFromDB(), return FALSE');
return false;
}
$private = storage_path('oauth-private.key');
$public = storage_path('oauth-public.key');
$private = storage_path('oauth-private.key');
$public = storage_path('oauth-public.key');
file_put_contents($private, $privateContent);
file_put_contents($public, $publicContent);

4
config/firefly.php
View File

@@ -78,8 +78,8 @@ return [
'running_balance_column' => (bool)envNonEmpty('USE_RUNNING_BALANCE', true), // this is only the default value, is not used.
// see cer.php for exchange rates feature flag.
],
'version' => '6.4.16',
'build_time' => 1768636333,
'version' => 'develop/2026-01-17',
'build_time' => 1768662564,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.