diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php index 3dab35d4c3..604d69df0f 100644 --- a/app/Http/Requests/AccountFormRequest.php +++ b/app/Http/Requests/AccountFormRequest.php @@ -27,24 +27,13 @@ use FireflyIII\Models\Location; use FireflyIII\Rules\UniqueIban; use FireflyIII\Support\Request\AppendsLocationData; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class AccountFormRequest. */ -class AccountFormRequest extends FormRequest +class AccountFormRequest extends LoggedInRequest { use ConvertsDataTypes, AppendsLocationData; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Get all data. diff --git a/app/Http/Requests/AttachmentFormRequest.php b/app/Http/Requests/AttachmentFormRequest.php index 5b62e3bf48..c95894ef53 100644 --- a/app/Http/Requests/AttachmentFormRequest.php +++ b/app/Http/Requests/AttachmentFormRequest.php @@ -23,28 +23,16 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class AttachmentFormRequest. * * @codeCoverageIgnore */ -class AttachmentFormRequest extends FormRequest +class AttachmentFormRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } - /** * Returns the data required by the controller. * diff --git a/app/Http/Requests/BillStoreRequest.php b/app/Http/Requests/BillStoreRequest.php index 4db4af0805..801a41c710 100644 --- a/app/Http/Requests/BillStoreRequest.php +++ b/app/Http/Requests/BillStoreRequest.php @@ -23,24 +23,13 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class BillStoreRequest. */ -class BillStoreRequest extends FormRequest +class BillStoreRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Returns the data required by the controller. diff --git a/app/Http/Requests/BillUpdateRequest.php b/app/Http/Requests/BillUpdateRequest.php index e0e713bb35..7bd1f4c000 100644 --- a/app/Http/Requests/BillUpdateRequest.php +++ b/app/Http/Requests/BillUpdateRequest.php @@ -24,24 +24,13 @@ namespace FireflyIII\Http\Requests; use FireflyIII\Models\Bill; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class BillUpdateRequest. */ -class BillUpdateRequest extends FormRequest +class BillUpdateRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Returns the data required by the controller. diff --git a/app/Http/Requests/BudgetFormStoreRequest.php b/app/Http/Requests/BudgetFormStoreRequest.php index 22aa0733b9..935b560916 100644 --- a/app/Http/Requests/BudgetFormStoreRequest.php +++ b/app/Http/Requests/BudgetFormStoreRequest.php @@ -24,25 +24,15 @@ namespace FireflyIII\Http\Requests; use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; /** * @codeCoverageIgnore * Class BudgetFormStoreRequest */ -class BudgetFormStoreRequest extends FormRequest +class BudgetFormStoreRequest extends LoggedInRequest { use ConvertsDataTypes, ValidatesAutoBudgetRequest; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - return auth()->check(); - } /** * Returns the data required by the controller. diff --git a/app/Http/Requests/BudgetFormUpdateRequest.php b/app/Http/Requests/BudgetFormUpdateRequest.php index 64dac08cf4..8f471b1a5c 100644 --- a/app/Http/Requests/BudgetFormUpdateRequest.php +++ b/app/Http/Requests/BudgetFormUpdateRequest.php @@ -25,25 +25,15 @@ namespace FireflyIII\Http\Requests; use FireflyIII\Models\Budget; use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\Validation\AutoBudget\ValidatesAutoBudgetRequest; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; /** * @codeCoverageIgnore * Class BudgetFormUpdateRequest */ -class BudgetFormUpdateRequest extends FormRequest +class BudgetFormUpdateRequest extends LoggedInRequest { use ConvertsDataTypes, ValidatesAutoBudgetRequest; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - return auth()->check(); - } /** * Returns the data required by the controller. diff --git a/app/Http/Requests/BudgetIncomeRequest.php b/app/Http/Requests/BudgetIncomeRequest.php index eae41b6006..47e5278424 100644 --- a/app/Http/Requests/BudgetIncomeRequest.php +++ b/app/Http/Requests/BudgetIncomeRequest.php @@ -22,26 +22,13 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; -use Illuminate\Foundation\Http\FormRequest; - /** * Class BudgetIncomeRequest. * * @codeCoverageIgnore */ -class BudgetIncomeRequest extends FormRequest +class BudgetIncomeRequest extends LoggedInRequest { - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } - /** * Rules for this request. * diff --git a/app/Http/Requests/BulkEditJournalRequest.php b/app/Http/Requests/BulkEditJournalRequest.php index 0c674d49e3..7cda25c333 100644 --- a/app/Http/Requests/BulkEditJournalRequest.php +++ b/app/Http/Requests/BulkEditJournalRequest.php @@ -23,24 +23,13 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class MassEditBulkJournalRequest. */ -class BulkEditJournalRequest extends FormRequest +class BulkEditJournalRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Rules for this request. diff --git a/app/Http/Requests/CategoryFormRequest.php b/app/Http/Requests/CategoryFormRequest.php index 54b92655c2..6cefd406a1 100644 --- a/app/Http/Requests/CategoryFormRequest.php +++ b/app/Http/Requests/CategoryFormRequest.php @@ -24,24 +24,13 @@ namespace FireflyIII\Http\Requests; use FireflyIII\Models\Category; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class CategoryFormRequest. */ -class CategoryFormRequest extends FormRequest +class CategoryFormRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Get information for the controller. diff --git a/app/Http/Requests/ConfigurationRequest.php b/app/Http/Requests/ConfigurationRequest.php index 166170378b..b54b3c73e6 100644 --- a/app/Http/Requests/ConfigurationRequest.php +++ b/app/Http/Requests/ConfigurationRequest.php @@ -22,26 +22,13 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; -use Illuminate\Foundation\Http\FormRequest; - /** * Class ConfigurationRequest. * * @codeCoverageIgnore */ -class ConfigurationRequest extends FormRequest +class ConfigurationRequest extends LoggedInRequest { - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users and admins - return auth()->check(); - } - /** * Returns the data required by the controller. * diff --git a/app/Http/Requests/CurrencyFormRequest.php b/app/Http/Requests/CurrencyFormRequest.php index fce35b6705..61fc77b12d 100644 --- a/app/Http/Requests/CurrencyFormRequest.php +++ b/app/Http/Requests/CurrencyFormRequest.php @@ -24,24 +24,13 @@ namespace FireflyIII\Http\Requests; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class CurrencyFormRequest. */ -class CurrencyFormRequest extends FormRequest +class CurrencyFormRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Returns the data required by the controller. diff --git a/app/Http/Requests/DeleteAccountFormRequest.php b/app/Http/Requests/DeleteAccountFormRequest.php index 0b3ffd7e4b..f59e304f35 100644 --- a/app/Http/Requests/DeleteAccountFormRequest.php +++ b/app/Http/Requests/DeleteAccountFormRequest.php @@ -22,26 +22,13 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; -use Illuminate\Foundation\Http\FormRequest; - /** * Class DeleteAccountFormRequest. * * @codeCoverageIgnore */ -class DeleteAccountFormRequest extends FormRequest +class DeleteAccountFormRequest extends LoggedInRequest { - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } - /** * Rules for this request. * diff --git a/app/Http/Requests/EmailFormRequest.php b/app/Http/Requests/EmailFormRequest.php index c10d4a2c8c..3642b057d5 100644 --- a/app/Http/Requests/EmailFormRequest.php +++ b/app/Http/Requests/EmailFormRequest.php @@ -22,26 +22,13 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; -use Illuminate\Foundation\Http\FormRequest; - /** * Class EmailFormRequest. * * @codeCoverageIgnore */ -class EmailFormRequest extends FormRequest +class EmailFormRequest extends LoggedInRequest { - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } - /** * Rules for this request. * diff --git a/app/Http/Requests/JournalLinkRequest.php b/app/Http/Requests/JournalLinkRequest.php index c7f6d1bd98..5ec33dae8f 100644 --- a/app/Http/Requests/JournalLinkRequest.php +++ b/app/Http/Requests/JournalLinkRequest.php @@ -24,24 +24,13 @@ namespace FireflyIII\Http\Requests; use FireflyIII\Models\LinkType; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class JournalLink. */ -class JournalLinkRequest extends FormRequest +class JournalLinkRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Returns the data required by the controller. diff --git a/app/Http/Requests/LinkTypeFormRequest.php b/app/Http/Requests/LinkTypeFormRequest.php index 89a50fd037..cffa17845b 100644 --- a/app/Http/Requests/LinkTypeFormRequest.php +++ b/app/Http/Requests/LinkTypeFormRequest.php @@ -22,24 +22,11 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; -use Illuminate\Foundation\Http\FormRequest; - /** * Class LinkTypeFormRequest. */ -class LinkTypeFormRequest extends FormRequest +class LinkTypeFormRequest extends LoggedInRequest { - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged and admins - return auth()->check(); - } - /** * Rules for this request. * diff --git a/app/Http/Requests/LoggedInRequest.php b/app/Http/Requests/LoggedInRequest.php new file mode 100644 index 0000000000..3cac2c3c3a --- /dev/null +++ b/app/Http/Requests/LoggedInRequest.php @@ -0,0 +1,43 @@ +. + */ +declare(strict_types=1); + +namespace FireflyIII\Http\Requests; + +use Illuminate\Foundation\Http\FormRequest; + +/** + * Class LoggedInRequest. + */ +class LoggedInRequest extends FormRequest +{ + /** + * Verify the request. + * + * @return bool + */ + public function authorize(): bool + { + // Only allow logged in users + return auth()->check(); + } +} diff --git a/app/Http/Requests/MassDeleteJournalRequest.php b/app/Http/Requests/MassDeleteJournalRequest.php index 640ea76d8d..973706717c 100644 --- a/app/Http/Requests/MassDeleteJournalRequest.php +++ b/app/Http/Requests/MassDeleteJournalRequest.php @@ -22,26 +22,13 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; -use Illuminate\Foundation\Http\FormRequest; - /** * Class MassDeleteJournalRequest. * * @codeCoverageIgnore */ -class MassDeleteJournalRequest extends FormRequest +class MassDeleteJournalRequest extends LoggedInRequest { - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } - /** * Rules for this request. * diff --git a/app/Http/Requests/MassEditJournalRequest.php b/app/Http/Requests/MassEditJournalRequest.php index c3c54ea8eb..0741bd2316 100644 --- a/app/Http/Requests/MassEditJournalRequest.php +++ b/app/Http/Requests/MassEditJournalRequest.php @@ -22,26 +22,13 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; -use Illuminate\Foundation\Http\FormRequest; - /** * Class MassEditJournalRequest. * * @codeCoverageIgnore */ -class MassEditJournalRequest extends FormRequest +class MassEditJournalRequest extends LoggedInRequest { - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } - /** * Rules for this request. * diff --git a/app/Http/Requests/NewUserFormRequest.php b/app/Http/Requests/NewUserFormRequest.php index 9867bccbc5..d1b5a96911 100644 --- a/app/Http/Requests/NewUserFormRequest.php +++ b/app/Http/Requests/NewUserFormRequest.php @@ -23,26 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class NewUserFormRequest. * * @codeCoverageIgnore */ -class NewUserFormRequest extends FormRequest +class NewUserFormRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Rules for this request. diff --git a/app/Http/Requests/ObjectGroupFormRequest.php b/app/Http/Requests/ObjectGroupFormRequest.php index 14c0e302ec..b7b941d362 100644 --- a/app/Http/Requests/ObjectGroupFormRequest.php +++ b/app/Http/Requests/ObjectGroupFormRequest.php @@ -24,24 +24,13 @@ namespace FireflyIII\Http\Requests; use FireflyIII\Models\ObjectGroup; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class ObjectGroupFormRequest. */ -class ObjectGroupFormRequest extends FormRequest +class ObjectGroupFormRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Returns the data required by the controller. diff --git a/app/Http/Requests/PiggyBankStoreRequest.php b/app/Http/Requests/PiggyBankStoreRequest.php index 0df3c35fb2..41062eb7c0 100644 --- a/app/Http/Requests/PiggyBankStoreRequest.php +++ b/app/Http/Requests/PiggyBankStoreRequest.php @@ -23,24 +23,13 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class PiggyBankStoreRequest. */ -class PiggyBankStoreRequest extends FormRequest +class PiggyBankStoreRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Returns the data required by the controller. diff --git a/app/Http/Requests/PiggyBankUpdateRequest.php b/app/Http/Requests/PiggyBankUpdateRequest.php index b606787d62..64db45d170 100644 --- a/app/Http/Requests/PiggyBankUpdateRequest.php +++ b/app/Http/Requests/PiggyBankUpdateRequest.php @@ -24,24 +24,13 @@ namespace FireflyIII\Http\Requests; use FireflyIII\Models\PiggyBank; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class PiggyBankFormRequest. */ -class PiggyBankUpdateRequest extends FormRequest +class PiggyBankUpdateRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Returns the data required by the controller. diff --git a/app/Http/Requests/ProfileFormRequest.php b/app/Http/Requests/ProfileFormRequest.php index 4bb971a6f4..a04de91e73 100644 --- a/app/Http/Requests/ProfileFormRequest.php +++ b/app/Http/Requests/ProfileFormRequest.php @@ -22,26 +22,13 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; -use Illuminate\Foundation\Http\FormRequest; - /** * Class ProfileFormRequest. * * @codeCoverageIgnore */ -class ProfileFormRequest extends FormRequest +class ProfileFormRequest extends LoggedInRequest { - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } - /** * Rules for this request. * diff --git a/app/Http/Requests/ReconciliationStoreRequest.php b/app/Http/Requests/ReconciliationStoreRequest.php index 47b3df082f..4da33885e2 100644 --- a/app/Http/Requests/ReconciliationStoreRequest.php +++ b/app/Http/Requests/ReconciliationStoreRequest.php @@ -25,25 +25,14 @@ namespace FireflyIII\Http\Requests; use FireflyIII\Rules\ValidJournals; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; use Log; /** * Class ReconciliationStoreRequest */ -class ReconciliationStoreRequest extends FormRequest +class ReconciliationStoreRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Returns the data required by the controller. diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index cd999e9006..7c8b539aa5 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -31,26 +31,15 @@ use FireflyIII\Rules\ValidRecurrenceRepetitionType; use FireflyIII\Rules\ValidRecurrenceRepetitionValue; use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\Validation\AccountValidator; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; use Log; /** * Class RecurrenceFormRequest */ -class RecurrenceFormRequest extends FormRequest +class RecurrenceFormRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Get the data required by the controller. diff --git a/app/Http/Requests/ReportFormRequest.php b/app/Http/Requests/ReportFormRequest.php index bd0cf2cfa4..b793f85061 100644 --- a/app/Http/Requests/ReportFormRequest.php +++ b/app/Http/Requests/ReportFormRequest.php @@ -29,26 +29,14 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface; -use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Collection; use Log; /** * Class CategoryFormRequest. */ -class ReportFormRequest extends FormRequest +class ReportFormRequest extends LoggedInRequest { - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } - /** * Validate list of accounts. * diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php index 62600ceae5..f88f020c34 100644 --- a/app/Http/Requests/RuleFormRequest.php +++ b/app/Http/Requests/RuleFormRequest.php @@ -25,24 +25,13 @@ namespace FireflyIII\Http\Requests; use FireflyIII\Models\Rule; use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\Support\Request\GetRuleConfiguration; -use Illuminate\Foundation\Http\FormRequest; /** * Class RuleFormRequest. */ -class RuleFormRequest extends FormRequest +class RuleFormRequest extends LoggedInRequest { use ConvertsDataTypes, GetRuleConfiguration; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Get all data for controller. diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php index 9aaf2095b8..84560df8d4 100644 --- a/app/Http/Requests/RuleGroupFormRequest.php +++ b/app/Http/Requests/RuleGroupFormRequest.php @@ -25,24 +25,13 @@ namespace FireflyIII\Http\Requests; use FireflyIII\Models\RuleGroup; use FireflyIII\Rules\IsBoolean; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class RuleGroupFormRequest. */ -class RuleGroupFormRequest extends FormRequest +class RuleGroupFormRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Get all data for controller. diff --git a/app/Http/Requests/SelectTransactionsRequest.php b/app/Http/Requests/SelectTransactionsRequest.php index bb1a552d89..ba17baa265 100644 --- a/app/Http/Requests/SelectTransactionsRequest.php +++ b/app/Http/Requests/SelectTransactionsRequest.php @@ -23,26 +23,14 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; use Carbon\Carbon; -use Illuminate\Foundation\Http\FormRequest; /** * Class SelectTransactionsRequest. * * @codeCoverageIgnore */ -class SelectTransactionsRequest extends FormRequest +class SelectTransactionsRequest extends LoggedInRequest { - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } - /** * Rules for this request. * diff --git a/app/Http/Requests/TagFormRequest.php b/app/Http/Requests/TagFormRequest.php index 91de7bb05f..49a06a2772 100644 --- a/app/Http/Requests/TagFormRequest.php +++ b/app/Http/Requests/TagFormRequest.php @@ -26,24 +26,13 @@ use FireflyIII\Models\Location; use FireflyIII\Models\Tag; use FireflyIII\Support\Request\AppendsLocationData; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class TagFormRequest. */ -class TagFormRequest extends FormRequest +class TagFormRequest extends LoggedInRequest { use ConvertsDataTypes, AppendsLocationData; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Get all data for controller. diff --git a/app/Http/Requests/TestRuleFormRequest.php b/app/Http/Requests/TestRuleFormRequest.php index 1ebf43521a..2eaa9d40f7 100644 --- a/app/Http/Requests/TestRuleFormRequest.php +++ b/app/Http/Requests/TestRuleFormRequest.php @@ -23,26 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; use FireflyIII\Support\Request\GetRuleConfiguration; -use Illuminate\Foundation\Http\FormRequest; /** * Class TestRuleFormRequest. * * @codeCoverageIgnore */ -class TestRuleFormRequest extends FormRequest +class TestRuleFormRequest extends LoggedInRequest { use GetRuleConfiguration; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Rules for this request. diff --git a/app/Http/Requests/TokenFormRequest.php b/app/Http/Requests/TokenFormRequest.php index 9b09546552..7a39908b1f 100644 --- a/app/Http/Requests/TokenFormRequest.php +++ b/app/Http/Requests/TokenFormRequest.php @@ -22,26 +22,13 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; -use Illuminate\Foundation\Http\FormRequest; - /** * Class TokenFormRequest. * * @codeCoverageIgnore */ -class TokenFormRequest extends FormRequest +class TokenFormRequest extends LoggedInRequest { - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } - /** * Rules for this request. * diff --git a/app/Http/Requests/UserFormRequest.php b/app/Http/Requests/UserFormRequest.php index 1a34382cff..d4e682738c 100644 --- a/app/Http/Requests/UserFormRequest.php +++ b/app/Http/Requests/UserFormRequest.php @@ -23,26 +23,15 @@ declare(strict_types=1); namespace FireflyIII\Http\Requests; use FireflyIII\Support\Request\ConvertsDataTypes; -use Illuminate\Foundation\Http\FormRequest; /** * Class UserFormRequest. * * @codeCoverageIgnore */ -class UserFormRequest extends FormRequest +class UserFormRequest extends LoggedInRequest { use ConvertsDataTypes; - /** - * Verify the request. - * - * @return bool - */ - public function authorize(): bool - { - // Only allow logged in users - return auth()->check(); - } /** * Get data for controller.