Route fixes

This commit is contained in:
Hillel Coren 2017-11-15 16:17:06 +02:00
parent 45117711e4
commit ca3523f93e
3 changed files with 39 additions and 37 deletions

View File

@ -34,10 +34,15 @@ class Kernel extends HttpKernel
\App\Http\Middleware\QueryLogging::class, \App\Http\Middleware\QueryLogging::class,
\App\Http\Middleware\StartupCheck::class, \App\Http\Middleware\StartupCheck::class,
], ],
'api' => [
\App\Http\Middleware\ApiCheck::class,
],
/*
'api' => [ 'api' => [
'throttle:60,1', 'throttle:60,1',
'bindings', 'bindings',
], ],
*/
]; ];
/** /**
@ -56,6 +61,5 @@ class Kernel extends HttpKernel
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'lookup' => \App\Http\Middleware\DatabaseLookup::class, 'lookup' => \App\Http\Middleware\DatabaseLookup::class,
'permissions.required' => \App\Http\Middleware\PermissionsRequired::class, 'permissions.required' => \App\Http\Middleware\PermissionsRequired::class,
'api' => \App\Http\Middleware\ApiCheck::class,
]; ];
} }

View File

@ -69,9 +69,9 @@ class RouteServiceProvider extends ServiceProvider
protected function mapApiRoutes() protected function mapApiRoutes()
{ {
Route::group([ Route::group([
'middleware' => 'api', 'middleware' => ['lookup:api', 'api'],
'namespace' => $this->namespace, 'namespace' => $this->namespace,
'prefix' => 'api', 'prefix' => 'api/v1',
], function ($router) { ], function ($router) {
require base_path('routes/api.php'); require base_path('routes/api.php');
}); });

View File

@ -1,36 +1,34 @@
<?php <?php
// Route groups for API Route::get('ping', 'AccountApiController@ping');
Route::group(['middleware' => ['lookup:api', 'api'], 'prefix' => 'api/v1'], function () { Route::post('login', 'AccountApiController@login');
Route::get('ping', 'AccountApiController@ping'); Route::post('oauth_login', 'AccountApiController@oauthLogin');
Route::post('login', 'AccountApiController@login'); Route::post('register', 'AccountApiController@register');
Route::post('oauth_login', 'AccountApiController@oauthLogin'); Route::get('static', 'AccountApiController@getStaticData');
Route::post('register', 'AccountApiController@register'); Route::get('accounts', 'AccountApiController@show');
Route::get('static', 'AccountApiController@getStaticData'); Route::put('accounts', 'AccountApiController@update');
Route::get('accounts', 'AccountApiController@show');
Route::put('accounts', 'AccountApiController@update'); Route::resource('clients', 'ClientApiController');
Route::resource('clients', 'ClientApiController'); Route::resource('contacts', 'ContactApiController');
Route::resource('contacts', 'ContactApiController'); Route::get('quotes', 'QuoteApiController@index');
Route::get('quotes', 'QuoteApiController@index'); Route::get('download/{invoice_id}', 'InvoiceApiController@download');
Route::get('download/{invoice_id}', 'InvoiceApiController@download'); Route::resource('invoices', 'InvoiceApiController');
Route::resource('invoices', 'InvoiceApiController'); Route::resource('payments', 'PaymentApiController');
Route::resource('payments', 'PaymentApiController'); Route::resource('tasks', 'TaskApiController');
Route::resource('tasks', 'TaskApiController'); Route::resource('credits', 'CreditApiController');
Route::resource('credits', 'CreditApiController'); Route::post('hooks', 'IntegrationController@subscribe');
Route::post('hooks', 'IntegrationController@subscribe'); Route::post('email_invoice', 'InvoiceApiController@emailInvoice');
Route::post('email_invoice', 'InvoiceApiController@emailInvoice'); Route::get('user_accounts', 'AccountApiController@getUserAccounts');
Route::get('user_accounts', 'AccountApiController@getUserAccounts'); Route::resource('products', 'ProductApiController');
Route::resource('products', 'ProductApiController'); Route::resource('projects', 'ProjectApiController');
Route::resource('projects', 'ProjectApiController'); Route::resource('tax_rates', 'TaxRateApiController');
Route::resource('tax_rates', 'TaxRateApiController'); Route::resource('users', 'UserApiController');
Route::resource('users', 'UserApiController'); Route::resource('expenses', 'ExpenseApiController');
Route::resource('expenses', 'ExpenseApiController'); Route::post('add_token', 'AccountApiController@addDeviceToken');
Route::post('add_token', 'AccountApiController@addDeviceToken'); Route::post('remove_token', 'AccountApiController@removeDeviceToken');
Route::post('remove_token', 'AccountApiController@removeDeviceToken'); Route::post('update_notifications', 'AccountApiController@updatePushNotifications');
Route::post('update_notifications', 'AccountApiController@updatePushNotifications'); Route::get('dashboard', 'DashboardApiController@index');
Route::get('dashboard', 'DashboardApiController@index'); Route::resource('documents', 'DocumentAPIController');
Route::resource('documents', 'DocumentAPIController'); Route::resource('vendors', 'VendorApiController');
Route::resource('vendors', 'VendorApiController'); Route::resource('expense_categories', 'ExpenseCategoryApiController');
Route::resource('expense_categories', 'ExpenseCategoryApiController'); Route::post('ios_subscription_status', 'AccountApiController@iosSubscriptionStatus');
Route::post('ios_subscription_status', 'AccountApiController@iosSubscriptionStatus');
});