kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Extend acceptedRoles array in AC controllers.

Browse Source
This commit is contained in:
James Cole
2025-08-15 19:50:12 +02:00
parent 87d292ca27
commit ab773c9052
16 changed files with 92 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Api/V1/Controllers/Autocomplete/AccountController.php
View File

@@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Enums\AccountTypeEnum;
use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Account; use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -47,6 +48,7 @@ class AccountController extends Controller
// this array only exists to test if the constructor will use it properly. // 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> */ /** @var array<int, string> */
private array $balanceTypes; private array $balanceTypes;
@@ -60,10 +62,10 @@ class AccountController extends Controller
parent::__construct(); parent::__construct();
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
/** @var User $user */ $this->validateUserGroup($request);
$user = auth()->user();
$this->repository = app(AccountRepositoryInterface::class); $this->repository = app(AccountRepositoryInterface::class);
$this->repository->setUser($user); $this->repository->setUser($this->user);
$this->repository->setUserGroup($this->userGroup);
return $next($request); return $next($request);
} }

8
app/Api/V1/Controllers/Autocomplete/BillController.php
View File

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

8
app/Api/V1/Controllers/Autocomplete/BudgetController.php
View File

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

8
app/Api/V1/Controllers/Autocomplete/CategoryController.php
View File

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

8
app/Api/V1/Controllers/Autocomplete/CurrencyController.php
View File

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

8
app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php
View File

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

11
app/Api/V1/Controllers/Autocomplete/PiggyBankController.php
View File

@@ -26,6 +26,7 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;
use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest; use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBank;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
@@ -39,6 +40,7 @@ class PiggyBankController extends Controller
{ {
private AccountRepositoryInterface $accountRepository; private AccountRepositoryInterface $accountRepository;
private PiggyBankRepositoryInterface $piggyRepository; private PiggyBankRepositoryInterface $piggyRepository;
protected array $acceptedRoles = [UserRoleEnum::READ_PIGGY_BANKS];
/** /**
* PiggyBankController constructor. * PiggyBankController constructor.
@@ -48,12 +50,13 @@ class PiggyBankController extends Controller
parent::__construct(); parent::__construct();
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
/** @var User $user */ $this->validateUserGroup($request);
$user = auth()->user();
$this->piggyRepository = app(PiggyBankRepositoryInterface::class); $this->piggyRepository = app(PiggyBankRepositoryInterface::class);
$this->accountRepository = app(AccountRepositoryInterface::class); $this->accountRepository = app(AccountRepositoryInterface::class);
$this->piggyRepository->setUser($user); $this->piggyRepository->setUser($this->user);
$this->accountRepository->setUser($user); $this->piggyRepository->setUserGroup($this->userGroup);
$this->accountRepository->setUser($this->user);
$this->accountRepository->setUserGroup($this->userGroup);
return $next($request); return $next($request);
} }

7
app/Api/V1/Controllers/Autocomplete/RecurrenceController.php
View File

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

6
app/Api/V1/Controllers/Autocomplete/RuleController.php
View File

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

6
app/Api/V1/Controllers/Autocomplete/RuleGroupController.php
View File

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

8
app/Api/V1/Controllers/Autocomplete/TagController.php
View File

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

11
app/Api/V1/Controllers/Autocomplete/TransactionController.php
View File

