mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Convert route options to fluent methods
Laravel 8 adopts the tuple syntax for controller actions. Since the old options array is incompatible with this syntax, Shift converted them to use modern, fluent methods.
This commit is contained in:
parent
f293170c6a
commit
f6c4d1c56a
@ -13,17 +13,17 @@
|
|||||||
|
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
Route::group(['middleware' => ['throttle:300,1', 'api_secret_check']], function () {
|
Route::middleware('throttle:300,1', 'api_secret_check')->group(function () {
|
||||||
Route::post('api/v1/signup', 'AccountController@store')->name('signup.submit');
|
Route::post('api/v1/signup', 'AccountController@store')->name('signup.submit');
|
||||||
Route::post('api/v1/oauth_login', 'Auth\LoginController@oauthApiLogin');
|
Route::post('api/v1/oauth_login', 'Auth\LoginController@oauthApiLogin');
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::group(['middleware' => ['throttle:10,1', 'api_secret_check', 'email_db']], function () {
|
Route::middleware('throttle:10,1', 'api_secret_check', 'email_db')->group(function () {
|
||||||
Route::post('api/v1/login', 'Auth\LoginController@apiLogin')->name('login.submit')->middleware('throttle:20,1');
|
Route::post('api/v1/login', 'Auth\LoginController@apiLogin')->name('login.submit')->middleware('throttle:20,1');
|
||||||
Route::post('api/v1/reset_password', 'Auth\ForgotPasswordController@sendResetLinkEmail');
|
Route::post('api/v1/reset_password', 'Auth\ForgotPasswordController@sendResetLinkEmail');
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::group(['middleware' => ['throttle:100,1', 'api_db', 'token_auth', 'locale'], 'prefix' => 'api/v1', 'as' => 'api.'], function () {
|
Route::middleware('throttle:100,1', 'api_db', 'token_auth', 'locale')->prefix('api/v1')->name('api.')->group(function () {
|
||||||
Route::put('accounts/{account}', 'AccountController@update')->name('account.update');
|
Route::put('accounts/{account}', 'AccountController@update')->name('account.update');
|
||||||
Route::post('check_subdomain', 'SubdomainController@index')->name('check_subdomain');
|
Route::post('check_subdomain', 'SubdomainController@index')->name('check_subdomain');
|
||||||
Route::get('ping', 'PingController@index')->name('ping');
|
Route::get('ping', 'PingController@index')->name('ping');
|
||||||
|
@ -30,7 +30,7 @@ Route::get('client/payment/{contact_key}/{payment_id}', 'ClientPortal\Invitation
|
|||||||
Route::get('client/ninja/{contact_key}/{company_key}', 'ClientPortal\NinjaPlanController@index')->name('client.ninja_contact_login')->middleware(['domain_db']);
|
Route::get('client/ninja/{contact_key}/{company_key}', 'ClientPortal\NinjaPlanController@index')->name('client.ninja_contact_login')->middleware(['domain_db']);
|
||||||
Route::post('client/ninja/trial_confirmation', 'ClientPortal\NinjaPlanController@trial_confirmation')->name('client.trial.response')->middleware(['domain_db']);
|
Route::post('client/ninja/trial_confirmation', 'ClientPortal\NinjaPlanController@trial_confirmation')->name('client.trial.response')->middleware(['domain_db']);
|
||||||
|
|
||||||
Route::group(['middleware' => ['auth:contact', 'locale', 'domain_db', 'check_client_existence'], 'prefix' => 'client', 'as' => 'client.'], function () {
|
Route::middleware('auth:contact', 'locale', 'domain_db', 'check_client_existence')->prefix('client')->name('client.')->group(function () {
|
||||||
Route::get('dashboard', 'ClientPortal\DashboardController@index')->name('dashboard'); // name = (dashboard. index / create / show / update / destroy / edit
|
Route::get('dashboard', 'ClientPortal\DashboardController@index')->name('dashboard'); // name = (dashboard. index / create / show / update / destroy / edit
|
||||||
|
|
||||||
Route::get('plan', 'ClientPortal\NinjaPlanController@plan')->name('plan'); // name = (dashboard. index / create / show / update / destroy / edit
|
Route::get('plan', 'ClientPortal\NinjaPlanController@plan')->name('plan'); // name = (dashboard. index / create / show / update / destroy / edit
|
||||||
@ -100,7 +100,7 @@ Route::group(['middleware' => ['auth:contact', 'locale', 'domain_db', 'check_cli
|
|||||||
|
|
||||||
Route::get('client/subscriptions/{subscription}/purchase', 'ClientPortal\SubscriptionPurchaseController@index')->name('client.subscription.purchase')->middleware('domain_db');
|
Route::get('client/subscriptions/{subscription}/purchase', 'ClientPortal\SubscriptionPurchaseController@index')->name('client.subscription.purchase')->middleware('domain_db');
|
||||||
|
|
||||||
Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'client.'], function () {
|
Route::middleware('invite_db')->prefix('client')->name('client.')->group(function () {
|
||||||
/*Invitation catches*/
|
/*Invitation catches*/
|
||||||
Route::get('recurring_invoice/{invitation_key}', 'ClientPortal\InvitationController@recurringRouter');
|
Route::get('recurring_invoice/{invitation_key}', 'ClientPortal\InvitationController@recurringRouter');
|
||||||
Route::get('invoice/{invitation_key}', 'ClientPortal\InvitationController@invoiceRouter');
|
Route::get('invoice/{invitation_key}', 'ClientPortal\InvitationController@invoiceRouter');
|
||||||
|
@ -11,10 +11,10 @@
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
Route::group(['middleware' => ['api_secret_check']], function () {
|
Route::middleware('api_secret_check')->group(function () {
|
||||||
Route::post('api/v1/contact/login', 'Contact\LoginController@apiLogin');
|
Route::post('api/v1/contact/login', 'Contact\LoginController@apiLogin');
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::group(['middleware' => ['contact_db', 'api_secret_check', 'contact_token_auth'], 'prefix' =>'api/v1/contact', 'as' => 'api.contact.'], function () {
|
Route::middleware('contact_db', 'api_secret_check', 'contact_token_auth')->prefix('api/v1/contact')->name('api.contact.')->group(function () {
|
||||||
Route::get('invoices', 'Contact\InvoiceController@index'); // name = (clients. index / create / show / update / destroy / edit
|
Route::get('invoices', 'Contact\InvoiceController@index'); // name = (clients. index / create / show / update / destroy / edit
|
||||||
});
|
});
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
Route::group(['middleware' => ['company_key_db', 'locale'], 'prefix' => 'api/v1'], function () {
|
Route::middleware('company_key_db', 'locale')->prefix('api/v1')->group(function () {
|
||||||
Route::get('shop/products', 'Shop\ProductController@index');
|
Route::get('shop/products', 'Shop\ProductController@index');
|
||||||
Route::post('shop/clients', 'Shop\ClientController@store');
|
Route::post('shop/clients', 'Shop\ClientController@store');
|
||||||
Route::post('shop/invoices', 'Shop\InvoiceController@store');
|
Route::post('shop/invoices', 'Shop\InvoiceController@store');
|
||||||
|
@ -17,14 +17,14 @@ use Illuminate\Support\Facades\Route;
|
|||||||
|
|
||||||
Route::get('vendors', [VendorContactLoginController::class, 'catch'])->name('vendor.catchall')->middleware(['domain_db', 'contact_account', 'vendor_locale']); //catch all
|
Route::get('vendors', [VendorContactLoginController::class, 'catch'])->name('vendor.catchall')->middleware(['domain_db', 'contact_account', 'vendor_locale']); //catch all
|
||||||
|
|
||||||
Route::group(['middleware' => ['invite_db'], 'prefix' => 'vendor', 'as' => 'vendor.'], function () {
|
Route::middleware('invite_db')->prefix('vendor')->name('vendor.')->group(function () {
|
||||||
/*Invitation catches*/
|
/*Invitation catches*/
|
||||||
Route::get('purchase_order/{invitation_key}', [InvitationController::class, 'purchaseOrder']);
|
Route::get('purchase_order/{invitation_key}', [InvitationController::class, 'purchaseOrder']);
|
||||||
// Route::get('purchase_order/{invitation_key}/download_pdf', 'PurchaseOrderController@downloadPdf')->name('recurring_invoice.download_invitation_key');
|
// Route::get('purchase_order/{invitation_key}/download_pdf', 'PurchaseOrderController@downloadPdf')->name('recurring_invoice.download_invitation_key');
|
||||||
// Route::get('purchase_order/{invitation_key}/download', 'ClientPortal\InvitationController@routerForDownload');
|
// Route::get('purchase_order/{invitation_key}/download', 'ClientPortal\InvitationController@routerForDownload');
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::group(['middleware' => ['auth:vendor', 'vendor_locale', 'domain_db'], 'prefix' => 'vendor', 'as' => 'vendor.'], function () {
|
Route::middleware('auth:vendor', 'vendor_locale', 'domain_db')->prefix('vendor')->name('vendor.')->group(function () {
|
||||||
Route::get('dashboard', [PurchaseOrderController::class, 'index'])->name('dashboard');
|
Route::get('dashboard', [PurchaseOrderController::class, 'index'])->name('dashboard');
|
||||||
Route::get('purchase_orders', [PurchaseOrderController::class, 'index'])->name('purchase_orders.index');
|
Route::get('purchase_orders', [PurchaseOrderController::class, 'index'])->name('purchase_orders.index');
|
||||||
Route::get('purchase_orders/{purchase_order}', [PurchaseOrderController::class, 'show'])->name('purchase_order.show');
|
Route::get('purchase_orders/{purchase_order}', [PurchaseOrderController::class, 'show'])->name('purchase_order.show');
|
||||||
|
@ -33,7 +33,7 @@ Route::get('auth/{provider}', 'Auth\LoginController@redirectToProvider');
|
|||||||
/*
|
/*
|
||||||
* Inbound routes requiring DB Lookup
|
* Inbound routes requiring DB Lookup
|
||||||
*/
|
*/
|
||||||
Route::group(['middleware' => ['url_db']], function () {
|
Route::middleware('url_db')->group(function () {
|
||||||
Route::get('/user/confirm/{confirmation_code}', 'UserController@confirm');
|
Route::get('/user/confirm/{confirmation_code}', 'UserController@confirm');
|
||||||
Route::post('/user/confirm/{confirmation_code}', 'UserController@confirmWithPassword');
|
Route::post('/user/confirm/{confirmation_code}', 'UserController@confirmWithPassword');
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user