Merge pull request #10781 from firefly-iii/release-1755509351

🤖 Automatically merge the PR into the develop branch.

.ci/phpstan.neon

@@ -1,6 +1,6 @@
 parameters:
   scanFiles:
-    - ../_ide_helper
+    - ../_ide_helper.php
   paths:
     - ../app
     - ../database

.github/release-notes/alpha.md

@@ -1,6 +1,7 @@
 Welcome to release %version of Firefly III. This **alpha** release contains the latest fixes, translations and features. It is probably buggy and may not work as expected. You can download the release below, and adventurous Docker users can find this release under the `alpha` tag.
 
-:warning: Please be careful with this alpha release, as it may not work as expected.
+> [!WARNING]
+> Please be careful with this alpha release, as it may not work as expected.
 
 Alpha releases are created to test new features and fixes before they are included in a stable release. They are not recommended for production use. This release was created on %date and may contain unexpected bugs. Data loss is rare but possible.
 

.github/release-notes/beta.md

@@ -1,6 +1,7 @@
 Welcome to release %version of Firefly III. This **beta** release contains the latest fixes, translations and features. It may be buggy, nor work as expected. You can download the release below, and adventurous Docker users can find this release under the `beta` tag.
 
-:warning: Please be careful with this beta release, as it may not work as expected.
+> [!WARNING]
+> Please be careful with this beta release, as it may not work as expected.
 
 Alpha releases are created to test new features and fixes before they are included in a stable release. They are not recommended for production use. This release was created on %date and may contain unexpected bugs. Data loss is rare but possible.
 

.github/release-notes/branch.md

@@ -1,6 +1,7 @@
 Welcome to release %version of Firefly III. This branch-related release contains the latest fixes, translations and features. It is probably buggy and may not work as expected. You can download the release below, and adventurous Docker users can find this release under the `branch-*` tag.
 
-:warning: Please be careful with this branch release, as it may not work as expected.
+> [!WARNING]
+> Please be careful with this branch release, as it may not work as expected.
 
 Branch releases are created to test large new features that are developed alongside the normal release flow. They are not recommended for production use. This release was created on %date and may contain unexpected bugs. Data loss is rare but possible.
 

.github/release-notes/develop.md

@@ -1,6 +1,7 @@
 Welcome to the latest development release of Firefly III. This test release contains the absolute latest fixes, translations and features. It is probably buggy and may not work as expected. You can download the release below, and adventurous Docker users can find this release under the `develop` tag.
 
-:warning: Please be careful with this pre-release, as it may not work as expected.
+> [!WARNING]
+> Please be careful with this pre-release, as it may not work as expected.
 
 This release was created on %date and may contain unexpected bugs. Data loss is rare but possible.
 

.github/workflows/lock.yml

@@ -21,7 +21,7 @@ jobs:
       discussions: write
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v5
+      - uses: JC5/lock-threads@v6.0.2
         with:
           issue-inactive-days: 21
           pr-inactive-days: 21

app/Api/V1/Controllers/Autocomplete/AccountController.php

@@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Enums\AccountTypeEnum;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -34,7 +35,6 @@ use FireflyIII\Support\Debug\Timer;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\AccountFilter;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
 
@@ -46,7 +46,8 @@ class AccountController extends Controller
     use AccountFilter;
 
     // this array only exists to test if the constructor will use it properly.
-    protected array $accepts = ['application/json', 'application/vnd.api+json'];
+    protected array $accepts       = ['application/json', 'application/vnd.api+json'];
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /** @var array<int, string> */
     private array                      $balanceTypes;
@@ -60,10 +61,10 @@ class AccountController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
+                $this->validateUserGroup($request);
                 $this->repository = app(AccountRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }

app/Api/V1/Controllers/Autocomplete/BillController.php

@@ -26,9 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -37,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class BillController extends Controller
 {
     private BillRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_SUBSCRIPTIONS];
 
     /**
      * BillController constructor.
@@ -46,10 +47,10 @@ class BillController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
+                $this->validateUserGroup($request);
                 $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }

app/Api/V1/Controllers/Autocomplete/BudgetController.php

@@ -26,9 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Budget;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -37,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class BudgetController extends Controller
 {
     private BudgetRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_BUDGETS];
 
     /**
      * BudgetController constructor.
@@ -46,10 +47,10 @@ class BudgetController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
+                $this->validateUserGroup($request);
                 $this->repository = app(BudgetRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }

app/Api/V1/Controllers/Autocomplete/CategoryController.php

@@ -26,9 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Category;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -37,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class CategoryController extends Controller
 {
     private CategoryRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * CategoryController constructor.
@@ -46,10 +47,10 @@ class CategoryController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
+                $this->validateUserGroup($request);
                 $this->repository = app(CategoryRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }

app/Api/V1/Controllers/Autocomplete/CurrencyController.php

@@ -27,9 +27,9 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 use Deprecated;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -38,6 +38,7 @@ use Illuminate\Http\JsonResponse;
 class CurrencyController extends Controller
 {
     private CurrencyRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * CurrencyController constructor.
@@ -47,10 +48,10 @@ class CurrencyController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
+                $this->validateUserGroup($request);
                 $this->repository = app(CurrencyRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }

app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php

@@ -26,9 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\ObjectGroup;
 use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -37,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class ObjectGroupController extends Controller
 {
     private ObjectGroupRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * CurrencyController constructor.
@@ -46,10 +47,10 @@ class ObjectGroupController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
+                $this->validateUserGroup($request);
                 $this->repository = app(ObjectGroupRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }

app/Api/V1/Controllers/Autocomplete/PiggyBankController.php

@@ -26,10 +26,10 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -39,6 +39,7 @@ class PiggyBankController extends Controller
 {
     private AccountRepositoryInterface   $accountRepository;
     private PiggyBankRepositoryInterface $piggyRepository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_PIGGY_BANKS];
 
     /**
      * PiggyBankController constructor.
@@ -48,22 +49,19 @@ class PiggyBankController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user                    = auth()->user();
+                $this->validateUserGroup($request);
                 $this->piggyRepository   = app(PiggyBankRepositoryInterface::class);
                 $this->accountRepository = app(AccountRepositoryInterface::class);
-                $this->piggyRepository->setUser($user);
-                $this->accountRepository->setUser($user);
+                $this->piggyRepository->setUser($this->user);
+                $this->piggyRepository->setUserGroup($this->userGroup);
+                $this->accountRepository->setUser($this->user);
+                $this->accountRepository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getPiggiesAC
-     */
     public function piggyBanks(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
@@ -90,10 +88,6 @@ class PiggyBankController extends Controller
         return response()->api($response);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getPiggiesBalanceAC
-     */
     public function piggyBanksWithBalance(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();

app/Api/V1/Controllers/Autocomplete/RecurrenceController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
 use Illuminate\Http\JsonResponse;
@@ -36,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class RecurrenceController extends Controller
 {
     private RecurringRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_RECURRING];
 
     /**
      * RecurrenceController constructor.
@@ -45,19 +47,16 @@ class RecurrenceController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->repository = app(RecurringRepositoryInterface::class);
-
-                $this->repository->setUser(auth()->user());
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRecurringAC
-     */
     public function recurring(AutocompleteRequest $request): JsonResponse
     {
         $data        = $request->getData();

app/Api/V1/Controllers/Autocomplete/RuleController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Rule;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use Illuminate\Http\JsonResponse;
@@ -36,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class RuleController extends Controller
 {
     private RuleRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_RULES];
 
     /**
      * RuleController constructor.
@@ -45,18 +47,16 @@ class RuleController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->repository = app(RuleRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRulesAC
-     */
     public function rules(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();

app/Api/V1/Controllers/Autocomplete/RuleGroupController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
 use Illuminate\Http\JsonResponse;
@@ -36,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class RuleGroupController extends Controller
 {
     private RuleGroupRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_RULES];
 
     /**
      * RuleGroupController constructor.
@@ -45,18 +47,16 @@ class RuleGroupController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->repository = app(RuleGroupRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getRuleGroupsAC
-     */
     public function ruleGroups(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();

app/Api/V1/Controllers/Autocomplete/TagController.php

@@ -26,9 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Tag;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -37,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class TagController extends Controller
 {
     private TagRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * TagController constructor.
@@ -46,20 +47,16 @@ class TagController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user             = auth()->user();
+                $this->validateUserGroup($request);
                 $this->repository = app(TagRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTagAC
-     */
     public function tags(AutocompleteRequest $request): JsonResponse
     {
         $data   = $request->getData();

app/Api/V1/Controllers/Autocomplete/TransactionController.php

@@ -31,7 +31,6 @@ use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
-use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
 
@@ -52,24 +51,19 @@ class TransactionController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user                  = auth()->user();
-                $userGroup             = $this->validateUserGroup($request);
+                $this->validateUserGroup($request);
                 $this->repository      = app(JournalRepositoryInterface::class);
                 $this->groupRepository = app(TransactionGroupRepositoryInterface::class);
-                $this->repository->setUser($user);
-                $this->groupRepository->setUser($user);
-                $this->groupRepository->setUserGroup($userGroup);
+                $this->repository->setUser($this->user);
+                $this->repository->setUserGroup($this->userGroup);
+                $this->groupRepository->setUser($this->user);
+                $this->groupRepository->setUserGroup($this->userGroup);
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionsAC
-     */
     public function transactions(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
@@ -92,10 +86,6 @@ class TransactionController extends Controller
         return response()->api($array);
     }
 
-    /**
-     * This endpoint is documented at:
-     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionsIDAC
-     */
     public function transactionsWithID(AutocompleteRequest $request): JsonResponse
     {
         $data   = $request->getData();

app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;
 use Illuminate\Http\JsonResponse;
@@ -36,6 +37,7 @@ use Illuminate\Http\JsonResponse;
 class TransactionTypeController extends Controller
 {
     private TransactionTypeRepositoryInterface $repository;
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * TransactionTypeController constructor.
@@ -45,6 +47,7 @@ class TransactionTypeController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->repository = app(TransactionTypeRepositoryInterface::class);
 
                 return $next($request);
@@ -52,10 +55,6 @@ class TransactionTypeController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at
-     * * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getTransactionTypesAC
-     */
     public function transactionTypes(AutocompleteRequest $request): JsonResponse
     {
         $data  = $request->getData();

app/Api/V1/Controllers/Chart/AccountController.php

@@ -26,17 +26,14 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
-use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\Preference;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Support\Chart\ChartData;
-use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\ApiSupport;
+use FireflyIII\Support\Http\Api\CleansChartData;
 use FireflyIII\Support\Http\Api\CollectsAccountsFromFilter;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
@@ -47,11 +44,12 @@ use Illuminate\Support\Facades\Log;
 class AccountController extends Controller
 {
     use ApiSupport;
+    use CleansChartData;
     use CollectsAccountsFromFilter;
 
-    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
+    protected array $acceptedRoles            = [UserRoleEnum::READ_ONLY];
 
-    private ChartData                  $chartData;
+    private array                  $chartData = [];
     private AccountRepositoryInterface $repository;
 
     /**
@@ -62,11 +60,10 @@ class AccountController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                $this->chartData  = new ChartData();
                 $this->repository = app(AccountRepositoryInterface::class);
-
-                $userGroup        = $this->validateUserGroup($request);
-                $this->repository->setUserGroup($userGroup);
+                $this->validateUserGroup($request);
+                $this->repository->setUserGroup($this->userGroup);
+                $this->repository->setUser($this->user);
 
                 return $next($request);
             }
@@ -84,7 +81,7 @@ class AccountController extends Controller
         // move date to end of day
         $queryParameters['start']->startOfDay();
         $queryParameters['end']->endOfDay();
-        Log::debug(sprintf('dashboard(), convert to primary: %s', var_export($this->convertToPrimary, true)));
+        // Log::debug(sprintf('dashboard(), convert to primary: %s', var_export($this->convertToPrimary, true)));
 
         // loop each account, and collect info:
         /** @var Account $account */
@@ -93,7 +90,7 @@ class AccountController extends Controller
             $this->renderAccountData($queryParameters, $account);
         }
 
-        return response()->json($this->chartData->render());
+        return response()->json($this->clean($this->chartData));
     }
 
     /**
@@ -102,17 +99,17 @@ class AccountController extends Controller
     private function renderAccountData(array $params, Account $account): void
     {
         Log::debug(sprintf('Now in %s(array, #%d)', __METHOD__, $account->id));
-        $currency     = $this->repository->getAccountCurrency($account);
-        $currentStart = clone $params['start'];
-        $range        = Steam::finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToPrimary);
+        $currency          = $this->repository->getAccountCurrency($account);
+        $currentStart      = clone $params['start'];
+        $range             = Steam::finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToPrimary);
 
 
-        $previous     = array_values($range)[0]['balance'];
-        $pcPrevious   = null;
+        $previous          = array_values($range)[0]['balance'];
+        $pcPrevious        = null;
         if (!$currency instanceof TransactionCurrency) {
-            $currency = $this->default;
+            $currency = $this->primaryCurrency;
         }
-        $currentSet   = [
+        $currentSet        = [
             'label'                   => $account->name,
 
             // the currency that belongs to the account.
@@ -133,6 +130,7 @@ class AccountController extends Controller
             'yAxisID'                 => 0,
             'period'                  => '1D',
             'entries'                 => [],
+            'pc_entries'              => [],
         ];
         if ($this->convertToPrimary) {
             $currentSet['pc_entries']                      = [];
@@ -162,21 +160,6 @@ class AccountController extends Controller
 
             $currentStart->addDay();
         }
-        $this->chartData->add($currentSet);
-    }
-
-    private function getFrontPageAccountIds(): array
-    {
-        $defaultSet = $this->repository->getAccountsByType([AccountTypeEnum::ASSET->value])->pluck('id')->toArray();
-
-        /** @var Preference $frontpage */
-        $frontpage  = Preferences::get('frontpageAccounts', $defaultSet);
-
-        if (!(is_array($frontpage->data) && count($frontpage->data) > 0)) {
-            $frontpage->data = $defaultSet;
-            $frontpage->save();
-        }
-
-        return $frontpage->data ?? $defaultSet;
+        $this->chartData[] = $currentSet;
     }
 }

app/Api/V1/Controllers/Chart/BalanceController.php

@@ -25,9 +25,9 @@ class BalanceController extends Controller
 {
     use CleansChartData;
     use CollectsAccountsFromFilter;
-    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
+    protected array $acceptedRoles            = [UserRoleEnum::READ_ONLY];
 
-    private array                  $chartData;
+    private array                  $chartData = [];
     private GroupCollectorInterface    $collector;
     private AccountRepositoryInterface $repository;
 
@@ -38,13 +38,13 @@ class BalanceController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->collector  = app(GroupCollectorInterface::class);
-                $userGroup        = $this->validateUserGroup($request);
-                $this->repository->setUserGroup($userGroup);
-                $this->collector->setUserGroup($userGroup);
-                $this->chartData  = [];
-                // $this->default    = app('amount')->getPrimaryCurrency();
+                $this->repository->setUserGroup($this->userGroup);
+                $this->collector->setUserGroup($this->userGroup);
+                $this->repository->setUser($this->user);
+                $this->collector->setUser($this->user);
 
                 return $next($request);
             }

app/Api/V1/Controllers/Chart/BudgetController.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
 
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\Data\DateRequest;
+use FireflyIII\Api\V1\Requests\Data\SameDateRequest;
 use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Budget;
@@ -63,13 +63,16 @@ class BudgetController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->repository    = app(BudgetRepositoryInterface::class);
                 $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
                 $this->opsRepository = app(OperationsRepositoryInterface::class);
-                $userGroup           = $this->validateUserGroup($request);
-                $this->repository->setUserGroup($userGroup);
-                $this->opsRepository->setUserGroup($userGroup);
-                $this->blRepository->setUserGroup($userGroup);
+                $this->repository->setUserGroup($this->userGroup);
+                $this->opsRepository->setUserGroup($this->userGroup);
+                $this->blRepository->setUserGroup($this->userGroup);
+                $this->repository->setUser($this->user);
+                $this->opsRepository->setUser($this->user);
+                $this->blRepository->setUser($this->user);
 
                 return $next($request);
             }
@@ -81,7 +84,7 @@ class BudgetController extends Controller
      *
      * @throws FireflyException
      */
-    public function overview(DateRequest $request): JsonResponse
+    public function overview(SameDateRequest $request): JsonResponse
     {
         $params  = $request->getAll();
 
@@ -157,12 +160,6 @@ class BudgetController extends Controller
         }
 
 
-        // if no limits
-        //        if (0 === $limits->count()) {
-        //             return as a single item in an array
-        //            $rows = $this->noBudgetLimits($budget, $start, $end);
-        //        }
-
         // is always an array
         $return     = [];
         foreach ($rows as $row) {
@@ -193,9 +190,9 @@ class BudgetController extends Controller
                 ],
                 'pc_entries'                      => [
                     'budgeted'  => $row['pc_budgeted'],
-                    'spent'     => '0',
-                    'left'      => '0',
-                    'overspent' => '0',
+                    'spent'     => $row['pc_spent'],
+                    'left'      => $row['pc_left'],
+                    'overspent' => $row['pc_overspent'],
                 ],
             ];
             $return[] = $current;

app/Api/V1/Controllers/Chart/CategoryController.php

@@ -26,7 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
 
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\Data\DateRequest;
+use FireflyIII\Api\V1\Requests\Data\SameDateRequest;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Enums\UserRoleEnum;
@@ -59,11 +59,13 @@ class CategoryController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->accountRepos  = app(AccountRepositoryInterface::class);
                 $this->currencyRepos = app(CurrencyRepositoryInterface::class);
-                $userGroup           = $this->validateUserGroup($request);
-                $this->accountRepos->setUserGroup($userGroup);
-                $this->currencyRepos->setUserGroup($userGroup);
+                $this->accountRepos->setUserGroup($this->userGroup);
+                $this->currencyRepos->setUserGroup($this->userGroup);
+                $this->accountRepos->setUser($this->user);
+                $this->currencyRepos->setUser($this->user);
 
                 return $next($request);
             }
@@ -78,7 +80,7 @@ class CategoryController extends Controller
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
-    public function overview(DateRequest $request): JsonResponse
+    public function overview(SameDateRequest $request): JsonResponse
     {
         /** @var Carbon $start */
         $start      = $this->parameters->get('start');

app/Api/V1/Controllers/Controller.php

@@ -64,7 +64,7 @@ abstract class Controller extends BaseController
 
     protected const string CONTENT_TYPE             = 'application/vnd.api+json';
     protected const string JSON_CONTENT_TYPE        = 'application/json';
-    protected array               $accepts          = ['application/json', 'application/vnd.api+json'];
+    protected array $accepts                        = ['application/json', 'application/vnd.api+json'];
 
     /** @var array<int, string> */
     protected array               $allowedSort;
@@ -107,7 +107,7 @@ abstract class Controller extends BaseController
     private function getParameters(): ParameterBag
     {
         $bag      = new ParameterBag();
-        $page     = (int) request()->get('page');
+        $page     = (int)request()->get('page');
         if ($page < 1) {
             $page = 1;
         }
@@ -131,13 +131,13 @@ abstract class Controller extends BaseController
             $obj  = null;
             if (null !== $date) {
                 try {
-                    $obj = Carbon::parse((string) $date);
+                    $obj = Carbon::parse((string)$date);
                 } catch (InvalidFormatException $e) {
                     // don't care
                     Log::warning(
                         sprintf(
                             'Ignored invalid date "%s" in API controller parameter check: %s',
-                            substr((string) $date, 0, 20),
+                            substr((string)$date, 0, 20),
                             $e->getMessage()
                         )
                     );
@@ -158,7 +158,7 @@ abstract class Controller extends BaseController
                 $value = null;
             }
             if (null !== $value) {
-                $value = (int) $value;
+                $value = (int)$value;
                 if ($value < 1) {
                     $value = 1;
                 }
@@ -176,7 +176,7 @@ abstract class Controller extends BaseController
                 $user     = auth()->user();
 
                 /** @var Preference $pageSize */
-                $pageSize = (int) app('preferences')->getForUser($user, 'listPageSize', 50)->data;
+                $pageSize = (int)app('preferences')->getForUser($user, 'listPageSize', 50)->data;
                 $bag->set($integer, $pageSize);
             }
         }
@@ -190,7 +190,7 @@ abstract class Controller extends BaseController
         $sortParameters = [];
 
         try {
-            $param = (string) request()->query->get('sort');
+            $param = (string)request()->query->get('sort');
         } catch (BadRequestException $e) {
             Log::error('Request field "sort" contains a non-scalar value. Value set to NULL.');
             Log::error($e->getMessage());

app/Api/V1/Controllers/Data/Bulk/TransactionController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Data\Bulk;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\Bulk\TransactionRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
 use Illuminate\Http\JsonResponse;
@@ -44,23 +45,23 @@ class TransactionController extends Controller
 {
     private AccountRepositoryInterface $repository;
 
+    protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
+
     public function __construct()
     {
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->repository = app(AccountRepositoryInterface::class);
-                $this->repository->setUser(auth()->user());
+                $this->repository->setUserGroup($this->userGroup);
+                $this->repository->setUser($this->user);
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/bulkUpdateTransactions
-     */
     public function update(TransactionRequest $request): JsonResponse
     {
         $query  = $request->getAll();

app/Api/V1/Controllers/Data/DestroyController.php

@@ -28,6 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\DestroyRequest;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionJournal;
@@ -55,12 +56,20 @@ class DestroyController extends Controller
 {
     private bool $unused;
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/destroyData
-     *
-     * @throws FireflyException
-     */
+    protected array $acceptedRoles = [UserRoleEnum::FULL];
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->validateUserGroup($request);
+
+                return $next($request);
+            }
+        );
+    }
+
     public function destroy(DestroyRequest $request): JsonResponse
     {
         $objects         = $request->getObjects();

app/Api/V1/Controllers/Data/Export/ExportController.php

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Data\Export;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\Export\ExportRequest;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Export\ExportDataGenerator;
 use Illuminate\Http\Response as LaravelResponse;
@@ -39,6 +40,7 @@ use function Safe\date;
 class ExportController extends Controller
 {
     private ExportDataGenerator $exporter;
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
 
     /**
      * ExportController constructor.
@@ -48,8 +50,10 @@ class ExportController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
+                $this->validateUserGroup($request);
                 $this->exporter = app(ExportDataGenerator::class);
-                $this->exporter->setUser(auth()->user());
+                $this->exporter->setUserGroup($this->userGroup);
+                $this->exporter->setUser($this->user);
 
                 return $next($request);
             }
@@ -57,9 +61,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportAccounts
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -99,9 +100,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportBills
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -114,9 +112,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportBudgets
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -129,9 +124,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportCategories
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -144,9 +136,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportPiggies
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -159,9 +148,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportRecurring
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -174,9 +160,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportRules
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -189,9 +172,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportTags
-     *
      * @throws FireflyException
      *
      * @SuppressWarnings("PHPMD.UnusedFormalParameter")
@@ -204,9 +184,6 @@ class ExportController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/exportTransactions
-     *
      * @throws FireflyException
      */
     public function transactions(ExportRequest $request): LaravelResponse

app/Api/V1/Controllers/Data/PurgeController.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Data;
 
 use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Enums\UserRoleEnum;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Budget;
@@ -44,10 +45,22 @@ use Illuminate\Http\JsonResponse;
  */
 class PurgeController extends Controller
 {
+    protected array $acceptedRoles = [UserRoleEnum::FULL];
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->validateUserGroup($request);
+
+                return $next($request);
+            }
+        );
+    }
+
     /**
      * TODO cleanup and use repositories.
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/data/purgeData
      */
     public function purge(): JsonResponse
     {
@@ -66,14 +79,6 @@ class PurgeController extends Controller
         $repository = app(PiggyBankRepositoryInterface::class);
         $repository->setUser($user);
         $repository->purgeAll();
-        //        $set  = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
-        //            ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*'])
-        //        ;
-        //
-        //        /** @var PiggyBank $piggy */
-        //        foreach ($set as $piggy) {
-        //            $piggy->forceDelete();
-        //        }
 
         // rule group
         RuleGroup::whereUserId($user->id)->onlyTrashed()->forceDelete();

app/Api/V1/Controllers/Insight/Expense/AccountController.php

@@ -64,10 +64,6 @@ class AccountController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseAsset
-     */
     public function asset(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();
@@ -91,10 +87,6 @@ class AccountController extends Controller
         return response()->json($result);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseExpense
-     */
     public function expense(GenericRequest $request): JsonResponse
     {
         $start           = $request->getStart();

app/Api/V1/Controllers/Insight/Expense/BillController.php

@@ -58,9 +58,6 @@ class BillController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseBill
-     *
      * Expenses per bill, possibly filtered by bill and account.
      */
     public function bill(GenericRequest $request): JsonResponse
@@ -122,9 +119,6 @@ class BillController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoBill
-     *
      * Expenses for no bill filtered by account.
      */
     public function noBill(GenericRequest $request): JsonResponse

app/Api/V1/Controllers/Insight/Expense/BudgetController.php

@@ -63,10 +63,6 @@ class BudgetController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseBudget
-     */
     public function budget(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();
@@ -98,10 +94,6 @@ class BudgetController extends Controller
         return response()->json($result);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoBudget
-     */
     public function noBudget(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();

app/Api/V1/Controllers/Insight/Expense/CategoryController.php

@@ -63,10 +63,6 @@ class CategoryController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferCategory
-     */
     public function category(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();
@@ -98,10 +94,6 @@ class CategoryController extends Controller
         return response()->json($result);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoCategory
-     */
     public function noCategory(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();

app/Api/V1/Controllers/Insight/Expense/PeriodController.php

@@ -37,10 +37,6 @@ use Illuminate\Support\Facades\Log;
  */
 class PeriodController extends Controller
 {
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseTotal
-     */
     public function total(GenericRequest $request): JsonResponse
     {
         $accounts         = $request->getAssetAccounts();

app/Api/V1/Controllers/Insight/Expense/TagController.php

@@ -57,9 +57,6 @@ class TagController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseNoTag
-     *
      * Expenses for no tag filtered by account.
      */
     public function noTag(GenericRequest $request): JsonResponse
@@ -115,9 +112,6 @@ class TagController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightExpenseTag
-     *
      * Expenses per tag, possibly filtered by tag and account.
      */
     public function tag(GenericRequest $request): JsonResponse

app/Api/V1/Controllers/Insight/Income/AccountController.php

@@ -64,10 +64,6 @@ class AccountController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeAsset
-     */
     public function asset(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();
@@ -92,10 +88,6 @@ class AccountController extends Controller
         return response()->json($result);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeRevenue
-     */
     public function revenue(GenericRequest $request): JsonResponse
     {
         $start           = $request->getStart();

app/Api/V1/Controllers/Insight/Income/CategoryController.php

@@ -63,10 +63,6 @@ class CategoryController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeCategory
-     */
     public function category(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();
@@ -98,10 +94,6 @@ class CategoryController extends Controller
         return response()->json($result);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeNoCategory
-     */
     public function noCategory(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();

app/Api/V1/Controllers/Insight/Income/PeriodController.php

@@ -36,10 +36,6 @@ use Illuminate\Http\JsonResponse;
  */
 class PeriodController extends Controller
 {
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeTotal
-     */
     public function total(GenericRequest $request): JsonResponse
     {
         $accounts         = $request->getAssetAccounts();

app/Api/V1/Controllers/Insight/Income/TagController.php

@@ -57,9 +57,6 @@ class TagController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeTag
-     *
      * Expenses for no tag filtered by account.
      */
     public function noTag(GenericRequest $request): JsonResponse
@@ -109,9 +106,6 @@ class TagController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightIncomeNoTag
-     *
      * Expenses per tag, possibly filtered by tag and account.
      */
     public function tag(GenericRequest $request): JsonResponse

app/Api/V1/Controllers/Insight/Transfer/AccountController.php

@@ -56,10 +56,6 @@ class AccountController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransfers
-     */
     public function asset(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();

app/Api/V1/Controllers/Insight/Transfer/CategoryController.php

@@ -63,10 +63,6 @@ class CategoryController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferCategory
-     */
     public function category(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();
@@ -98,10 +94,6 @@ class CategoryController extends Controller
         return response()->json($result);
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoCategory
-     */
     public function noCategory(GenericRequest $request): JsonResponse
     {
         $start         = $request->getStart();

app/Api/V1/Controllers/Insight/Transfer/PeriodController.php

@@ -36,10 +36,6 @@ use Illuminate\Http\JsonResponse;
  */
 class PeriodController extends Controller
 {
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferTotal
-     */
     public function total(GenericRequest $request): JsonResponse
     {
         $accounts         = $request->getAssetAccounts();

app/Api/V1/Controllers/Insight/Transfer/TagController.php

@@ -56,10 +56,6 @@ class TagController extends Controller
         );
     }
 
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferNoTag
-     */
     public function noTag(GenericRequest $request): JsonResponse
     {
         $accounts         = $request->getAssetAccounts();
@@ -108,9 +104,6 @@ class TagController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/insight/insightTransferTag
-     *
      * Transfers per tag, possibly filtered by tag and account.
      */
     public function tag(GenericRequest $request): JsonResponse

app/Api/V1/Controllers/Models/Account/DestroyController.php

@@ -55,9 +55,6 @@ class DestroyController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/deleteAccount
-     *
      * Remove the specified resource from storage.
      */
     public function destroy(Account $account): JsonResponse

app/Api/V1/Controllers/Models/Account/ListController.php

@@ -71,9 +71,6 @@ class ListController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listAttachmentByAccount
-     *
      * @throws FireflyException
      */
     public function attachments(Account $account): JsonResponse
@@ -100,9 +97,6 @@ class ListController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listPiggyBankByAccount
-     *
      * @throws FireflyException
      */
     public function piggyBanks(Account $account): JsonResponse
@@ -140,9 +134,6 @@ class ListController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listTransactionByAccount
-     *
      * Show all transaction groups related to the account.
      *
      * @throws FireflyException

app/Api/V1/Controllers/Models/Account/ShowController.php

@@ -67,9 +67,6 @@ class ShowController extends Controller
     }
 
     /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/accounts/listAccount
-     *
      * Display a listing of the resource.
      *
      * @throws FireflyException

app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php

@@ -31,6 +31,7 @@ use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Support\JsonApi\Enrichments\BudgetEnrichment;
 use FireflyIII\Support\JsonApi\Enrichments\BudgetLimitEnrichment;
 use FireflyIII\Transformers\BudgetLimitTransformer;
 use FireflyIII\User;
@@ -76,6 +77,16 @@ class ShowController extends Controller
      */
     public function index(Budget $budget): JsonResponse
     {
+        /** @var User $admin */
+        $admin        = auth()->user();
+        // enrich budget:
+        $enrichment   = new BudgetEnrichment();
+        $enrichment->setUser($admin);
+        $enrichment->setStart($this->parameters->get('start'));
+        $enrichment->setEnd($this->parameters->get('end'));
+        $budget       = $enrichment->enrichSingle($budget);
+
+
         $manager      = $this->getManager();
         $manager->parseIncludes('budget');
         $pageSize     = $this->parameters->get('limit');
@@ -87,8 +98,6 @@ class ShowController extends Controller
 
 
         // enrich
-        /** @var User $admin */
-        $admin        = auth()->user();
         $enrichment   = new BudgetLimitEnrichment();
         $enrichment->setUser($admin);
         $budgetLimits = $enrichment->enrich($budgetLimits);

app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php

@@ -126,7 +126,7 @@ class ShowController extends Controller
      *
      * @throws FireflyException
      */
-    public function showDefault(): JsonResponse
+    public function showPrimary(): JsonResponse
     {
         /** @var User $user */
         $user        = auth()->user();

app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php

@@ -73,7 +73,7 @@ class StoreController extends Controller
     {
         $currency    = $this->repository->store($request->getAll());
         if (true === $request->boolean('default')) {
-            $this->repository->makeDefault($currency);
+            $this->repository->makePrimary($currency);
             app('preferences')->mark();
         }
         $manager     = $this->getManager();

app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php

@@ -101,12 +101,12 @@ class UpdateController extends Controller
     /**
      * @throws FireflyException
      */
-    public function makeDefault(TransactionCurrency $currency): JsonResponse
+    public function makePrimary(TransactionCurrency $currency): JsonResponse
     {
         /** @var User $user */
         $user        = auth()->user();
         $this->repository->enable($currency);
-        $this->repository->makeDefault($currency);
+        $this->repository->makePrimary($currency);
 
         app('preferences')->mark();
 

app/Api/V1/Controllers/System/ConfigurationController.php

@@ -24,15 +24,18 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\System;
 
-use FireflyIII\Support\Facades\FireflyConfig;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Validator;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\System\UpdateRequest;
+use FireflyIII\Enums\WebhookDelivery;
+use FireflyIII\Enums\WebhookResponse;
+use FireflyIII\Enums\WebhookTrigger;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Support\Binder\EitherConfigKey;
+use FireflyIII\Support\Facades\FireflyConfig;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 
 /**
@@ -107,8 +110,8 @@ class ConfigurationController extends Controller
 
         return [
             'is_demo_site'            => $isDemoSite?->data,
-            'permission_update_check' => null === $updateCheck ? null : (int) $updateCheck->data,
-            'last_update_check'       => null === $lastCheck ? null : (int) $lastCheck->data,
+            'permission_update_check' => null === $updateCheck ? null : (int)$updateCheck->data,
+            'last_update_check'       => null === $lastCheck ? null : (int)$lastCheck->data,
             'single_user_mode'        => $singleUser?->data,
         ];
     }
@@ -139,7 +142,20 @@ class ConfigurationController extends Controller
                 'value'    => $dynamic[$shortKey],
                 'editable' => true,
             ];
+
+            return response()->api(['data' => $data])->header('Content-Type', self::JSON_CONTENT_TYPE);
         }
+        if (str_starts_with($configKey, 'webhook.')) {
+            $data = [
+                'title'    => $configKey,
+                'value'    => $this->getWebhookConfiguration($configKey),
+                'editable' => false,
+            ];
+
+            return response()->api(['data' => $data])->header('Content-Type', self::JSON_CONTENT_TYPE);
+        }
+
+        // fallback
         if (!str_starts_with($configKey, 'configuration.')) {
             $data = [
                 'title'    => $configKey,
@@ -182,4 +198,39 @@ class ConfigurationController extends Controller
 
         return response()->api(['data' => $data])->header('Content-Type', self::CONTENT_TYPE);
     }
+
+    private function getWebhookConfiguration(string $configKey): array
+    {
+        switch ($configKey) {
+            case 'webhook.triggers':
+                $cases = WebhookTrigger::cases();
+                $data  = [];
+                foreach ($cases as $c) {
+                    $data[$c->name] = $c->value;
+                }
+
+                return $data;
+
+            case 'webhook.responses':
+                $cases = WebhookResponse::cases();
+                $data  = [];
+                foreach ($cases as $c) {
+                    $data[$c->name] = $c->value;
+                }
+
+                return $data;
+
+            case 'webhook.deliveries':
+                $cases = WebhookDelivery::cases();
+                $data  = [];
+                foreach ($cases as $c) {
+                    $data[$c->name] = $c->value;
+                }
+
+                return $data;
+
+            default:
+                throw new FireflyException(sprintf('Unknown webhook configuration key "%s".', $configKey));
+        }
+    }
 }

app/Api/V1/Controllers/Webhook/ShowController.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers\Webhook;
 
 use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Enums\WebhookTrigger;
 use FireflyIII\Events\RequestedSendWebhookMessages;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Generator\Webhook\MessageGeneratorInterface;
@@ -146,7 +147,7 @@ class ShowController extends Controller
         $engine->setUser(auth()->user());
 
         // tell the generator which trigger it should look for
-        $engine->setTrigger($webhook->trigger);
+        $engine->setTrigger(WebhookTrigger::tryFrom($webhook->trigger));
         // tell the generator which objects to process
         $engine->setObjects(new Collection([$group]));
         // set the webhook to trigger

app/Api/V1/Requests/Models/Webhook/CreateRequest.php

@@ -24,11 +24,15 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Webhook;
 
+use FireflyIII\Enums\WebhookResponse;
+use FireflyIII\Enums\WebhookTrigger;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class CreateRequest
@@ -55,9 +59,9 @@ class CreateRequest extends FormRequest
 
         // this is the way.
         $return             = $this->getAllData($fields);
-        $return['trigger']  = $triggers[$return['trigger']] ?? (int) $return['trigger'];
-        $return['response'] = $responses[$return['response']] ?? (int) $return['response'];
-        $return['delivery'] = $deliveries[$return['delivery']] ?? (int) $return['delivery'];
+        $return['trigger']  = $triggers[$return['trigger']] ?? (int)$return['trigger'];
+        $return['response'] = $responses[$return['response']] ?? (int)$return['response'];
+        $return['delivery'] = $deliveries[$return['delivery']] ?? (int)$return['delivery'];
 
         return $return;
     }
@@ -81,4 +85,45 @@ class CreateRequest extends FormRequest
             'url'      => ['required', sprintf('url:%s', $validProtocols), 'uniqueWebhook'],
         ];
     }
+
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator): void {
+                Log::debug('Validating webhook');
+                $data      = $validator->getData();
+                $trigger   = $data['trigger'] ?? null;
+                $response  = $data['response'] ?? null;
+                if (null === $trigger || null === $response) {
+                    Log::debug('No trigger or response, return.');
+
+                    return;
+                }
+                $triggers  = array_keys(Webhook::getTriggersForValidation());
+                $responses = array_keys(Webhook::getResponsesForValidation());
+                if (!in_array($trigger, $triggers, true) || !in_array($response, $responses, true)) {
+                    return;
+                }
+                // cannot deliver budget info.
+                if (is_int($trigger)) {
+                    Log::debug(sprintf('Trigger was integer (%d).', $trigger));
+                    $trigger = WebhookTrigger::from($trigger)->name;
+                }
+                if (is_int($response)) {
+                    Log::debug(sprintf('Response was integer (%d).', $response));
+                    $response = WebhookResponse::from($response)->name;
+                }
+                Log::debug(sprintf('Trigger is %s, response is %s', $trigger, $response));
+                if (str_contains($trigger, 'TRANSACTION') && str_contains($response, 'BUDGET')) {
+                    $validator->errors()->add('response', trans('validation.webhook_budget_info'));
+                }
+                if (str_contains($trigger, 'BUDGET') && str_contains($response, 'ACCOUNT')) {
+                    $validator->errors()->add('response', trans('validation.webhook_account_info'));
+                }
+                if (str_contains($trigger, 'BUDGET') && str_contains($response, 'TRANSACTION')) {
+                    $validator->errors()->add('response', trans('validation.webhook_transaction_info'));
+                }
+            }
+        );
+    }
 }

app/Api/V1/Requests/Models/Webhook/UpdateRequest.php

@@ -24,11 +24,15 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Requests\Models\Webhook;
 
+use FireflyIII\Enums\WebhookResponse;
+use FireflyIII\Enums\WebhookTrigger;
 use FireflyIII\Models\Webhook;
 use FireflyIII\Rules\IsBoolean;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class UpdateRequest
@@ -94,4 +98,45 @@ class UpdateRequest extends FormRequest
             'url'      => [sprintf('url:%s', $validProtocols), sprintf('uniqueExistingWebhook:%d', $webhook->id)],
         ];
     }
+
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            function (Validator $validator): void {
+                Log::debug('Validating webhook');
+                $data      = $validator->getData();
+                $trigger   = $data['trigger'] ?? null;
+                $response  = $data['response'] ?? null;
+                if (null === $trigger || null === $response) {
+                    Log::debug('No trigger or response, return.');
+
+                    return;
+                }
+                $triggers  = array_keys(Webhook::getTriggersForValidation());
+                $responses = array_keys(Webhook::getResponsesForValidation());
+                if (!in_array($trigger, $triggers, true) || !in_array($response, $responses, true)) {
+                    return;
+                }
+                // cannot deliver budget info.
+                if (is_int($trigger)) {
+                    Log::debug(sprintf('Trigger was integer (%d).', $trigger));
+                    $trigger = WebhookTrigger::from($trigger)->name;
+                }
+                if (is_int($response)) {
+                    Log::debug(sprintf('Response was integer (%d).', $response));
+                    $response = WebhookResponse::from($response)->name;
+                }
+                Log::debug(sprintf('Trigger is %s, response is %s', $trigger, $response));
+                if (str_contains($trigger, 'TRANSACTION') && str_contains($response, 'BUDGET')) {
+                    $validator->errors()->add('response', trans('validation.webhook_budget_info'));
+                }
+                if (str_contains($trigger, 'BUDGET') && str_contains($response, 'ACCOUNT')) {
+                    $validator->errors()->add('response', trans('validation.webhook_account_info'));
+                }
+                if (str_contains($trigger, 'BUDGET') && str_contains($response, 'TRANSACTION')) {
+                    $validator->errors()->add('response', trans('validation.webhook_transaction_info'));
+                }
+            }
+        );
+    }
 }

app/Console/Commands/Integrity/ValidatesEnvironmentVariables.php

@@ -49,14 +49,23 @@ class ValidatesEnvironmentVariables extends Command
      */
     public function handle(): int
     {
-        $this->validateLanguage();
-        $this->validateGuard();
-        $this->validateStaticToken();
+        $result = $this->validateLanguage();
+        if (false === $result) {
+            return Command::FAILURE;
+        }
+        $result = $this->validateGuard();
+        if (false === $result) {
+            return Command::FAILURE;
+        }
+        $result = $this->validateStaticToken();
+        if (false === $result) {
+            return Command::FAILURE;
+        }
 
         return Command::SUCCESS;
     }
 
-    private function validateLanguage(): void
+    private function validateLanguage(): bool
     {
         $language  = config('firefly.default_language');
         $locale    = config('firefly.default_locale');
@@ -67,7 +76,7 @@ class ValidatesEnvironmentVariables extends Command
             $this->friendlyError('Please check your .env file and make sure you use a valid setting.');
             $this->friendlyError(sprintf('Valid languages are: %s', implode(', ', $options)));
 
-            exit(1);
+            return false;
         }
         $options[] = 'equal';
         if (!in_array($locale, $options, true)) {
@@ -75,11 +84,13 @@ class ValidatesEnvironmentVariables extends Command
             $this->friendlyError('Please check your .env file and make sure you use a valid setting.');
             $this->friendlyError(sprintf('Valid locales are: %s', implode(', ', $options)));
 
-            exit(1);
+            return false;
         }
+
+        return true;
     }
 
-    private function validateGuard(): void
+    private function validateGuard(): bool
     {
         $guard = config('auth.defaults.guard');
         if ('web' !== $guard && 'remote_user_guard' !== $guard) {
@@ -87,18 +98,22 @@ class ValidatesEnvironmentVariables extends Command
             $this->friendlyError('Please check your .env file and make sure you use a valid setting.');
             $this->friendlyError('Valid guards are: web, remote_user_guard');
 
-            exit(1);
+            return false;
         }
+
+        return true;
     }
 
-    private function validateStaticToken(): void
+    private function validateStaticToken(): bool
     {
-        $token = (string) config('firefly.static_cron_token');
+        $token = (string)config('firefly.static_cron_token');
         if ('' !== $token && 32 !== strlen($token)) {
             $this->friendlyError('STATIC_CRON_TOKEN must be empty or a 32-character string.');
             $this->friendlyError('Please check your .env file and make sure you use a valid setting.');
 
-            exit(1);
+            return false;
         }
+
+        return true;
     }
 }

app/Console/Commands/System/ResetsErrorMailLimit.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FireflyIII\Console\Commands\System;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Command\Command as CommandAlias;
+
+class ResetsErrorMailLimit extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'firefly-iii:reset-error-mail-limit';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Resets the number of error mails sent.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $file      = storage_path('framework/cache/error-count.json');
+        $directory = storage_path('framework/cache');
+        $limits    = [];
+
+        if (!is_writable($directory)) {
+            $this->friendlyError(sprintf('Cannot write to directory "%s", cannot rate limit errors.', $directory));
+
+            return CommandAlias::FAILURE;
+        }
+        if (!file_exists($file)) {
+            $this->friendlyInfo(sprintf('Created new limits file at "%s"', $file));
+            file_put_contents($file, json_encode($limits, JSON_PRETTY_PRINT));
+
+            return CommandAlias::SUCCESS;
+        }
+        if (!is_writable($file)) {
+            $this->friendlyError(sprintf('Cannot write to "%s", cannot rate limit errors.', $file));
+
+            return CommandAlias::FAILURE;
+        }
+
+        $this->friendlyInfo(sprintf('Successfully reset the error rate-limits file located at "%s"', $file));
+        file_put_contents($file, json_encode($limits, JSON_PRETTY_PRINT));
+
+        return CommandAlias::SUCCESS;
+    }
+}

app/Console/Commands/System/ScansAttachments.php

@@ -29,12 +29,16 @@ use FireflyIII\Models\Attachment;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
+use Safe\Exceptions\FileinfoException;
+use Safe\Exceptions\FilesystemException;
+use Safe\Exceptions\StringsException;
 
-use function Safe\tempnam;
 use function Safe\file_put_contents;
 use function Safe\md5_file;
 use function Safe\mime_content_type;
+use function Safe\tempnam;
 
 class ScansAttachments extends Command
 {
@@ -46,6 +50,10 @@ class ScansAttachments extends Command
 
     /**
      * Execute the console command.
+     *
+     * @throws FilesystemException
+     * @throws StringsException
+     * @throws FileinfoException
      */
     public function handle(): int
     {
@@ -57,7 +65,7 @@ class ScansAttachments extends Command
             $fileName         = $attachment->fileName();
             $encryptedContent = $disk->get($fileName);
             if (null === $encryptedContent) {
-                app('log')->error(sprintf('No content for attachment #%d under filename "%s"', $attachment->id, $fileName));
+                Log::error(sprintf('No content for attachment #%d under filename "%s"', $attachment->id, $fileName));
 
                 continue;
             }
@@ -65,18 +73,13 @@ class ScansAttachments extends Command
             try {
                 $decryptedContent = Crypt::decrypt($encryptedContent); // verified
             } catch (DecryptException $e) {
-                app('log')->error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage()));
+                Log::error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage()));
                 $decryptedContent = $encryptedContent;
             }
             $tempFileName     = tempnam(sys_get_temp_dir(), 'FireflyIII');
-            if (false === $tempFileName) {
-                app('log')->error(sprintf('Could not create temporary file for attachment #%d', $attachment->id));
-
-                exit(1);
-            }
             file_put_contents($tempFileName, $decryptedContent);
-            $attachment->md5  = (string) md5_file($tempFileName);
-            $attachment->mime = (string) mime_content_type($tempFileName);
+            $attachment->md5  = (string)md5_file($tempFileName);
+            $attachment->mime = (string)mime_content_type($tempFileName);
             $attachment->save();
             $this->friendlyInfo(sprintf('Fixed attachment #%d', $attachment->id));
         }

app/Console/Commands/Tools/Cron.php

@@ -50,7 +50,7 @@ class Cron extends Command
         {--download-cer : Download exchange rates. Other tasks will be skipped unless also requested.}
         {--create-recurring : Create recurring transactions. Other tasks will be skipped unless also requested.}
         {--create-auto-budgets : Create auto budgets. Other tasks will be skipped unless also requested.}
-        {--send-bill-warnings : Send bill warnings. Other tasks will be skipped unless also requested.}
+        {--send-subscription-warnings : Send subscription warnings. Other tasks will be skipped unless also requested.}
         {--send-webhook-messages : Sends any stray webhook messages (with a maximum of 5).}
         ';
 
@@ -59,7 +59,7 @@ class Cron extends Command
         $doAll = !$this->option('download-cer')
                  && !$this->option('create-recurring')
                  && !$this->option('create-auto-budgets')
-                 && !$this->option('send-bill-warnings')
+                 && !$this->option('send-subscription-warnings')
                  && !$this->option('check-version')
                  && !$this->option('send-webhook-messages');
         $date  = null;
@@ -116,9 +116,9 @@ class Cron extends Command
         }
 
         // Fire bill warning cron job
-        if ($doAll || $this->option('send-bill-warnings')) {
+        if ($doAll || $this->option('send-subscription-warnings')) {
             try {
-                $this->billWarningCronJob($force, $date);
+                $this->subscriptionWarningCronJob($force, $date);
             } catch (FireflyException $e) {
                 app('log')->error($e->getMessage());
                 app('log')->error($e->getTraceAsString());
@@ -231,25 +231,25 @@ class Cron extends Command
     /**
      * @throws FireflyException
      */
-    private function billWarningCronJob(bool $force, ?Carbon $date): void
+    private function subscriptionWarningCronJob(bool $force, ?Carbon $date): void
     {
-        $autoBudget = new BillWarningCronjob();
-        $autoBudget->setForce($force);
+        $subscriptionWarningJob = new BillWarningCronjob();
+        $subscriptionWarningJob->setForce($force);
         // set date in cron job:
         if ($date instanceof Carbon) {
-            $autoBudget->setDate($date);
+            $subscriptionWarningJob->setDate($date);
         }
 
-        $autoBudget->fire();
+        $subscriptionWarningJob->fire();
 
-        if ($autoBudget->jobErrored) {
-            $this->friendlyError(sprintf('Error in "bill warnings" cron: %s', $autoBudget->message));
+        if ($subscriptionWarningJob->jobErrored) {
+            $this->friendlyError(sprintf('Error in "subscription warnings" cron: %s', $subscriptionWarningJob->message));
         }
-        if ($autoBudget->jobFired) {
-            $this->friendlyInfo(sprintf('"Send bill warnings" cron fired: %s', $autoBudget->message));
+        if ($subscriptionWarningJob->jobFired) {
+            $this->friendlyInfo(sprintf('"Send subscription warnings" cron fired: %s', $subscriptionWarningJob->message));
         }
-        if ($autoBudget->jobSucceeded) {
-            $this->friendlyPositive(sprintf('"Send bill warnings" cron ran with success: %s', $autoBudget->message));
+        if ($subscriptionWarningJob->jobSucceeded) {
+            $this->friendlyPositive(sprintf('"Send subscription warnings" cron ran with success: %s', $subscriptionWarningJob->message));
         }
     }
 

app/Enums/WebhookResponse.php

@@ -31,5 +31,6 @@ enum WebhookResponse: int
 {
     case TRANSACTIONS = 200;
     case ACCOUNTS     = 210;
+    case BUDGET       = 230;
     case NONE         = 220;
 }

app/Enums/WebhookTrigger.php

@@ -29,10 +29,11 @@ namespace FireflyIII\Enums;
  */
 enum WebhookTrigger: int
 {
-    case STORE_TRANSACTION   = 100;
-    // case BEFORE_STORE_TRANSACTION = 101;
-    case UPDATE_TRANSACTION  = 110;
-    // case BEFORE_UPDATE_TRANSACTION = 111;
-    case DESTROY_TRANSACTION = 120;
-    // case BEFORE_DESTROY_TRANSACTION = 121;
+    case STORE_TRANSACTION         = 100;
+    case UPDATE_TRANSACTION        = 110;
+    case DESTROY_TRANSACTION       = 120;
+    case STORE_BUDGET              = 200;
+    case UPDATE_BUDGET             = 210;
+    case DESTROY_BUDGET            = 220;
+    case STORE_UPDATE_BUDGET_LIMIT = 230;
 }

app/Generator/Webhook/MessageGeneratorInterface.php

@@ -24,6 +24,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Generator\Webhook;
 
+use FireflyIII\Enums\WebhookTrigger;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
 
@@ -38,7 +39,7 @@ interface MessageGeneratorInterface
 
     public function setObjects(Collection $objects): void;
 
-    public function setTrigger(int $trigger): void;
+    public function setTrigger(WebhookTrigger $trigger): void;
 
     public function setUser(User $user): void;
 

app/Generator/Webhook/StandardMessageGenerator.php

@@ -47,11 +47,11 @@ use Symfony\Component\HttpFoundation\ParameterBag;
  */
 class StandardMessageGenerator implements MessageGeneratorInterface
 {
-    private Collection $objects;
-    private int        $trigger;
-    private User       $user;
-    private int        $version = 0;
-    private Collection $webhooks;
+    private Collection     $objects;
+    private WebhookTrigger $trigger;
+    private User           $user;
+    private int            $version = 0;
+    private Collection     $webhooks;
 
     public function __construct()
     {
@@ -68,9 +68,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
         }
 
         // do some debugging
-        Log::debug(
-            sprintf('StandardMessageGenerator will generate messages for %d object(s) and %d webhook(s).', $this->objects->count(), $this->webhooks->count())
-        );
+        Log::debug(sprintf('StandardMessageGenerator will generate messages for %d object(s) and %d webhook(s).', $this->objects->count(), $this->webhooks->count()));
         $this->run();
     }
 
@@ -79,6 +77,9 @@ class StandardMessageGenerator implements MessageGeneratorInterface
         return $this->user->webhooks()->where('active', true)->where('trigger', $this->trigger)->get(['webhooks.*']);
     }
 
+    /**
+     * @throws FireflyException
+     */
     private function run(): void
     {
         Log::debug('Now in StandardMessageGenerator::run');
@@ -111,31 +112,32 @@ class StandardMessageGenerator implements MessageGeneratorInterface
         $class        = $model::class;
         // Line is ignored because all of Firefly III's Models have an id property.
         Log::debug(sprintf('Now in generateMessage(#%d, %s#%d)', $webhook->id, $class, $model->id));
-
+        Log::debug($webhook->response);
+        Log::debug(WebhookResponse::from($webhook->response)->name);
         $uuid         = Uuid::uuid4();
         $basicMessage = [
-            'uuid'     => $uuid->toString(),
-            'user_id'  => 0,
-            'trigger'  => WebhookTrigger::from($webhook->trigger)->name,
-            'response' => WebhookResponse::from($webhook->response)->name,
-            'url'      => $webhook->url,
-            'version'  => sprintf('v%d', $this->getVersion()),
-            'content'  => [],
+            'uuid'          => $uuid->toString(),
+            'user_id'       => 0,
+            'user_group_id' => 0,
+            'trigger'       => WebhookTrigger::from((int) $webhook->trigger)->name,
+            'response'      => WebhookResponse::from((int) $webhook->response)->name,
+            'url'           => $webhook->url,
+            'version'       => sprintf('v%d', $this->getVersion()),
+            'content'       => [],
         ];
 
         // depends on the model how user_id is set:
         switch ($class) {
             default:
                 // Line is ignored because all of Firefly III's Models have an id property.
-                Log::error(
-                    sprintf('Webhook #%d was given %s#%d to deal with but can\'t extract user ID from it.', $webhook->id, $class, $model->id)
-                );
+                Log::error(sprintf('Webhook #%d was given %s#%d to deal with but can\'t extract user ID from it.', $webhook->id, $class, $model->id));
 
                 return;
 
             case TransactionGroup::class:
                 /** @var TransactionGroup $model */
-                $basicMessage['user_id'] = $model->user->id;
+                $basicMessage['user_id']       = $model->user_id;
+                $basicMessage['user_group_id'] = $model->user_group_id;
 
                 break;
         }
@@ -143,9 +145,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
         // then depends on the response what to put in the message:
         switch ($webhook->response) {
             default:
-                Log::error(
-                    sprintf('The response code for webhook #%d is "%d" and the message generator cant handle it. Soft fail.', $webhook->id, $webhook->response)
-                );
+                Log::error(sprintf('The response code for webhook #%d is "%d" and the message generator cant handle it. Soft fail.', $webhook->id, $webhook->response));
 
                 return;
 
@@ -224,7 +224,7 @@ class StandardMessageGenerator implements MessageGeneratorInterface
         $this->objects = $objects;
     }
 
-    public function setTrigger(int $trigger): void
+    public function setTrigger(WebhookTrigger $trigger): void
     {
         $this->trigger = $trigger;
     }

app/Handlers/Events/DestroyedGroupEventHandler.php

@@ -53,7 +53,7 @@ class DestroyedGroupEventHandler
         $engine = app(MessageGeneratorInterface::class);
         $engine->setUser($user);
         $engine->setObjects(new Collection([$group]));
-        $engine->setTrigger(WebhookTrigger::DESTROY_TRANSACTION->value);
+        $engine->setTrigger(WebhookTrigger::DESTROY_TRANSACTION);
         $engine->generateMessages();
 
         event(new RequestedSendWebhookMessages());

app/Handlers/Events/StoredGroupEventHandler.php

@@ -32,6 +32,7 @@ use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
 use FireflyIII\Services\Internal\Support\CreditRecalculateService;
 use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class StoredGroupEventHandler
@@ -51,11 +52,11 @@ class StoredGroupEventHandler
     private function processRules(StoredTransactionGroup $storedGroupEvent): void
     {
         if (false === $storedGroupEvent->applyRules) {
-            app('log')->info(sprintf('Will not run rules on group #%d', $storedGroupEvent->transactionGroup->id));
+            Log::info(sprintf('Will not run rules on group #%d', $storedGroupEvent->transactionGroup->id));
 
             return;
         }
-        app('log')->debug('Now in StoredGroupEventHandler::processRules()');
+        Log::debug('Now in StoredGroupEventHandler::processRules()');
 
         $journals            = $storedGroupEvent->transactionGroup->transactionJournals;
         $array               = [];
@@ -65,7 +66,7 @@ class StoredGroupEventHandler
             $array[] = $journal->id;
         }
         $journalIds          = implode(',', $array);
-        app('log')->debug(sprintf('Add local operator for journal(s): %s', $journalIds));
+        Log::debug(sprintf('Add local operator for journal(s): %s', $journalIds));
 
         // collect rules:
         $ruleGroupRepository = app(RuleGroupRepositoryInterface::class);
@@ -98,10 +99,10 @@ class StoredGroupEventHandler
      */
     private function triggerWebhooks(StoredTransactionGroup $storedGroupEvent): void
     {
-        app('log')->debug(__METHOD__);
+        Log::debug(__METHOD__);
         $group  = $storedGroupEvent->transactionGroup;
         if (false === $storedGroupEvent->fireWebhooks) {
-            app('log')->info(sprintf('Will not fire webhooks for transaction group #%d', $group->id));
+            Log::info(sprintf('Will not fire webhooks for transaction group #%d', $group->id));
 
             return;
         }
@@ -113,7 +114,7 @@ class StoredGroupEventHandler
         $engine->setUser($user);
 
         // tell the generator which trigger it should look for
-        $engine->setTrigger(WebhookTrigger::STORE_TRANSACTION->value);
+        $engine->setTrigger(WebhookTrigger::STORE_TRANSACTION);
         // tell the generator which objects to process
         $engine->setObjects(new Collection([$group]));
         // tell the generator to generate the messages

app/Handlers/Events/UpdatedGroupEventHandler.php

@@ -164,7 +164,7 @@ class UpdatedGroupEventHandler
         $engine = app(MessageGeneratorInterface::class);
         $engine->setUser($user);
         $engine->setObjects(new Collection([$group]));
-        $engine->setTrigger(WebhookTrigger::UPDATE_TRANSACTION->value);
+        $engine->setTrigger(WebhookTrigger::UPDATE_TRANSACTION);
         $engine->generateMessages();
 
         event(new RequestedSendWebhookMessages());

app/Helpers/Collector/GroupCollector.php

@@ -839,7 +839,7 @@ class GroupCollector implements GroupCollectorInterface
                     return 'zzz';
                 }
 
-                exit('here we are 2');
+                return 'zzz';
             });
         }
 

app/Http/Controllers/Auth/RegisterController.php

@@ -36,6 +36,7 @@ use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\ValidationException;
 use Illuminate\View\View;
 use Psr\Container\ContainerExceptionInterface;
@@ -94,7 +95,7 @@ class RegisterController extends Controller
 
         $this->validator($request->all())->validate();
         $user              = $this->createUser($request->all());
-        app('log')->info(sprintf('Registered new user %s', $user->email));
+        Log::info(sprintf('Registered new user %s', $user->email));
         $owner             = new OwnerNotifiable();
         event(new RegisteredUser($owner, $user));
 

app/Http/Controllers/NewUserController.php

@@ -112,7 +112,7 @@ class NewUserController extends Controller
         $this->createCashWalletAccount($currency, $language);        // create cash wallet account
 
         // store currency preference:
-        $currencyRepository->makeDefault($currency);
+        $currencyRepository->makePrimary($currency);
 
         // store frontpage preferences:
         $accounts      = $this->repository->getAccountsByType([AccountTypeEnum::ASSET->value])->pluck('id')->toArray();

app/Repositories/Currency/CurrencyRepository.php

@@ -417,7 +417,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface, UserGroupInterf
 
         // currency must be made default.
         if (true === $default) {
-            $this->makeDefault($currency);
+            $this->makePrimary($currency);
         }
 
         /** @var CurrencyUpdateService $service */
@@ -426,7 +426,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface, UserGroupInterf
         return $service->update($currency, $data);
     }
 
-    public function makeDefault(TransactionCurrency $currency): void
+    public function makePrimary(TransactionCurrency $currency): void
     {
         $current = app('amount')->getPrimaryCurrencyByUserGroup($this->userGroup);
         Log::debug(sprintf('Enabled + made default currency %s for user #%d', $currency->code, $this->userGroup->id));

app/Repositories/Currency/CurrencyRepositoryInterface.php

@@ -102,7 +102,7 @@ interface CurrencyRepositoryInterface
 
     public function isFallbackCurrency(TransactionCurrency $currency): bool;
 
-    public function makeDefault(TransactionCurrency $currency): void;
+    public function makePrimary(TransactionCurrency $currency): void;
 
     public function searchCurrency(string $search, int $limit): Collection;
 

app/Repositories/UserGroup/UserGroupRepository.php

@@ -209,7 +209,7 @@ class UserGroupRepository implements UserGroupRepositoryInterface, UserGroupInte
             $currency = $repository->find((int) $data['primary_currency_id']);
         }
         if (null !== $currency) {
-            $repository->makeDefault($currency);
+            $repository->makePrimary($currency);
         }
 
 

app/Repositories/UserGroups/Currency/CurrencyRepository.php

@@ -365,7 +365,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface
 
         // currency must be made default.
         if (true === $default) {
-            $this->makeDefault($currency);
+            $this->makePrimary($currency);
         }
 
         /** @var CurrencyUpdateService $service */
@@ -374,7 +374,7 @@ class CurrencyRepository implements CurrencyRepositoryInterface
         return $service->update($currency, $data);
     }
 
-    public function makeDefault(TransactionCurrency $currency): void
+    public function makePrimary(TransactionCurrency $currency): void
     {
         $current = app('amount')->getPrimaryCurrencyByUserGroup($this->userGroup);
         Log::debug(sprintf('Enabled + made default currency %s for user #%d', $currency->code, $this->userGroup->id));

app/Repositories/UserGroups/Currency/CurrencyRepositoryInterface.php

@@ -89,7 +89,7 @@ interface CurrencyRepositoryInterface
 
     public function isFallbackCurrency(TransactionCurrency $currency): bool;
 
-    public function makeDefault(TransactionCurrency $currency): void;
+    public function makePrimary(TransactionCurrency $currency): void;
 
     public function searchCurrency(string $search, int $limit): Collection;
 

app/Support/Binder/EitherConfigKey.php

@@ -57,6 +57,11 @@ class EitherConfigKey
             'firefly.rule-actions',
             'firefly.context-rule-actions',
             'search.operators',
+
+            // webhooks
+            'webhook.triggers',
+            'webhook.responses',
+            'webhook.deliveries',
         ];
 
     /**

app/Support/Chart/Category/FrontpageChartGenerator.php

@@ -65,55 +65,27 @@ class FrontpageChartGenerator
 
     public function generate(): array
     {
-        Log::debug('Now in generate()');
+        Log::debug(sprintf('Now in %s', __METHOD__));
         $categories   = $this->repository->getCategories();
         $accounts     = $this->accountRepos->getAccountsByType([AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value]);
-
-        // get expenses + income per category:
-        $collection   = [];
-
-        /** @var Category $category */
-        foreach ($categories as $category) {
-            // get expenses
-            $collection[] = $this->collectExpenses($category, $accounts);
-        }
+        $collection   = $this->collectExpensesAll($categories, $accounts);
 
         // collect for no-category:
-        $collection[] = $this->collectNoCatExpenses($accounts);
-
-        $tempData     = array_merge(...$collection);
+        $noCategory   = $this->collectNoCatExpenses($accounts);
+        $collection   = array_merge($collection, $noCategory);
 
         // sort temp array by amount.
-        $amounts      = array_column($tempData, 'sum_float');
-        array_multisort($amounts, SORT_ASC, $tempData);
+        $amounts      = array_column($collection, 'sum_float');
+        array_multisort($amounts, SORT_ASC, $collection);
 
-        $currencyData = $this->createCurrencyGroups($tempData);
+        $currencyData = $this->createCurrencyGroups($collection);
 
-        return $this->insertValues($currencyData, $tempData);
-    }
-
-    private function collectExpenses(Category $category, Collection $accounts): array
-    {
-        Log::debug(sprintf('Collect expenses for category #%d ("%s")', $category->id, $category->name));
-        $spent    = $this->opsRepos->sumExpenses($this->start, $this->end, $accounts, new Collection([$category]));
-        $tempData = [];
-        foreach ($spent as $currency) {
-            Log::debug(sprintf('Spent %s %s', $currency['currency_code'], $currency['sum']));
-            $this->addCurrency($currency);
-            $tempData[] = [
-                'name'        => $category->name,
-                'sum'         => $currency['sum'],
-                'sum_float'   => round((float) $currency['sum'], $currency['currency_decimal_places']),
-                'currency_id' => (int) $currency['currency_id'],
-            ];
-        }
-
-        return $tempData;
+        return $this->insertValues($currencyData, $collection);
     }
 
     private function addCurrency(array $currency): void
     {
-        $currencyId = (int) $currency['currency_id'];
+        $currencyId = (int)$currency['currency_id'];
 
         $this->currencies[$currencyId] ??= [
             'currency_id'             => $currencyId,
@@ -133,8 +105,8 @@ class FrontpageChartGenerator
             $tempData[] = [
                 'name'        => trans('firefly.no_category'),
                 'sum'         => $currency['sum'],
-                'sum_float'   => round((float) $currency['sum'], $currency['currency_decimal_places'] ?? 2), // intentional float
-                'currency_id' => (int) $currency['currency_id'],
+                'sum_float'   => round((float)$currency['sum'], $currency['currency_decimal_places'] ?? 2), // intentional float
+                'currency_id' => (int)$currency['currency_id'],
             ];
         }
 
@@ -152,7 +124,7 @@ class FrontpageChartGenerator
         foreach ($this->currencies as $currencyId => $currency) {
             $key          = sprintf('spent-%d', $currencyId);
             $return[$key] = [
-                'label'           => sprintf('%s (%s)', (string) trans('firefly.spent'), $currency['currency_name']),
+                'label'           => sprintf('%s (%s)', (string)trans('firefly.spent'), $currency['currency_name']),
                 'type'            => 'bar',
                 'currency_symbol' => $currency['currency_symbol'],
                 'entries'         => $names,
@@ -175,4 +147,28 @@ class FrontpageChartGenerator
 
         return $currencyData;
     }
+
+    private function collectExpensesAll(Collection $categories, Collection $accounts): array
+    {
+        Log::debug(sprintf('Collect expenses for %d category(ies).', count($categories)));
+        $spent    = $this->opsRepos->collectExpenses($this->start, $this->end, $accounts, $categories);
+        $tempData = [];
+        foreach ($categories as $category) {
+            $sums = $this->opsRepos->sumCollectedTransactionsByCategory($spent, $category, 'negative', $this->convertToPrimary);
+            if (0 === count($sums)) {
+                continue;
+            }
+            foreach ($sums as $currency) {
+                $this->addCurrency($currency);
+                $tempData[] = [
+                    'name'        => $category->name,
+                    'sum'         => $currency['sum'],
+                    'sum_float'   => round((float)$currency['sum'], $currency['currency_decimal_places']),
+                    'currency_id' => (int)$currency['currency_id'],
+                ];
+            }
+        }
+
+        return $tempData;
+    }
 }

app/Support/Export/ExportDataGenerator.php

@@ -42,6 +42,7 @@ use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleAction;
 use FireflyIII\Models\RuleTrigger;
 use FireflyIII\Models\Tag;
+use FireflyIII\Models\UserGroup;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
@@ -84,6 +85,7 @@ class ExportDataGenerator
     private bool       $exportTransactions;
     private Carbon     $start;
     private User       $user;
+    private UserGroup $userGroup;
 
     public function __construct()
     {
@@ -906,4 +908,9 @@ class ExportDataGenerator
     {
         $this->start = $start;
     }
+
+    public function setUserGroup(UserGroup $userGroup): void
+    {
+        $this->userGroup = $userGroup;
+    }
 }

app/Support/Http/Api/ValidatesUserGroupTrait.php

@@ -39,6 +39,7 @@ use Illuminate\Support\Facades\Log;
 trait ValidatesUserGroupTrait
 {
     protected ?UserGroup $userGroup = null;
+    protected ?User $user           = null;
 
     /**
      * An "undocumented" filter
@@ -101,6 +102,7 @@ trait ValidatesUserGroupTrait
             if ($user->hasRoleInGroupOrOwner($group, $role)) {
                 Log::debug(sprintf('validateUserGroup: User has role "%s" in group #%d, return the group.', $role->value, $groupId));
                 $this->userGroup = $group;
+                $this->user      = $user;
 
                 return $group;
             }

app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php

@@ -73,10 +73,12 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
     public function enrich(Collection $collection): Collection
     {
         $this->collection = $collection;
-        $this->collectIds();
-        $this->collectCurrencies();
-        $this->collectSpentInfo();
-        $this->appendCollectedData();
+        if ($this->collection->count() > 0) {
+            $this->collectIds();
+            $this->collectCurrencies();
+            $this->collectSpentInfo();
+            $this->appendCollectedData();
+        }
 
         return $this->collection;
     }
@@ -85,7 +87,7 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
     public function enrichSingle(array|Model $model): array|Model
     {
         Log::debug(__METHOD__);
-        $collection = new Collection([$model]);
+        $collection = new Collection()->push($model);
         $collection = $this->enrich($collection);
 
         return $collection->first();
@@ -119,8 +121,8 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
 
     private function collectSpentInfo(): void
     {
-        $start               = $this->collection->min('start_date');
-        $end                 = $this->collection->max('end_date');
+        $start               = $this->collection->min('start_date') ?? Carbon::now()->startOfMonth();
+        $end                 = $this->collection->max('end_date') ?? Carbon::now()->endOfMonth();
         $allActive           = $this->repository->getActiveBudgets();
         $spentInBudgets      = $this->opsRepository->collectExpenses($start, $end, null, $allActive, null);
         $spentOutsideBudgets = $this->noBudgetRepository->collectExpenses($start, $end, null, null, null);
@@ -139,14 +141,7 @@ class AvailableBudgetEnrichment implements EnrichmentInterface
                 $this->pcSpentInBudgets[$id]      = array_values($pcFilteredSpentInBudgets);
                 $this->pcSpentOutsideBudgets[$id] = array_values($pcFilteredSpentOutsideBudgets);
             }
-
-
-            // filter arrays on date.
-            // send them to sumCollection thing.
-            // save.
         }
-
-        // first collect, then filter and append.
     }
 
     private function appendCollectedData(): void

app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php

@@ -47,6 +47,7 @@ class BudgetLimitEnrichment implements EnrichmentInterface
         $this->collectCurrencies();
         $this->collectNotes();
         $this->collectBudgets();
+        $this->stringifyIds();
         $this->appendCollectedData();
 
         return $this->collection;
@@ -74,8 +75,8 @@ class BudgetLimitEnrichment implements EnrichmentInterface
 
     private function collectIds(): void
     {
-        $this->start       = $this->collection->min('start_date');
-        $this->end         = $this->collection->max('end_date');
+        $this->start       = $this->collection->min('start_date') ?? Carbon::now()->startOfMonth();
+        $this->end         = $this->collection->max('end_date') ?? Carbon::now()->endOfMonth();
 
         /** @var BudgetLimit $limit */
         foreach ($this->collection as $limit) {
@@ -155,4 +156,23 @@ class BudgetLimitEnrichment implements EnrichmentInterface
             $this->currencies[(int)$currency->id] = $currency;
         }
     }
+
+    private function stringifyIds(): void
+    {
+        $this->expenses   = array_map(function ($first) {
+            return array_map(function ($second) {
+                $second['currency_id'] = (string)($second['currency_id'] ?? 0);
+
+                return $second;
+            }, $first);
+        }, $this->expenses);
+
+        $this->pcExpenses = array_map(function ($first) {
+            return array_map(function ($second) {
+                $second['currency_id'] = (string)($second['currency_id'] ?? 0);
+
+                return $second;
+            }, $first);
+        }, $this->expenses);
+    }
 }

app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php

@@ -170,7 +170,7 @@ class PiggyBankEnrichment implements EnrichmentInterface
             // add object group if available
             if (array_key_exists($id, $this->mappedObjects)) {
                 $key                        = $this->mappedObjects[$id];
-                $meta['object_group_id']    = $this->objectGroups[$key]['id'];
+                $meta['object_group_id']    = (string) $this->objectGroups[$key]['id'];
                 $meta['object_group_title'] = $this->objectGroups[$key]['title'];
                 $meta['object_group_order'] = $this->objectGroups[$key]['order'];
             }

app/Support/Navigation.php

@@ -464,7 +464,7 @@ class Navigation
         $displayFormat = (string) trans('config.month_and_day_js', [], $locale);
         $diff          = $start->diffInMonths($end, true);
         // increment by month (for year)
-        if ($diff >= 1.0001) {
+        if ($diff >= 1.0001 && $diff < 12.001) {
             $increment     = 'addMonth';
             $displayFormat = (string) trans('config.month_js');
         }
@@ -495,7 +495,7 @@ class Navigation
         $format = 'Y-m-d';
         $diff   = $start->diffInMonths($end, true);
         // Log::debug(sprintf('preferredCarbonFormat(%s, %s) = %f', $start->format('Y-m-d'), $end->format('Y-m-d'), $diff));
-        if ($diff >= 1.001) {
+        if ($diff >= 1.001 && $diff < 12.001) {
             //            Log::debug(sprintf('Return Y-m because %s', $diff));
             $format = 'Y-m';
         }
@@ -566,7 +566,7 @@ class Navigation
     {
         $locale = app('steam')->getLocale();
         $diff   = $start->diffInMonths($end, true);
-        if ($diff >= 1.001) {
+        if ($diff >= 1.001 && $diff < 12.001) {
             return (string) trans('config.month_js', [], $locale);
         }
 
@@ -584,7 +584,7 @@ class Navigation
     public function preferredEndOfPeriod(Carbon $start, Carbon $end): string
     {
         $diff = $start->diffInMonths($end, true);
-        if ($diff >= 1.001) {
+        if ($diff >= 1.001 && $diff < 12.001) {
             return 'endOfMonth';
         }
 
@@ -602,7 +602,7 @@ class Navigation
     public function preferredRangeFormat(Carbon $start, Carbon $end): string
     {
         $diff = $start->diffInMonths($end, true);
-        if ($diff >= 1.001) {
+        if ($diff >= 1.001 && $diff < 12.001) {
             return '1M';
         }
 
@@ -620,7 +620,7 @@ class Navigation
     public function preferredSqlFormat(Carbon $start, Carbon $end): string
     {
         $diff = $start->diffInMonths($end, true);
-        if ($diff >= 1.001) {
+        if ($diff >= 1.001 && $diff < 12.001) {
             return '%Y-%m';
         }
 

app/Support/Repositories/UserGroup/UserGroupTrait.php

@@ -66,14 +66,15 @@ trait UserGroupTrait
         if ($user instanceof User) {
             $this->user      = $user;
             if (null === $user->userGroup) {
-                throw new FireflyException(sprintf('User #%d has no user group.', $user->id));
+                throw new FireflyException(sprintf('User #%d ("%s") has no user group.', $user->id, $user->email));
             }
             $this->userGroup = $user->userGroup;
 
             return;
         }
+        $class = null === $user ? 'NULL' : $user::class;
 
-        throw new FireflyException(sprintf('Object is of class %s, not User.', $user::class));
+        throw new FireflyException(sprintf('Object is %s, not User.', $class));
     }
 
     public function getUserGroup(): ?UserGroup

app/Support/Request/GetFilterInstructions.php

@@ -24,10 +24,15 @@ declare(strict_types=1);
 
 namespace FireflyIII\Support\Request;
 
+use FireflyIII\Exceptions\FireflyException;
+
 trait GetFilterInstructions
 {
     private const string INVALID_FILTER = '%INVALID_JAMES_%';
 
+    /**
+     * @throws FireflyException
+     */
     final public function getFilterInstructions(string $key): array
     {
         $config  = config(sprintf('firefly.filters.allowed.%s', $key));
@@ -48,7 +53,7 @@ trait GetFilterInstructions
 
             switch ($filterType) {
                 default:
-                    exit(sprintf('Do not support filter type "%s"', $filterType));
+                    throw new FireflyException(sprintf('Do not support filter type "%s"', $filterType));
 
                 case 'boolean':
                     $filterValue = $this->booleanInstruction($filterValue);

app/Transformers/BudgetLimitTransformer.php

@@ -28,6 +28,7 @@ use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
+use FireflyIII\Support\JsonApi\Enrichments\BudgetEnrichment;
 use League\Fractal\Resource\Item;
 
 /**
@@ -55,7 +56,15 @@ class BudgetLimitTransformer extends AbstractTransformer
      */
     public function includeBudget(BudgetLimit $limit)
     {
-        return $this->item($limit->budget, new BudgetTransformer(), 'budgets');
+        // enrich budget
+        $budget     = $limit->budget;
+        $enrichment = new BudgetEnrichment();
+        $enrichment->setStart($this->parameters->get('start'));
+        $enrichment->setEnd($this->parameters->get('end'));
+        $enrichment->setUser($budget->user);
+        $budget     = $enrichment->enrichSingle($budget);
+
+        return $this->item($budget, new BudgetTransformer(), 'budgets');
     }
 
     /**
@@ -91,7 +100,7 @@ class BudgetLimitTransformer extends AbstractTransformer
             'currency_symbol'                 => $currency->symbol,
             'currency_decimal_places'         => $currency->decimal_places,
 
-            'primary_currency_id'             => (int)$this->primaryCurrency->id,
+            'primary_currency_id'             => (string) $this->primaryCurrency->id,
             'primary_currency_name'           => $this->primaryCurrency->name,
             'primary_currency_code'           => $this->primaryCurrency->code,
             'primary_currency_symbol'         => $this->primaryCurrency->symbol,

app/Transformers/CategoryTransformer.php

@@ -79,8 +79,11 @@ class CategoryTransformer extends AbstractTransformer
         ];
     }
 
-    private function beautify(array $array): array
+    private function beautify(?array $array): ?array
     {
+        if (null === $array) {
+            return null;
+        }
         $return = [];
         foreach ($array as $data) {
             $data['sum'] = Steam::bcround($data['sum'], (int)$data['currency_decimal_places']);

app/User.php

@@ -74,7 +74,7 @@ class User extends Authenticatable
     use HasApiTokens;
     use Notifiable;
     use ReturnsIntegerIdTrait;
-    protected $fillable = ['email', 'password', 'blocked', 'blocked_code'];
+    protected $fillable = ['email', 'password', 'blocked', 'blocked_code', 'user_group_id'];
     protected $hidden   = ['password', 'remember_token'];
     protected $table    = 'users';
 

changelog.md

@@ -5,7 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## 6.3.0 - 2025-08-xx
 
-> ⚠️ Firefly III v6.3.0 introduces a lot of API changes that deal with multi-currency support. Make sure your beloved apps are updated to support this.
+> [!WARNING]
+> Firefly III v6.3.0 introduces a lot of API changes that deal with multi-currency support. Make sure your beloved apps are updated to support this.
 
 ### Added
 

composer.lock

@@ -11771,16 +11771,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "12.3.4",
+            "version": "12.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "429095031bd38cb5070ca44166bd9dd5a9245dd6"
+                "reference": "f10ba5f12a256026ad3c7ee4894ffe47f60d7dc7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/429095031bd38cb5070ca44166bd9dd5a9245dd6",
-                "reference": "429095031bd38cb5070ca44166bd9dd5a9245dd6",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f10ba5f12a256026ad3c7ee4894ffe47f60d7dc7",
+                "reference": "f10ba5f12a256026ad3c7ee4894ffe47f60d7dc7",
                 "shasum": ""
             },
             "require": {
@@ -11802,7 +11802,7 @@
                 "sebastian/cli-parser": "^4.0.0",
                 "sebastian/comparator": "^7.1.2",
                 "sebastian/diff": "^7.0.0",
-                "sebastian/environment": "^8.0.2",
+                "sebastian/environment": "^8.0.3",
                 "sebastian/exporter": "^7.0.0",
                 "sebastian/global-state": "^8.0.0",
                 "sebastian/object-enumerator": "^7.0.0",
@@ -11848,7 +11848,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.3.4"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/12.3.5"
             },
             "funding": [
                 {
@@ -11872,20 +11872,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-12T07:35:30+00:00"
+            "time": "2025-08-16T05:20:09+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "2.1.3",
+            "version": "2.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "dd430c869fddf4965049c8fd6f5ee49f155cfddf"
+                "reference": "fe613c528819222f8686a9a037a315ef9d4915b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/dd430c869fddf4965049c8fd6f5ee49f155cfddf",
-                "reference": "dd430c869fddf4965049c8fd6f5ee49f155cfddf",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/fe613c528819222f8686a9a037a315ef9d4915b3",
+                "reference": "fe613c528819222f8686a9a037a315ef9d4915b3",
                 "shasum": ""
             },
             "require": {
@@ -11924,7 +11924,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/2.1.3"
+                "source": "https://github.com/rectorphp/rector/tree/2.1.4"
             },
             "funding": [
                 {
@@ -11932,7 +11932,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-08-13T11:43:04+00:00"
+            "time": "2025-08-15T14:41:36+00:00"
         },
         {
             "name": "sebastian/cli-parser",

config/firefly.php

@@ -78,8 +78,8 @@ return [
         'running_balance_column' => env('USE_RUNNING_BALANCE', false),
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => '6.3.0-beta.2',
-    'build_time'                   => 1755258109,
+    'version'                      => 'develop/2025-08-18',
+    'build_time'                   => 1755509249,
     'api_version'                  => '2.1.0', // field is no longer used.
     'db_version'                   => 26,
 

config/translations.php

@@ -57,6 +57,7 @@ return [
                 'liability_direction_credit_short',
                 'liability_direction_null_short',
                 'interest_calc_yearly',
+                'loading',
                 'interest_calc_',
                 'interest_calc_null',
                 'interest_calc_daily',
@@ -246,12 +247,19 @@ return [
                 'multi_account_warning_withdrawal',
                 'multi_account_warning_deposit',
                 'multi_account_warning_transfer',
+
                 'webhook_trigger_STORE_TRANSACTION',
                 'webhook_trigger_UPDATE_TRANSACTION',
                 'webhook_trigger_DESTROY_TRANSACTION',
+
+                'webhook_trigger_STORE_BUDGET',
+                'webhook_trigger_UPDATE_BUDGET',
+                'webhook_trigger_DESTROY_BUDGET',
+                'webhook_trigger_STORE_UPDATE_BUDGET_LIMIT',
+
                 'webhook_response_TRANSACTIONS',
                 'webhook_response_ACCOUNTS',
-                'webhook_response_none_NONE',
+                'webhook_response_NONE',
                 'webhook_delivery_JSON',
                 'actions',
                 'meta_data',

package-lock.json

@@ -2592,9 +2592,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.46.2.tgz",
-            "integrity": "sha512-Zj3Hl6sN34xJtMv7Anwb5Gu01yujyE/cLBDB2gnHTAHaWS1Z38L7kuSG+oAh0giZMqG060f/YBStXtMH6FvPMA==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.46.3.tgz",
+            "integrity": "sha512-UmTdvXnLlqQNOCJnyksjPs1G4GqXNGW1LrzCe8+8QoaLhhDeTXYBgJ3k6x61WIhlHX2U+VzEJ55TtIjR/HTySA==",
             "cpu": [
                 "arm"
             ],
@@ -2606,9 +2606,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.46.2.tgz",
-            "integrity": "sha512-nTeCWY83kN64oQ5MGz3CgtPx8NSOhC5lWtsjTs+8JAJNLcP3QbLCtDDgUKQc/Ro/frpMq4SHUaHN6AMltcEoLQ==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.46.3.tgz",
+            "integrity": "sha512-8NoxqLpXm7VyeI0ocidh335D6OKT0UJ6fHdnIxf3+6oOerZZc+O7r+UhvROji6OspyPm+rrIdb1gTXtVIqn+Sg==",
             "cpu": [
                 "arm64"
             ],
@@ -2620,9 +2620,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.46.2.tgz",
-            "integrity": "sha512-HV7bW2Fb/F5KPdM/9bApunQh68YVDU8sO8BvcW9OngQVN3HHHkw99wFupuUJfGR9pYLLAjcAOA6iO+evsbBaPQ==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.46.3.tgz",
+            "integrity": "sha512-csnNavqZVs1+7/hUKtgjMECsNG2cdB8F7XBHP6FfQjqhjF8rzMzb3SLyy/1BG7YSfQ+bG75Ph7DyedbUqwq1rA==",
             "cpu": [
                 "arm64"
             ],
@@ -2634,9 +2634,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.46.2.tgz",
-            "integrity": "sha512-SSj8TlYV5nJixSsm/y3QXfhspSiLYP11zpfwp6G/YDXctf3Xkdnk4woJIF5VQe0of2OjzTt8EsxnJDCdHd2xMA==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.46.3.tgz",
+            "integrity": "sha512-r2MXNjbuYabSIX5yQqnT8SGSQ26XQc8fmp6UhlYJd95PZJkQD1u82fWP7HqvGUf33IsOC6qsiV+vcuD4SDP6iw==",
             "cpu": [
                 "x64"
             ],
@@ -2648,9 +2648,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.46.2.tgz",
-            "integrity": "sha512-ZyrsG4TIT9xnOlLsSSi9w/X29tCbK1yegE49RYm3tu3wF1L/B6LVMqnEWyDB26d9Ecx9zrmXCiPmIabVuLmNSg==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.46.3.tgz",
+            "integrity": "sha512-uluObTmgPJDuJh9xqxyr7MV61Imq+0IvVsAlWyvxAaBSNzCcmZlhfYcRhCdMaCsy46ccZa7vtDDripgs9Jkqsw==",
             "cpu": [
                 "arm64"
             ],
@@ -2662,9 +2662,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.46.2.tgz",
-            "integrity": "sha512-pCgHFoOECwVCJ5GFq8+gR8SBKnMO+xe5UEqbemxBpCKYQddRQMgomv1104RnLSg7nNvgKy05sLsY51+OVRyiVw==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.46.3.tgz",
+            "integrity": "sha512-AVJXEq9RVHQnejdbFvh1eWEoobohUYN3nqJIPI4mNTMpsyYN01VvcAClxflyk2HIxvLpRcRggpX1m9hkXkpC/A==",
             "cpu": [
                 "x64"
             ],
@@ -2676,9 +2676,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.46.2.tgz",
-            "integrity": "sha512-EtP8aquZ0xQg0ETFcxUbU71MZlHaw9MChwrQzatiE8U/bvi5uv/oChExXC4mWhjiqK7azGJBqU0tt5H123SzVA==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.46.3.tgz",
+            "integrity": "sha512-byyflM+huiwHlKi7VHLAYTKr67X199+V+mt1iRgJenAI594vcmGGddWlu6eHujmcdl6TqSNnvqaXJqZdnEWRGA==",
             "cpu": [
                 "arm"
             ],
@@ -2690,9 +2690,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.46.2.tgz",
-            "integrity": "sha512-qO7F7U3u1nfxYRPM8HqFtLd+raev2K137dsV08q/LRKRLEc7RsiDWihUnrINdsWQxPR9jqZ8DIIZ1zJJAm5PjQ==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.46.3.tgz",
+            "integrity": "sha512-aLm3NMIjr4Y9LklrH5cu7yybBqoVCdr4Nvnm8WB7PKCn34fMCGypVNpGK0JQWdPAzR/FnoEoFtlRqZbBBLhVoQ==",
             "cpu": [
                 "arm"
             ],
@@ -2704,9 +2704,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.46.2.tgz",
-            "integrity": "sha512-3dRaqLfcOXYsfvw5xMrxAk9Lb1f395gkoBYzSFcc/scgRFptRXL9DOaDpMiehf9CO8ZDRJW2z45b6fpU5nwjng==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.46.3.tgz",
+            "integrity": "sha512-VtilE6eznJRDIoFOzaagQodUksTEfLIsvXymS+UdJiSXrPW7Ai+WG4uapAc3F7Hgs791TwdGh4xyOzbuzIZrnw==",
             "cpu": [
                 "arm64"
             ],
@@ -2718,9 +2718,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.46.2.tgz",
-            "integrity": "sha512-fhHFTutA7SM+IrR6lIfiHskxmpmPTJUXpWIsBXpeEwNgZzZZSg/q4i6FU4J8qOGyJ0TR+wXBwx/L7Ho9z0+uDg==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.46.3.tgz",
+            "integrity": "sha512-dG3JuS6+cRAL0GQ925Vppafi0qwZnkHdPeuZIxIPXqkCLP02l7ka+OCyBoDEv8S+nKHxfjvjW4OZ7hTdHkx8/w==",
             "cpu": [
                 "arm64"
             ],
@@ -2732,9 +2732,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.46.2.tgz",
-            "integrity": "sha512-i7wfGFXu8x4+FRqPymzjD+Hyav8l95UIZ773j7J7zRYc3Xsxy2wIn4x+llpunexXe6laaO72iEjeeGyUFmjKeA==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.46.3.tgz",
+            "integrity": "sha512-iU8DxnxEKJptf8Vcx4XvAUdpkZfaz0KWfRrnIRrOndL0SvzEte+MTM7nDH4A2Now4FvTZ01yFAgj6TX/mZl8hQ==",
             "cpu": [
                 "loong64"
             ],
@@ -2746,9 +2746,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.46.2.tgz",
-            "integrity": "sha512-B/l0dFcHVUnqcGZWKcWBSV2PF01YUt0Rvlurci5P+neqY/yMKchGU8ullZvIv5e8Y1C6wOn+U03mrDylP5q9Yw==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.46.3.tgz",
+            "integrity": "sha512-VrQZp9tkk0yozJoQvQcqlWiqaPnLM6uY1qPYXvukKePb0fqaiQtOdMJSxNFUZFsGw5oA5vvVokjHrx8a9Qsz2A==",
             "cpu": [
                 "ppc64"
             ],
@@ -2760,9 +2760,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.46.2.tgz",
-            "integrity": "sha512-32k4ENb5ygtkMwPMucAb8MtV8olkPT03oiTxJbgkJa7lJ7dZMr0GCFJlyvy+K8iq7F/iuOr41ZdUHaOiqyR3iQ==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.46.3.tgz",
+            "integrity": "sha512-uf2eucWSUb+M7b0poZ/08LsbcRgaDYL8NCGjUeFMwCWFwOuFcZ8D9ayPl25P3pl+D2FH45EbHdfyUesQ2Lt9wA==",
             "cpu": [
                 "riscv64"
             ],
@@ -2774,9 +2774,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.46.2.tgz",
-            "integrity": "sha512-t5B2loThlFEauloaQkZg9gxV05BYeITLvLkWOkRXogP4qHXLkWSbSHKM9S6H1schf/0YGP/qNKtiISlxvfmmZw==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.46.3.tgz",
+            "integrity": "sha512-7tnUcDvN8DHm/9ra+/nF7lLzYHDeODKKKrh6JmZejbh1FnCNZS8zMkZY5J4sEipy2OW1d1Ncc4gNHUd0DLqkSg==",
             "cpu": [
                 "riscv64"
             ],
@@ -2788,9 +2788,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.46.2.tgz",
-            "integrity": "sha512-YKjekwTEKgbB7n17gmODSmJVUIvj8CX7q5442/CK80L8nqOUbMtf8b01QkG3jOqyr1rotrAnW6B/qiHwfcuWQA==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.46.3.tgz",
+            "integrity": "sha512-MUpAOallJim8CsJK+4Lc9tQzlfPbHxWDrGXZm2z6biaadNpvh3a5ewcdat478W+tXDoUiHwErX/dOql7ETcLqg==",
             "cpu": [
                 "s390x"
             ],
@@ -2802,9 +2802,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.46.2.tgz",
-            "integrity": "sha512-Jj5a9RUoe5ra+MEyERkDKLwTXVu6s3aACP51nkfnK9wJTraCC8IMe3snOfALkrjTYd2G1ViE1hICj0fZ7ALBPA==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.46.3.tgz",
+            "integrity": "sha512-F42IgZI4JicE2vM2PWCe0N5mR5vR0gIdORPqhGQ32/u1S1v3kLtbZ0C/mi9FFk7C5T0PgdeyWEPajPjaUpyoKg==",
             "cpu": [
                 "x64"
             ],
@@ -2816,9 +2816,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.46.2.tgz",
-            "integrity": "sha512-7kX69DIrBeD7yNp4A5b81izs8BqoZkCIaxQaOpumcJ1S/kmqNFjPhDu1LHeVXv0SexfHQv5cqHsxLOjETuqDuA==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.46.3.tgz",
+            "integrity": "sha512-oLc+JrwwvbimJUInzx56Q3ujL3Kkhxehg7O1gWAYzm8hImCd5ld1F2Gry5YDjR21MNb5WCKhC9hXgU7rRlyegQ==",
             "cpu": [
                 "x64"
             ],
@@ -2830,9 +2830,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.46.2.tgz",
-            "integrity": "sha512-wiJWMIpeaak/jsbaq2HMh/rzZxHVW1rU6coyeNNpMwk5isiPjSTx0a4YLSlYDwBH/WBvLz+EtsNqQScZTLJy3g==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.46.3.tgz",
+            "integrity": "sha512-lOrQ+BVRstruD1fkWg9yjmumhowR0oLAAzavB7yFSaGltY8klttmZtCLvOXCmGE9mLIn8IBV/IFrQOWz5xbFPg==",
             "cpu": [
                 "arm64"
             ],
@@ -2844,9 +2844,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.46.2.tgz",
-            "integrity": "sha512-gBgaUDESVzMgWZhcyjfs9QFK16D8K6QZpwAaVNJxYDLHWayOta4ZMjGm/vsAEy3hvlS2GosVFlBlP9/Wb85DqQ==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.46.3.tgz",
+            "integrity": "sha512-vvrVKPRS4GduGR7VMH8EylCBqsDcw6U+/0nPDuIjXQRbHJc6xOBj+frx8ksfZAh6+Fptw5wHrN7etlMmQnPQVg==",
             "cpu": [
                 "ia32"
             ],
@@ -2858,9 +2858,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.46.2.tgz",
-            "integrity": "sha512-CvUo2ixeIQGtF6WvuB87XWqPQkoFAFqW+HUo/WzHwuHDvIwZCtjdWXoYCcr06iKGydiqTclC4jU/TNObC/xKZg==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.46.3.tgz",
+            "integrity": "sha512-fi3cPxCnu3ZeM3EwKZPgXbWoGzm2XHgB/WShKI81uj8wG0+laobmqy5wbgEwzstlbLu4MyO8C19FyhhWseYKNQ==",
             "cpu": [
                 "x64"
             ],
@@ -5700,9 +5700,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.202",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.202.tgz",
-            "integrity": "sha512-NxbYjRmiHcHXV1Ws3fWUW+SLb62isauajk45LUJ/HgIOkUA7jLZu/X2Iif+X9FBNK8QkF9Zb4Q2mcwXCcY30mg==",
+            "version": "1.5.203",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.203.tgz",
+            "integrity": "sha512-uz4i0vLhfm6dLZWbz/iH88KNDV+ivj5+2SA+utpgjKaj9Q0iDLuwk6Idhe9BTxciHudyx6IvTvijhkPvFGUQ0g==",
             "dev": true,
             "license": "ISC"
         },
@@ -10123,9 +10123,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.46.2.tgz",
-            "integrity": "sha512-WMmLFI+Boh6xbop+OAGo9cQ3OgX9MIg7xOQjn+pTCwOkk+FNDAeAemXkJ3HzDJrVXleLOFVa1ipuc1AmEx1Dwg==",
+            "version": "4.46.3",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.46.3.tgz",
+            "integrity": "sha512-RZn2XTjXb8t5g13f5YclGoilU/kwT696DIkY3sywjdZidNSi3+vseaQov7D7BZXVJCPv3pDWUN69C78GGbXsKw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -10139,26 +10139,26 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.46.2",
-                "@rollup/rollup-android-arm64": "4.46.2",
-                "@rollup/rollup-darwin-arm64": "4.46.2",
-                "@rollup/rollup-darwin-x64": "4.46.2",
-                "@rollup/rollup-freebsd-arm64": "4.46.2",
-                "@rollup/rollup-freebsd-x64": "4.46.2",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.46.2",
-                "@rollup/rollup-linux-arm-musleabihf": "4.46.2",
-                "@rollup/rollup-linux-arm64-gnu": "4.46.2",
-                "@rollup/rollup-linux-arm64-musl": "4.46.2",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.46.2",
-                "@rollup/rollup-linux-ppc64-gnu": "4.46.2",
-                "@rollup/rollup-linux-riscv64-gnu": "4.46.2",
-                "@rollup/rollup-linux-riscv64-musl": "4.46.2",
-                "@rollup/rollup-linux-s390x-gnu": "4.46.2",
-                "@rollup/rollup-linux-x64-gnu": "4.46.2",
-                "@rollup/rollup-linux-x64-musl": "4.46.2",
-                "@rollup/rollup-win32-arm64-msvc": "4.46.2",
-                "@rollup/rollup-win32-ia32-msvc": "4.46.2",
-                "@rollup/rollup-win32-x64-msvc": "4.46.2",
+                "@rollup/rollup-android-arm-eabi": "4.46.3",
+                "@rollup/rollup-android-arm64": "4.46.3",
+                "@rollup/rollup-darwin-arm64": "4.46.3",
+                "@rollup/rollup-darwin-x64": "4.46.3",
+                "@rollup/rollup-freebsd-arm64": "4.46.3",
+                "@rollup/rollup-freebsd-x64": "4.46.3",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.46.3",
+                "@rollup/rollup-linux-arm-musleabihf": "4.46.3",
+                "@rollup/rollup-linux-arm64-gnu": "4.46.3",
+                "@rollup/rollup-linux-arm64-musl": "4.46.3",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.46.3",
+                "@rollup/rollup-linux-ppc64-gnu": "4.46.3",
+                "@rollup/rollup-linux-riscv64-gnu": "4.46.3",
+                "@rollup/rollup-linux-riscv64-musl": "4.46.3",
+                "@rollup/rollup-linux-s390x-gnu": "4.46.3",
+                "@rollup/rollup-linux-x64-gnu": "4.46.3",
+                "@rollup/rollup-linux-x64-musl": "4.46.3",
+                "@rollup/rollup-win32-arm64-msvc": "4.46.3",
+                "@rollup/rollup-win32-ia32-msvc": "4.46.3",
+                "@rollup/rollup-win32-x64-msvc": "4.46.3",
                 "fsevents": "~2.3.2"
             }
         },

phpunit.xml

@@ -31,12 +31,18 @@
          failOnRisky="true"
          failOnWarning="true"
          processIsolation="false"
+         stopOnError="true"
          stopOnFailure="true">
     <php>
         <env name="APP_ENV" value="testing"/>
+        <env name="DB_CONNECTION" value="sqlite"/>
         <env name="APP_LOG_ENV" value="notice"/>
+        <env name="DB_DATABASE" value=""/>
+        <env name="APP_LOG_LEVEL" value="notice"/>
+        <env name="AUDIT_LOG_LEVEL" value="emergency" />
+
+
         <env name="QUERY_PARSER_IMPLEMENTATION" value="new"/>
-        <ini name="xdebug.mode" value="coverage"/>
     </php>
     <testsuites>
         <testsuite name="unit">

resources/assets/v1/src/components/form/WebhookDelivery.vue

@@ -24,7 +24,10 @@
       {{ $t('form.webhook_delivery') }}
     </label>
     <div class="col-sm-8">
-      <select
+        <div v-if="loading" class="form-control-static">
+            <em class="fa fa-spinner fa-spin"></em> {{ $t('firefly.loading') }}
+        </div>
+        <select v-if="!loading"
           ref="bill"
           v-model="delivery"
           :title="$t('form.webhook_delivery')"
@@ -49,6 +52,7 @@ export default {
   name: "WebhookDelivery",
   data() {
     return {
+    loading: true,
       delivery : 0,
       deliveries: [
 
@@ -71,8 +75,24 @@ export default {
   mounted() {
     this.delivery = this.value;
     this.deliveries = [
-      {id: 300, name: this.$t('firefly.webhook_delivery_JSON')},
+      //{id: 300, name: this.$t('firefly.webhook_delivery_JSON')},
     ];
+      axios.get('./api/v1/configuration/webhook.deliveries').then((response) => {
+          for (let key in response.data.data.value) {
+              if (!response.data.data.value.hasOwnProperty(key)) {
+                  continue;
+              }
+              this.deliveries.push(
+                  {
+                      id: response.data.data.value[key],
+                      name: this.$t('firefly.webhook_delivery_' + key),
+                  }
+              );
+          }
+          this.loading = false;
+      }).catch((error) => {
+          this.loading = false;
+      });
   },
   watch: {
     value() {

resources/assets/v1/src/components/form/WebhookResponse.vue

@@ -19,73 +19,89 @@
   -->
 
 <template>
-  <div class="form-group" v-bind:class="{ 'has-error': hasError()}">
-    <label class="col-sm-4 control-label">
-      {{ $t('form.webhook_response') }}
-    </label>
-    <div class="col-sm-8">
-      <select
-          ref="bill"
-          v-model="response"
-          :title="$t('form.webhook_response')"
-          class="form-control"
-          name="webhook_response"
-      >
-        <option v-for="response in this.responses"
-                :label="response.name"
-                :value="response.id">{{ response.name }}
-        </option>
-      </select>
-      <p class="help-block" v-text="$t('firefly.webhook_response_form_help')"></p>
-      <ul v-for="error in this.error" class="list-unstyled">
-        <li class="text-danger">{{ error }}</li>
-      </ul>
+    <div class="form-group" v-bind:class="{ 'has-error': hasError()}">
+        <label class="col-sm-4 control-label">
+            {{ $t('form.webhook_response') }}
+        </label>
+        <div class="col-sm-8">
+            <div v-if="loading" class="form-control-static">
+                <em class="fa fa-spinner fa-spin"></em> {{ $t('firefly.loading') }}
+            </div>
+            <select v-if="!loading"
+                    ref="response"
+                    v-model="response"
+                    :title="$t('form.webhook_response')"
+                    class="form-control"
+                    name="webhook_response"
+            >
+                <option v-for="response in this.responses"
+                        :label="response.name"
+                        :value="response.id">{{ response.name }}
+                </option>
+            </select>
+            <p class="help-block" v-text="$t('firefly.webhook_response_form_help')"></p>
+            <ul v-for="error in this.error" class="list-unstyled">
+                <li class="text-danger">{{ error }}</li>
+            </ul>
+        </div>
     </div>
-  </div>
 </template>
 
 <script>
 export default {
-  name: "WebhookResponse",
-  data() {
-    return {
-      response: 0,
-      responses: [],
-    };
-  },
-  props: {
-    error: {
-      type: Array,
-      required: true,
-      default() {
-        return []
-      }
+    name: "WebhookResponse",
+    data() {
+        return {
+            loading: true,
+            response: 0,
+            responses: [],
+        };
     },
-    value: {
-      type: Number,
-      required: true,
-    }
-  },
-  watch: {
-    value() {
-      this.response = this.value;
+    props: {
+        error: {
+            type: Array,
+            required: true,
+            default() {
+                return []
+            }
+        },
+        value: {
+            type: Number,
+            required: true,
+        }
+    },
+    watch: {
+        value() {
+            this.response = this.value;
+        },
+        response(newValue) {
+            this.$emit('input', newValue);
+        }
+    },
+    mounted() {
+        this.response  = this.value;
+        this.responses = [];
+        axios.get('./api/v1/configuration/webhook.responses').then((response) => {
+            for (let key in response.data.data.value) {
+                if (!response.data.data.value.hasOwnProperty(key)) {
+                    continue;
+                }
+                this.responses.push(
+                    {
+                        id: response.data.data.value[key],
+                        name: this.$t('firefly.webhook_response_' + key),
+                    }
+                );
+            }
+            this.loading = false;
+        }).catch((error) => {
+            this.loading = false;
+        });
+    },
+    methods: {
+        hasError() {
+            return this.error?.length > 0;
+        }
     },
-  response(newValue) {
-    this.$emit('input', newValue);
-  }
-  },
-  mounted() {
-    this.response = this.value;
-    this.responses = [
-      {id: 200, name: this.$t('firefly.webhook_response_TRANSACTIONS')},
-      {id: 210, name: this.$t('firefly.webhook_response_ACCOUNTS')},
-      {id: 220, name: this.$t('firefly.webhook_response_none_NONE')},
-    ];
-  },
-  methods: {
-    hasError() {
-      return this.error?.length > 0;
-    }
-  },
 }
 </script>

resources/assets/v1/src/components/form/WebhookTrigger.vue

@@ -19,73 +19,90 @@
   -->
 
 <template>
-  <div class="form-group" v-bind:class="{ 'has-error': hasError()}">
-    <label class="col-sm-4 control-label">
-      {{ $t('form.webhook_trigger') }}
-    </label>
-    <div class="col-sm-8">
-      <select
-          ref="bill"
-          v-model="trigger"
-          :title="$t('form.webhook_trigger')"
-          class="form-control"
-          name="webhook_trigger"
-      >
-        <option v-for="trigger in this.triggers"
-                :label="trigger.name"
-                :value="trigger.id">{{ trigger.name }}
-        </option>
-      </select>
-      <p class="help-block" v-text="$t('firefly.webhook_trigger_form_help')"></p>
-      <ul v-for="error in this.error" class="list-unstyled">
-        <li class="text-danger">{{ error }}</li>
-      </ul>
+    <div class="form-group" v-bind:class="{ 'has-error': hasError()}">
+        <label class="col-sm-4 control-label">
+            {{ $t('form.webhook_trigger') }}
+        </label>
+        <div class="col-sm-8">
+            <div v-if="loading" class="form-control-static">
+                <em class="fa fa-spinner fa-spin"></em> {{ $t('firefly.loading') }}
+            </div>
+            <select v-if="!loading"
+                    ref="trigger"
+                    v-model="trigger"
+                    :title="$t('form.webhook_trigger')"
+                    class="form-control"
+                    name="webhook_trigger"
+            >
+                <option v-for="trigger in this.triggers"
+                        :label="trigger.name"
+                        :value="trigger.id">{{ trigger.name }}
+                </option>
+            </select>
+            <p class="help-block" v-text="$t('firefly.webhook_trigger_form_help')"></p>
+            <ul v-for="error in this.error" class="list-unstyled">
+                <li class="text-danger">{{ error }}</li>
+            </ul>
+        </div>
     </div>
-  </div>
 </template>
 
 <script>
 export default {
-  name: "WebhookTrigger",
-  data() {
-    return {
-      trigger: 0,
-      triggers: [],
-    };
-  },
-  props: {
-    error: {
-      type: Array,
-      required: true,
-      default() {
-        return []
-      }
+    name: "WebhookTrigger",
+    data() {
+        return {
+            trigger: 0,
+            loading: true,
+            triggers: [],
+        };
     },
-    value: {
-      type: Number,
-      required: true,
-    }
-  },
-  mounted() {
-    this.trigger = this.value;
-    this.triggers = [
-      {id: 100, name: this.$t('firefly.webhook_trigger_STORE_TRANSACTION')},
-      {id: 110, name: this.$t('firefly.webhook_trigger_UPDATE_TRANSACTION')},
-      {id: 120, name: this.$t('firefly.webhook_trigger_DESTROY_TRANSACTION')},
-    ];
-  },
-  watch: {
-    value() {
-      this.trigger = this.value;
+    props: {
+        error: {
+            type: Array,
+            required: true,
+            default() {
+                return []
+            }
+        },
+        value: {
+            type: Number,
+            required: true,
+        }
+    },
+    mounted() {
+        this.trigger  = this.value;
+        this.triggers = [];
+        axios.get('./api/v1/configuration/webhook.triggers').then((response) => {
+            for (let key in response.data.data.value) {
+                if (!response.data.data.value.hasOwnProperty(key)) {
+                    continue;
+                }
+                this.triggers.push(
+                    {
+                        id: response.data.data.value[key],
+                        name: this.$t('firefly.webhook_trigger_' + key),
+                    }
+                );
+                console.log('webhook trigger: id=' + response.data.data.value[key] + ', name=' + key);
+            }
+            this.loading = false;
+        }).catch((error) => {
+            this.loading = false;
+        });
+    },
+    watch: {
+        value() {
+            this.trigger = this.value;
+        },
+        trigger(newValue) {
+            this.$emit('input', newValue);
+        }
+    },
+    methods: {
+        hasError() {
+            return this.error?.length > 0;
+        }
     },
-    trigger(newValue) {
-      this.$emit('input', newValue);
-    }
-  },
-  methods: {
-    hasError() {
-      return this.error?.length > 0;
-    }
-  },
 }
 </script>

resources/assets/v1/src/components/webhooks/Index.vue

@@ -19,138 +19,172 @@
   -->
 
 <template>
-  <div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12">
-      <div class="box">
-        <div class="box-header with-border">
-          <h3 class="box-title">
-            {{ $t('firefly.webhooks') }}
-          </h3>
-        </div>
-        <div class="box-body no-padding">
-          <div style="padding:8px;">
-            <a href="webhooks/create" class="btn btn-success"><span class="fa fa-plus fa-fw"></span>{{ $t('firefly.create_new_webhook') }}</a>
-          </div>
-
-          <table class="table table-responsive table-hover" v-if="webhooks.length > 0" aria-label="A table.">
-            <thead>
-            <tr>
-              <th>Title</th>
-              <th>Responds when</th>
-              <th>Responds with (delivery)</th>
-              <th style="width:20%;">Secret (show / hide)</th>
-              <th>URL</th>
-              <th class="hidden-sm hidden-xs">&nbsp;</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr v-for="webhook in webhooks" :key="webhook.id">
-              <td>
-                <a :href="'webhooks/show/' + webhook.id">{{ webhook.title }}</a>
-              </td>
-              <td>
-                <span v-if="webhook.active">{{ triggers[webhook.trigger] }}</span>
-                <span v-if="!webhook.active" class="text-muted"><s>{{ triggers[webhook.trigger] }}</s> ({{ $t('firefly.inactive') }})</span>
-              </td>
-              <td>{{ responses[webhook.response] }} ({{ deliveries[webhook.delivery] }})</td>
-              <td>
-                <em style="cursor:pointer"
-                    v-if="webhook.show_secret" class="fa fa-eye" @click="toggleSecret(webhook)"></em>
-                <em style="cursor:pointer"
-                    v-if="!webhook.show_secret" class="fa fa-eye-slash" @click="toggleSecret(webhook)"></em>
-                <code v-if="webhook.show_secret">{{ webhook.secret }}</code>
-                <code v-if="!webhook.show_secret">********</code>
-              </td>
-              <td>
-                <code :title="webhook.full_url">{{ webhook.url }}</code>
-
-              </td>
-              <td class="hidden-sm hidden-xs">
-                <div class="btn-group btn-group-xs pull-right">
-                  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    {{ $t('firefly.actions') }} <span class="caret"></span></button>
-                  <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                    <li><a :href="'webhooks/show/' + webhook.id"><span class="fa fa-fw fa-search"></span> {{ $t('firefly.inspect') }}</a></li>
-                    <li><a :href="'webhooks/edit/' + webhook.id"><span class="fa fa-fw fa-pencil"></span> {{$t( 'firefly.edit') }}</a></li>
-                    <li><a  :href="'webhooks/delete/' + webhook.id"><span class="fa fa-fw fa-trash"></span> {{ $t('firefly.delete') }}</a></li>
-                  </ul>
+    <div class="row">
+        <div class="col-lg-12 col-md-12 col-sm-12">
+            <div class="box">
+                <div class="box-header with-border">
+                    <h3 class="box-title">
+                        {{ $t('firefly.webhooks') }}
+                    </h3>
                 </div>
-              </td>
-            </tr>
-            </tbody>
-          </table>
+                <div class="box-body no-padding">
+                    <div style="padding:8px;">
+                        <a href="webhooks/create" class="btn btn-success"><span
+                            class="fa fa-plus fa-fw"></span>{{ $t('firefly.create_new_webhook') }}</a>
+                    </div>
 
-          <div v-if="webhooks.length > 0" style="padding:8px;">
-            <a href="webhooks/create" class="btn btn-success"><span class="fa fa-plus fa-fw"></span>{{ $t('firefly.create_new_webhook') }}</a>
-          </div>
+                    <table class="table table-responsive table-hover" v-if="webhooks.length > 0" aria-label="A table.">
+                        <thead>
+                        <tr>
+                            <th>Title</th>
+                            <th>Responds when</th>
+                            <th>Responds with (delivery)</th>
+                            <th style="width:20%;">Secret (show / hide)</th>
+                            <th>URL</th>
+                            <th class="hidden-sm hidden-xs">&nbsp;</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr v-for="webhook in webhooks" :key="webhook.id">
+                            <td>
+                                <a :href="'webhooks/show/' + webhook.id">{{ webhook.title }}</a>
+                            </td>
+                            <td>
+                                <span v-if="webhook.active">{{ triggers[webhook.trigger] }}</span>
+                                <span v-if="!webhook.active" class="text-muted"><s>{{ triggers[webhook.trigger] }}</s> ({{
+                                        $t('firefly.inactive')
+                                    }})</span>
+                            </td>
+                            <td>{{ responses[webhook.response] }} ({{ deliveries[webhook.delivery] }})</td>
+                            <td>
+                                <em style="cursor:pointer"
+                                    v-if="webhook.show_secret" class="fa fa-eye" @click="toggleSecret(webhook)"></em>
+                                <em style="cursor:pointer"
+                                    v-if="!webhook.show_secret" class="fa fa-eye-slash"
+                                    @click="toggleSecret(webhook)"></em>
+                                <code v-if="webhook.show_secret">{{ webhook.secret }}</code>
+                                <code v-if="!webhook.show_secret">********</code>
+                            </td>
+                            <td>
+                                <code :title="webhook.full_url">{{ webhook.url }}</code>
+
+                            </td>
+                            <td class="hidden-sm hidden-xs">
+                                <div class="btn-group btn-group-xs pull-right">
+                                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"
+                                            aria-haspopup="true" aria-expanded="false">
+                                        {{ $t('firefly.actions') }} <span class="caret"></span></button>
+                                    <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                                        <li><a :href="'webhooks/show/' + webhook.id"><span
+                                            class="fa fa-fw fa-search"></span> {{ $t('firefly.inspect') }}</a></li>
+                                        <li><a :href="'webhooks/edit/' + webhook.id"><span
+                                            class="fa fa-fw fa-pencil"></span> {{ $t('firefly.edit') }}</a></li>
+                                        <li><a :href="'webhooks/delete/' + webhook.id"><span
+                                            class="fa fa-fw fa-trash"></span> {{ $t('firefly.delete') }}</a></li>
+                                    </ul>
+                                </div>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+
+                    <div v-if="webhooks.length > 0" style="padding:8px;">
+                        <a href="webhooks/create" class="btn btn-success"><span
+                            class="fa fa-plus fa-fw"></span>{{ $t('firefly.create_new_webhook') }}</a>
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
 </template>
 
 <script>
 export default {
-  name: "Index",
-  data() {
-    return {
-      webhooks: [],
-      triggers: {
-        STORE_TRANSACTION: this.$t('firefly.webhook_trigger_STORE_TRANSACTION'),
-        UPDATE_TRANSACTION: this.$t('firefly.webhook_trigger_UPDATE_TRANSACTION'),
-        DESTROY_TRANSACTION: this.$t('firefly.webhook_trigger_DESTROY_TRANSACTION'),
-      },
-      responses: {
-        TRANSACTIONS: this.$t('firefly.webhook_response_TRANSACTIONS'),
-        ACCOUNTS: this.$t('firefly.webhook_response_ACCOUNTS'),
-        NONE: this.$t('firefly.webhook_response_none_NONE'),
-      },
-      deliveries: {
-        JSON: this.$t('firefly.webhook_delivery_JSON'),
-      },
-    };
-  },
-  mounted() {
-    this.getWebhooks();
-  },
-  methods: {
-    getWebhooks: function () {
-      this.webhooks = [];
-      this.downloadWebhooks(1);
+    name: "Index",
+    data() {
+        return {
+            webhooks: [],
+            triggers: {
+            },
+            responses: {
+            },
+            deliveries: {
+            },
+        };
     },
-    toggleSecret: function (webhook) {
-      webhook.show_secret = !webhook.show_secret;
+    mounted() {
+        this.getOptions();
     },
-    downloadWebhooks: function (page) {
-      axios.get("./api/v1/webhooks?page=" + page).then((response) => {
-        for (let i in response.data.data) {
-          if (response.data.data.hasOwnProperty(i)) {
-            let current = response.data.data[i];
-            let webhook = {
-              id: current.id,
-              title: current.attributes.title,
-              url: current.attributes.url,
-              active: current.attributes.active,
-              full_url: current.attributes.url,
-              secret: current.attributes.secret,
-              trigger: current.attributes.trigger,
-              response: current.attributes.response,
-              delivery: current.attributes.delivery,
-              show_secret: false,
-            };
-            if(current.attributes.url.length > 20) {
-              webhook.url = current.attributes.url.slice(0, 20) + '...';
-            }
-            this.webhooks.push(webhook);
-          }
-        }
+    methods: {
+        getOptions: function () {
+            // get triggers
+            axios.get('./api/v1/configuration/webhook.triggers').then((response) => {
+                for (let key in response.data.data.value) {
+                    if (!response.data.data.value.hasOwnProperty(key)) {
+                        continue;
+                    }
+                    this.triggers[key] = this.$t('firefly.webhook_trigger_' + key);
+                }
 
-        if (response.data.meta.pagination.current_page < response.data.meta.pagination.total_pages) {
-          this.downloadWebhooks(response.data.meta.pagination.current_page + 1);
-        }
-      });
-    },
-  }
+                // get responses
+                axios.get('./api/v1/configuration/webhook.responses').then((response) => {
+                    for (let key in response.data.data.value) {
+                        if (!response.data.data.value.hasOwnProperty(key)) {
+                            continue;
+                        }
+                        this.responses[key] = this.$t('firefly.webhook_response_' + key);
+                    }
+                    // get deliveries
+                    axios.get('./api/v1/configuration/webhook.deliveries').then((response) => {
+                        for (let key in response.data.data.value) {
+                            if (!response.data.data.value.hasOwnProperty(key)) {
+                                continue;
+                            }
+                            this.deliveries[key] = this.$t('firefly.webhook_delivery_' + key);
+                        }
+                        // get webhooks
+                        this.getWebhooks();
+                    })
+                })
+            });
+        },
+        getWebhooks: function () {
+            this.webhooks = [];
+            this.downloadWebhooks(1);
+        },
+        toggleSecret: function (webhook) {
+            webhook.show_secret = !webhook.show_secret;
+        },
+        downloadWebhooks: function (page) {
+            axios.get("./api/v1/webhooks?page=" + page).then((response) => {
+                for (let i in response.data.data) {
+                    if (response.data.data.hasOwnProperty(i)) {
+                        let current = response.data.data[i];
+                        let webhook = {
+                            id: current.id,
+                            title: current.attributes.title,
+                            url: current.attributes.url,
+                            active: current.attributes.active,
+                            full_url: current.attributes.url,
+                            secret: current.attributes.secret,
+                            trigger: current.attributes.trigger,
+                            response: current.attributes.response,
+                            delivery: current.attributes.delivery,
+                            show_secret: false,
+                        };
+                        if (current.attributes.url.length > 20) {
+                            webhook.url = current.attributes.url.slice(0, 20) + '...';
+                        }
+                        this.webhooks.push(webhook);
+                    }
+                }
+
+                if (response.data.meta.pagination.current_page < response.data.meta.pagination.total_pages) {
+                    this.downloadWebhooks(response.data.meta.pagination.current_page + 1);
+                }
+            });
+        },
+    }
 }
 </script>
 

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

@@ -110,9 +110,13 @@
         "webhook_trigger_STORE_TRANSACTION": "After transaction creation",
         "webhook_trigger_UPDATE_TRANSACTION": "After transaction update",
         "webhook_trigger_DESTROY_TRANSACTION": "After transaction delete",
+        "webhook_trigger_STORE_BUDGET": "After budget creation",
+        "webhook_trigger_UPDATE_BUDGET": "After budget update",
+        "webhook_trigger_DESTROY_BUDGET": "After budget delete",
+        "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "After budgeted amount change",
         "webhook_response_TRANSACTIONS": "Transaction details",
         "webhook_response_ACCOUNTS": "Account details",
-        "webhook_response_none_NONE": "No details",
+        "webhook_response_NONE": "No details",
         "webhook_delivery_JSON": "JSON",
         "actions": "Actions",
         "meta_data": "Meta data",

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

@@ -110,9 +110,13 @@
         "webhook_trigger_STORE_TRANSACTION": "\u0628\u0639\u062f \u0625\u0646\u0634\u0627\u0621 \u0627\u0644\u0645\u0639\u0627\u0645\u0644\u0629",
         "webhook_trigger_UPDATE_TRANSACTION": "\u0628\u0639\u062f \u062a\u062d\u062f\u064a\u062b \u0627\u0644\u0645\u0639\u0627\u0645\u0644\u0629",
         "webhook_trigger_DESTROY_TRANSACTION": "\u0628\u0639\u062f \u062d\u0630\u0641 \u0627\u0644\u0645\u0639\u0627\u0645\u0644\u0629",
+        "webhook_trigger_STORE_BUDGET": "After budget creation",
+        "webhook_trigger_UPDATE_BUDGET": "After budget update",
+        "webhook_trigger_DESTROY_BUDGET": "After budget delete",
+        "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "After budgeted amount change",
         "webhook_response_TRANSACTIONS": "\u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u0645\u0639\u0627\u0645\u0644\u0629",
         "webhook_response_ACCOUNTS": "\u062a\u0641\u0627\u0635\u064a\u0644 \u0627\u0644\u062d\u0633\u0627\u0628",
-        "webhook_response_none_NONE": "\u0644\u0627 \u062a\u0648\u062c\u062f \u062a\u0641\u0627\u0635\u064a\u0644",
+        "webhook_response_NONE": "No details",
         "webhook_delivery_JSON": "JSON",
         "actions": "\u0627\u0644\u0625\u062c\u0631\u0627\u0621\u0627\u062a",
         "meta_data": "\u0628\u064a\u0627\u0646\u0627\u062a \u0648\u0635\u0641\u064a\u0629",

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

@@ -110,9 +110,13 @@
         "webhook_trigger_STORE_TRANSACTION": "After transaction creation",
         "webhook_trigger_UPDATE_TRANSACTION": "After transaction update",
         "webhook_trigger_DESTROY_TRANSACTION": "After transaction delete",
+        "webhook_trigger_STORE_BUDGET": "After budget creation",
+        "webhook_trigger_UPDATE_BUDGET": "After budget update",
+        "webhook_trigger_DESTROY_BUDGET": "After budget delete",
+        "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "After budgeted amount change",
         "webhook_response_TRANSACTIONS": "Transaction details",
         "webhook_response_ACCOUNTS": "Account details",
-        "webhook_response_none_NONE": "No details",
+        "webhook_response_NONE": "No details",
         "webhook_delivery_JSON": "JSON",
         "actions": "\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044f",
         "meta_data": "\u041c\u0435\u0442\u0430 \u0434\u0430\u043d\u043d\u0438",

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

@@ -110,9 +110,13 @@
         "webhook_trigger_STORE_TRANSACTION": "Despr\u00e9s de crear la transacci\u00f3",
         "webhook_trigger_UPDATE_TRANSACTION": "Despr\u00e9s d'actualitzar la transacci\u00f3",
         "webhook_trigger_DESTROY_TRANSACTION": "Despr\u00e9s d'eliminar la transacci\u00f3",
+        "webhook_trigger_STORE_BUDGET": "After budget creation",
+        "webhook_trigger_UPDATE_BUDGET": "After budget update",
+        "webhook_trigger_DESTROY_BUDGET": "After budget delete",
+        "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "After budgeted amount change",
         "webhook_response_TRANSACTIONS": "Detalls de la transacci\u00f3",
         "webhook_response_ACCOUNTS": "Detalls del compte",
-        "webhook_response_none_NONE": "Sense detalls",
+        "webhook_response_NONE": "No details",
         "webhook_delivery_JSON": "JSON",
         "actions": "Accions",
         "meta_data": "Meta dades",

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

@@ -10,7 +10,7 @@
         "welcome_back": "Jak to jde?",
         "flash_error": "Chyba!",
         "flash_warning": "Varov\u00e1n\u00ed!",
-        "flash_success": "\u00dasp\u011b\u0161n\u011b dokon\u010deno!",
+        "flash_success": "V\u00fdborn\u011b!",
         "close": "Zav\u0159\u00edt",
         "select_dest_account": "Please select or type a valid destination account name",
         "select_source_account": "Please select or type a valid source account name",
@@ -110,9 +110,13 @@
         "webhook_trigger_STORE_TRANSACTION": "Po vytvo\u0159en\u00ed transakce",
         "webhook_trigger_UPDATE_TRANSACTION": "Po aktualizaci transakce",
         "webhook_trigger_DESTROY_TRANSACTION": "Po odstran\u011bn\u00ed transakce",
+        "webhook_trigger_STORE_BUDGET": "After budget creation",
+        "webhook_trigger_UPDATE_BUDGET": "After budget update",
+        "webhook_trigger_DESTROY_BUDGET": "After budget delete",
+        "webhook_trigger_STORE_UPDATE_BUDGET_LIMIT": "After budgeted amount change",
         "webhook_response_TRANSACTIONS": "Podrobnosti transakce",
         "webhook_response_ACCOUNTS": "Podrobnosti \u00fa\u010dtu",
-        "webhook_response_none_NONE": "\u017d\u00e1dn\u00e9 detaily",
+        "webhook_response_NONE": "No details",
         "webhook_delivery_JSON": "JSON",
         "actions": "Akce",
         "meta_data": "Metadata",