@@ -52,14 +52,13 @@ class TransactionController extends Controller
parent::__construct(); parent::__construct();
$this->middleware( $this->middleware(
function ($request, $next) { function ($request, $next) {
/** @var User $user */ $this->validateUserGroup($request);
$user = auth()->user();
$userGroup = $this->validateUserGroup($request);
$this->repository = app(JournalRepositoryInterface::class); $this->repository = app(JournalRepositoryInterface::class);
$this->groupRepository = app(TransactionGroupRepositoryInterface::class); $this->groupRepository = app(TransactionGroupRepositoryInterface::class);
$this->repository->setUser($user); $this->repository->setUser($this->user);
$this->groupRepository->setUser($user); $this->repository->setUserGroup($this->userGroup);
$this->groupRepository->setUserGroup($userGroup); $this->groupRepository->setUser($this->user);
$this->groupRepository->setUserGroup($this->userGroup);
return $next($request); return $next($request);
} }

5
app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php
View File

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

42
app/Api/V1/Controllers/Controller.php
View File

@@ -62,9 +62,9 @@ abstract class Controller extends BaseController
use ValidatesRequests; use ValidatesRequests;
use ValidatesUserGroupTrait; use ValidatesUserGroupTrait;
protected const string CONTENT_TYPE = 'application/vnd.api+json'; protected const string CONTENT_TYPE = 'application/vnd.api+json';
protected const string JSON_CONTENT_TYPE = 'application/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> */ /** @var array<int, string> */
protected array $allowedSort; protected array $allowedSort;
@@ -106,8 +106,8 @@ abstract class Controller extends BaseController
*/ */
private function getParameters(): ParameterBag private function getParameters(): ParameterBag
{ {
$bag = new ParameterBag(); $bag = new ParameterBag();
$page = (int) request()->get('page'); $page = (int)request()->get('page');
if ($page < 1) { if ($page < 1) {
$page = 1; $page = 1;
} }
@@ -117,7 +117,7 @@ abstract class Controller extends BaseController
$bag->set('page', $page); $bag->set('page', $page);
// some date fields: // some date fields:
$dates = ['start', 'end', 'date']; $dates = ['start', 'end', 'date'];
foreach ($dates as $field) { foreach ($dates as $field) {
$date = null; $date = null;
@@ -128,16 +128,16 @@ abstract class Controller extends BaseController
Log::error($e->getMessage()); Log::error($e->getMessage());
Log::error($e->getTraceAsString()); Log::error($e->getTraceAsString());
} }
$obj = null; $obj = null;
if (null !== $date) { if (null !== $date) {
try { try {
$obj = Carbon::parse((string) $date); $obj = Carbon::parse((string)$date);
} catch (InvalidFormatException $e) { } catch (InvalidFormatException $e) {
// don't care // don't care
Log::warning( Log::warning(
sprintf( sprintf(
'Ignored invalid date "%s" in API controller parameter check: %s', 'Ignored invalid date "%s" in API controller parameter check: %s',
substr((string) $date, 0, 20), substr((string)$date, 0, 20),
$e->getMessage() $e->getMessage()
) )
); );
@@ -158,7 +158,7 @@ abstract class Controller extends BaseController
$value = null; $value = null;
} }
if (null !== $value) { if (null !== $value) {
$value = (int) $value; $value = (int)$value;
if ($value < 1) { if ($value < 1) {
$value = 1; $value = 1;
} }
@@ -173,10 +173,10 @@ abstract class Controller extends BaseController
&& auth()->check()) { && auth()->check()) {
// set default for user: // set default for user:
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
/** @var Preference $pageSize */ /** @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); $bag->set($integer, $pageSize);
} }
} }
@@ -190,7 +190,7 @@ abstract class Controller extends BaseController
$sortParameters = []; $sortParameters = [];
try { try {
$param = (string) request()->query->get('sort'); $param = (string)request()->query->get('sort');
} catch (BadRequestException $e) { } catch (BadRequestException $e) {
Log::error('Request field "sort" contains a non-scalar value. Value set to NULL.'); Log::error('Request field "sort" contains a non-scalar value. Value set to NULL.');
Log::error($e->getMessage()); Log::error($e->getMessage());
@@ -200,7 +200,7 @@ abstract class Controller extends BaseController
if ('' === $param) { if ('' === $param) {
return $bag; return $bag;
} }
$parts = explode(',', $param); $parts = explode(',', $param);
foreach ($parts as $part) { foreach ($parts as $part) {
$part = trim($part); $part = trim($part);
$direction = 'asc'; $direction = 'asc';
@@ -236,14 +236,14 @@ abstract class Controller extends BaseController
$params[$key] = $value; $params[$key] = $value;
} }
return $return.http_build_query($params); return $return . http_build_query($params);
} }
final protected function getManager(): Manager final protected function getManager(): Manager
{ {
// create some objects: // create some objects:
$manager = new Manager(); $manager = new Manager();
$baseUrl = request()->getSchemeAndHttpHost().'/api/v1'; $baseUrl = request()->getSchemeAndHttpHost() . '/api/v1';
$manager->setSerializer(new JsonApiSerializer($baseUrl)); $manager->setSerializer(new JsonApiSerializer($baseUrl));
return $manager; return $manager;
@@ -251,14 +251,14 @@ abstract class Controller extends BaseController
final protected function jsonApiList(string $key, LengthAwarePaginator $paginator, AbstractTransformer $transformer): array final protected function jsonApiList(string $key, LengthAwarePaginator $paginator, AbstractTransformer $transformer): array
{ {
$manager = new Manager(); $manager = new Manager();
$baseUrl = sprintf('%s/api/v1/', request()->getSchemeAndHttpHost()); $baseUrl = sprintf('%s/api/v1/', request()->getSchemeAndHttpHost());
// TODO add stuff to path? // TODO add stuff to path?
$manager->setSerializer(new JsonApiSerializer($baseUrl)); $manager->setSerializer(new JsonApiSerializer($baseUrl));
$objects = $paginator->getCollection(); $objects = $paginator->getCollection();
// the transformer, at this point, needs to collect information that ALL items in the collection // the transformer, at this point, needs to collect information that ALL items in the collection
// require, like meta-data and stuff like that, and save it for later. // require, like meta-data and stuff like that, and save it for later.
@@ -279,8 +279,8 @@ abstract class Controller extends BaseController
final protected function jsonApiObject(string $key, array|Model $object, AbstractTransformer $transformer): array final protected function jsonApiObject(string $key, array|Model $object, AbstractTransformer $transformer): array
{ {
// create some objects: // create some objects:
$manager = new Manager(); $manager = new Manager();
$baseUrl = sprintf('%s/api/v1', request()->getSchemeAndHttpHost()); $baseUrl = sprintf('%s/api/v1', request()->getSchemeAndHttpHost());
$manager->setSerializer(new JsonApiSerializer($baseUrl)); $manager->setSerializer(new JsonApiSerializer($baseUrl));
// $transformer->collectMetaData(new Collection([$object])); // $transformer->collectMetaData(new Collection([$object]));

2
app/Support/Http/Api/ValidatesUserGroupTrait.php
View File

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

4
app/Support/Repositories/UserGroup/UserGroupTrait.php
View File

@@ -72,8 +72,8 @@ trait UserGroupTrait
return; 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 public function getUserGroup(): ?UserGroup