mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
changes related to merge
This commit is contained in:
parent
89a31d86c0
commit
2206d2190a
@ -73,9 +73,6 @@ class BankIntegration extends BaseModel
|
||||
'auto_sync',
|
||||
];
|
||||
|
||||
protected $dates = [
|
||||
];
|
||||
|
||||
const INTEGRATION_TYPE_YODLEE = 'YODLEE';
|
||||
|
||||
const INTEGRATION_TYPE_NORDIGEN = 'NORDIGEN';
|
||||
|
@ -121,7 +121,7 @@ Route::group(['middleware' => ['throttle:api', 'api_secret_check']], function ()
|
||||
Route::post('api/v1/oauth_login', [LoginController::class, 'oauthApiLogin']);
|
||||
});
|
||||
|
||||
Route::group(['middleware' => ['throttle:login','api_secret_check','email_db']], function () {
|
||||
Route::group(['middleware' => ['throttle:login', 'api_secret_check', 'email_db']], function () {
|
||||
Route::post('api/v1/login', [LoginController::class, 'apiLogin'])->name('login.submit');
|
||||
Route::post('api/v1/reset_password', [ForgotPasswordController::class, 'sendResetLinkEmail']);
|
||||
});
|
||||
@ -427,13 +427,9 @@ Route::post('api/v1/yodlee/data_updates', [YodleeController::class, 'dataUpdates
|
||||
Route::post('api/v1/yodlee/refresh_updates', [YodleeController::class, 'refreshUpdatesWebhook'])->middleware('throttle:100,1');
|
||||
Route::post('api/v1/yodlee/balance', [YodleeController::class, 'balanceWebhook'])->middleware('throttle:100,1');
|
||||
|
||||
<<<<<<< HEAD
|
||||
Route::get('api/v1/nordigen/institutions', [NordigenController::class, 'institutions'])->middleware('throttle:100,1')->middleware('token_auth')->name('nordigen_institutions');
|
||||
Route::any('api/v1/nordigen/confirm', [NordigenController::class, 'confirm'])->middleware('throttle:100,1')->name('nordigen_callback');
|
||||
|
||||
Route::fallback([BaseController::class, 'notFound']);
|
||||
=======
|
||||
Route::get('api/v1/protected_download/{hash}', [ProtectedDownloadController::class, 'index'])->name('protected_download')->middleware('throttle:300,1');
|
||||
|
||||
Route::fallback([BaseController::class, 'notFound'])->middleware('throttle:404');
|
||||
>>>>>>> v5-develop
|
||||
|
@ -55,6 +55,7 @@ Route::get('stripe/signup/{token}', [StripeConnectController::class, 'initialize
|
||||
Route::get('stripe/completed', [StripeConnectController::class, 'completed'])->name('stripe_connect.return');
|
||||
|
||||
Route::get('yodlee/onboard/{token}', [YodleeController::class, 'auth'])->name('yodlee.auth');
|
||||
|
||||
Route::get('nordigen/connect/{token}', [NordigenController::class, 'connect'])->name('nordigen.connect');
|
||||
|
||||
Route::get('checkout/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', [Checkout3dsController::class, 'index'])->middleware('domain_db')->name('checkout.3ds_redirect');
|
||||
|
Loading…
x
Reference in New Issue
Block a user