Cleanup API middleware.

This commit is contained in:
James Cole
2019-08-16 05:08:56 +02:00
parent eed84e18bb
commit 78335210db
3 changed files with 49 additions and 28 deletions

View File

@@ -180,7 +180,7 @@ class Kernel extends HttpKernel
CreateFreshApiToken::class, CreateFreshApiToken::class,
], ],
'api' => [ 'apiX' => [
'throttle:60,1', 'throttle:60,1',
'bindings', 'bindings',
], ],

View File

@@ -58,7 +58,7 @@ class RouteServiceProvider extends ServiceProvider
protected function mapApiRoutes(): void protected function mapApiRoutes(): void
{ {
Route::prefix('api/v1') Route::prefix('api/v1')
->middleware('auth:api') ->middleware('apiX')
->namespace($this->namespace) ->namespace($this->namespace)
->group(base_path('routes/api.php')); ->group(base_path('routes/api.php'));
} }

View File

@@ -42,7 +42,9 @@ declare(strict_types=1);
*/ */
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'about', 'as' => 'api.v1.about.'], [
'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'about',
'as' => 'api.v1.about.'],
static function () { static function () {
// Accounts API routes: // Accounts API routes:
@@ -53,7 +55,8 @@ Route::group(
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'accounts', 'as' => 'api.v1.accounts.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'accounts',
'as' => 'api.v1.accounts.'],
static function () { static function () {
// Accounts API routes: // Accounts API routes:
@@ -70,7 +73,8 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'attachments', 'as' => 'api.v1.attachments.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'attachments',
'as' => 'api.v1.attachments.'],
static function () { static function () {
// Attachment API routes: // Attachment API routes:
@@ -85,7 +89,7 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'available_budgets', ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'available_budgets',
'as' => 'api.v1.available_budgets.'], 'as' => 'api.v1.available_budgets.'],
static function () { static function () {
@@ -99,7 +103,8 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'bills', 'as' => 'api.v1.bills.'], static function () { ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'bills',
'as' => 'api.v1.bills.'], static function () {
// Bills API routes: // Bills API routes:
Route::get('', ['uses' => 'BillController@index', 'as' => 'index']); Route::get('', ['uses' => 'BillController@index', 'as' => 'index']);
@@ -116,7 +121,8 @@ Route::group(
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'budgets/limits', 'as' => 'api.v1.budget_limits.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'budgets/limits',
'as' => 'api.v1.budget_limits.'],
static function () { static function () {
// Budget Limit API routes: // Budget Limit API routes:
@@ -130,7 +136,8 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'budgets', 'as' => 'api.v1.budgets.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'budgets',
'as' => 'api.v1.budgets.'],
static function () { static function () {
// Budget API routes: // Budget API routes:
@@ -146,7 +153,8 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'categories', 'as' => 'api.v1.categories.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'categories',
'as' => 'api.v1.categories.'],
static function () { static function () {
// Category API routes: // Category API routes:
@@ -165,7 +173,7 @@ Route::group(
// Accounts // Accounts
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/account', ['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/account',
'as' => 'api.v1.chart.account.'], 'as' => 'api.v1.chart.account.'],
static function () { static function () {
Route::get('overview', ['uses' => 'AccountController@overview', 'as' => 'overview']); Route::get('overview', ['uses' => 'AccountController@overview', 'as' => 'overview']);
@@ -177,7 +185,7 @@ Route::group(
// Available budgets // Available budgets
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/ab', ['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/ab',
'as' => 'api.v1.chart.ab.'], 'as' => 'api.v1.chart.ab.'],
static function () { static function () {
@@ -188,7 +196,7 @@ Route::group(
// Categories // Categories
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/category', ['namespace' => 'FireflyIII\Api\V1\Controllers\Chart', 'prefix' => 'chart/category',
'as' => 'api.v1.chart.category.'], 'as' => 'api.v1.chart.category.'],
static function () { static function () {
@@ -202,7 +210,8 @@ Route::group(
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'configuration', 'as' => 'api.v1.configuration.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'configuration',
'as' => 'api.v1.configuration.'],
static function () { static function () {
// Configuration API routes: // Configuration API routes:
@@ -212,7 +221,8 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'cer', 'as' => 'api.v1.cer.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'cer',
'as' => 'api.v1.cer.'],
static function () { static function () {
// Currency Exchange Rate API routes: // Currency Exchange Rate API routes:
@@ -221,7 +231,8 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'import', 'as' => 'api.v1.import.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'import',
'as' => 'api.v1.import.'],
static function () { static function () {
// Transaction Links API routes: // Transaction Links API routes:
@@ -231,7 +242,8 @@ Route::group(
} }
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'link_types', 'as' => 'api.v1.link_types.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'link_types',
'as' => 'api.v1.link_types.'],
static function () { static function () {
// Link Type API routes: // Link Type API routes:
@@ -245,7 +257,7 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transaction_links', ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transaction_links',
'as' => 'api.v1.transaction_links.'], 'as' => 'api.v1.transaction_links.'],
static function () { static function () {
@@ -260,7 +272,8 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'piggy_banks', 'as' => 'api.v1.piggy_banks.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'piggy_banks',
'as' => 'api.v1.piggy_banks.'],
static function () { static function () {
// Piggy Bank API routes: // Piggy Bank API routes:
@@ -274,7 +287,8 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'preferences', 'as' => 'api.v1.preferences.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'preferences',
'as' => 'api.v1.preferences.'],
static function () { static function () {
// Preference API routes: // Preference API routes:
@@ -285,7 +299,8 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'recurrences', 'as' => 'api.v1.recurrences.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'recurrences',
'as' => 'api.v1.recurrences.'],
static function () { static function () {
// Recurrence API routes: // Recurrence API routes:
@@ -300,7 +315,8 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'rules', 'as' => 'api.v1.rules.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'rules',
'as' => 'api.v1.rules.'],
static function () { static function () {
// Rules API routes: // Rules API routes:
@@ -317,7 +333,8 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'rule_groups', 'as' => 'api.v1.rule_groups.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'rule_groups',
'as' => 'api.v1.rule_groups.'],
static function () { static function () {
// Rules API routes: // Rules API routes:
@@ -336,7 +353,7 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'summary', ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'summary',
'as' => 'api.v1.summary.'], 'as' => 'api.v1.summary.'],
static function () { static function () {
@@ -347,7 +364,8 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'currencies', 'as' => 'api.v1.currencies.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'currencies',
'as' => 'api.v1.currencies.'],
static function () { static function () {
// Transaction currency API routes: // Transaction currency API routes:
@@ -373,7 +391,8 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'tags', 'as' => 'api.v1.tags.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'tags',
'as' => 'api.v1.tags.'],
static function () { static function () {
// Tag API routes: // Tag API routes:
Route::get('', ['uses' => 'TagController@index', 'as' => 'index']); Route::get('', ['uses' => 'TagController@index', 'as' => 'index']);
@@ -386,7 +405,8 @@ Route::group(
); );
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'tag-cloud', 'as' => 'api.v1.tag-cloud.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'tag-cloud',
'as' => 'api.v1.tag-cloud.'],
static function () { static function () {
// Tag cloud API routes (to prevent collisions) // Tag cloud API routes (to prevent collisions)
Route::get('', ['uses' => 'TagController@cloud', 'as' => 'cloud']); Route::get('', ['uses' => 'TagController@cloud', 'as' => 'cloud']);
@@ -395,7 +415,8 @@ Route::group(
Route::group( Route::group(
['middleware' => ['auth:api', 'bindings'], 'namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transactions', 'as' => 'api.v1.transactions.'], ['namespace' => 'FireflyIII\Api\V1\Controllers', 'prefix' => 'transactions',
'as' => 'api.v1.transactions.'],
static function () { static function () {
// Transaction API routes: // Transaction API routes: