Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix cron over CLI
James Colef48aaa180d3e
diff --git a/app/Api/V1/Controllers/System/CronController.php b/app/Api/V1/Controllers/System/CronController.phpindex fc54231269..a175a62975 100644--- a/app/Api/V1/Controllers/System/CronController.php+++ b/app/Api/V1/Controllers/System/CronController.php@@ -26,10 +26,12 @@ namespace FireflyIII\Api\V1\Controllers\System;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\System\CronRequest;+use FireflyIII\Repositories\User\UserRepositoryInterface;use FireflyIII\Support\Binder\CLIToken;use FireflyIII\Support\Facades\AppConfiguration;use FireflyIII\Support\Http\Controllers\CronRunner;use Illuminate\Http\JsonResponse;+use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;use SensitiveParameter;@@ -42,20 +44,39 @@ final class CronController extends Controllerpublic function cron(CronRequest $request, #[SensitiveParameter] string $cliToken): JsonResponse{- CLIToken::routeBinder($cliToken, $request->route());- $config = $request->getAll();- $user = CLIToken::findUserByToken($cliToken);+ /** @var UserRepositoryInterface $repository */+ $repository = app(UserRepositoryInterface::class);+ $result = CLIToken::routeBinder($cliToken, $request->route());+ $config = $request->getAll();+ $user = CLIToken::findUserByToken($cliToken);+ $users = new Collection();+ if (null !== $user) {+ $users->push($user);+ }+ // no user matches the cliToken but that is OK if the token matches the static token (we check again)+ if (null === $user && hash_equals($result, (string)config('firefly.static_cron_token')) && 32 === strlen(config('firefly.static_cron_token'))) {+ Log::info('No user matches the cliToken but the static token matches, so we will continue for ALL users.');+ $users = $repository->allAvailable();+ }Log::debug(sprintf('Now in %s', __METHOD__));Log::debug(sprintf('Date is %s', $config['date']->toIsoString()));- $return = [];- $return['recurring_transactions'] = $this->runRecurring($user, $config['force'], $config['date']);- $return['auto_budgets'] = $this->runAutoBudget($user, $config['force'], $config['date']);- if (true === AppConfiguration::get('enable_external_rates', config('cer.download_enabled'))->data) {- $return['exchange_rates'] = $this->exchangeRatesCronJob($user, $config['force'], $config['date']);+ $return = [+ 'recurring_transactions' => [],+ 'auto_budgets' => [],+ 'exchange_rates' => [],+ 'bill_notifications' => [],+ 'webhooks' => [],+ ];+ foreach ($users as $user) {+ $return['recurring_transactions'][] = $this->runRecurring($user, $config['force'], $config['date']);+ $return['auto_budgets'][] = $this->runAutoBudget($user, $config['force'], $config['date']);+ if (true === AppConfiguration::get('enable_external_rates', config('cer.download_enabled'))->data) {+ $return['exchange_rates'][] = $this->exchangeRatesCronJob($user, $config['force'], $config['date']);+ }+ $return['bill_notifications'][] = $this->billWarningCronJob($user, $config['force'], $config['date']);+ $return['webhooks'][] = $this->webhookCronJob($user, $config['force'], $config['date']);}- $return['bill_notifications'] = $this->billWarningCronJob($user, $config['force'], $config['date']);- $return['webhooks'] = $this->webhookCronJob($user, $config['force'], $config['date']);return response()->api($return);}diff --git a/app/Api/V1/Requests/System/CronRequest.php b/app/Api/V1/Requests/System/CronRequest.phpindex d66cb498b7..3fbce3fd31 100644--- a/app/Api/V1/Requests/System/CronRequest.php+++ b/app/Api/V1/Requests/System/CronRequest.php@@ -48,7 +48,7 @@ class CronRequest extends FormRequest*/public function getAll(): array{- $data = ['force' => false, 'date' => today(config('app.timezone'))];+ $data = ['force' => false, 'date' => now(config('app.timezone'))];if ($this->has('force')) {$data['force'] = $this->boolean('force');}@@ -57,7 +57,7 @@ class CronRequest extends FormRequest}// catch NULL.if (!$data['date'] instanceof Carbon) {- $data['date'] = today(config('app.timezone'));+ $data['date'] = now(config('app.timezone'));}return $data;diff --git a/app/Support/Http/Controllers/CronRunner.php b/app/Support/Http/Controllers/CronRunner.phpindex daa073c242..0f66942965 100644--- a/app/Support/Http/Controllers/CronRunner.php+++ b/app/Support/Http/Controllers/CronRunner.php@@ -67,6 +67,7 @@ trait CronRunner'job_succeeded' => $billWarning->jobSucceeded,'job_errored' => $billWarning->jobErrored,'message' => $billWarning->message,+ 'user' => (string)$user->id];}@@ -96,6 +97,7 @@ trait CronRunner'job_succeeded' => $exchangeRates->jobSucceeded,'job_errored' => $exchangeRates->jobErrored,'message' => $exchangeRates->message,+ 'user' => (string)$user->id];}@@ -124,6 +126,7 @@ trait CronRunner'job_succeeded' => $autoBudget->jobSucceeded,'job_errored' => $autoBudget->jobErrored,'message' => $autoBudget->message,+ 'user' => (string)$user->id];}@@ -153,6 +156,7 @@ trait CronRunner'job_succeeded' => $recurring->jobSucceeded,'job_errored' => $recurring->jobErrored,'message' => $recurring->message,+ 'user' => (string)$user->id];}@@ -181,6 +185,7 @@ trait CronRunner'job_succeeded' => $webhook->jobSucceeded,'job_errored' => $webhook->jobErrored,'message' => $webhook->message,+ 'user' => (string)$user->id];}}