From 2206d2190a2627266b0d5775b7e67e9082bb058e Mon Sep 17 00:00:00 2001 From: paulwer Date: Sun, 10 Dec 2023 08:23:53 +0100 Subject: [PATCH] changes related to merge --- app/Models/BankIntegration.php | 3 --- routes/api.php | 6 +----- routes/web.php | 1 + 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/Models/BankIntegration.php b/app/Models/BankIntegration.php index c70d78be5a1b..04e5bc9245a9 100644 --- a/app/Models/BankIntegration.php +++ b/app/Models/BankIntegration.php @@ -73,9 +73,6 @@ class BankIntegration extends BaseModel 'auto_sync', ]; - protected $dates = [ - ]; - const INTEGRATION_TYPE_YODLEE = 'YODLEE'; const INTEGRATION_TYPE_NORDIGEN = 'NORDIGEN'; diff --git a/routes/api.php b/routes/api.php index ee39dc7b2824..cca9161dc91e 100644 --- a/routes/api.php +++ b/routes/api.php @@ -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 diff --git a/routes/web.php b/routes/web.php index 32bf59ee956b..c47c9e139332 100644 --- a/routes/web.php +++ b/routes/web.php @@ -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');