From 34067e490fb3ca7a30555f55678c58c2016bf85b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 26 Dec 2023 10:19:48 +1100 Subject: [PATCH] Static Analysis --- app/Http/Controllers/Bank/NordigenController.php | 4 +++- app/Http/Controllers/BankIntegrationController.php | 2 +- app/Jobs/Bank/ProcessBankTransactionsNordigen.php | 2 +- app/Transformers/BankIntegrationTransformer.php | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Bank/NordigenController.php b/app/Http/Controllers/Bank/NordigenController.php index 803947c9388c..4644e32deb4d 100644 --- a/app/Http/Controllers/Bank/NordigenController.php +++ b/app/Http/Controllers/Bank/NordigenController.php @@ -128,11 +128,13 @@ class NordigenController extends BaseController /** * VIEW: Confirm Nordigen Bank Integration (redirect after nordigen flow) - * @param ConnectNordigenBankIntegrationRequest $request + * @param ConfirmNordigenBankIntegrationRequest $request */ public function confirm(ConfirmNordigenBankIntegrationRequest $request) { $data = $request->all(); + + /** @var array $context */ $context = $request->getTokenContent(); if (!array_key_exists('lang', $data) && $context['lang'] != 'en') return redirect()->route('nordigen.confirm', array_merge(["lang" => $context['lang']], $request->query())); // redirect is required in order for the bank-ui to display everything properly diff --git a/app/Http/Controllers/BankIntegrationController.php b/app/Http/Controllers/BankIntegrationController.php index bf61c52bc7a4..891e7c0ca962 100644 --- a/app/Http/Controllers/BankIntegrationController.php +++ b/app/Http/Controllers/BankIntegrationController.php @@ -212,7 +212,7 @@ class BankIntegrationController extends BaseController ProcessBankTransactionsYodlee::dispatch($user_account->id, $bank_integration); }); - if (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key') && (Ninja::isSelfHost() || (Ninja::isHosted() && $user_account->isPaid() && $user_account->plan == 'enterprise'))) + if (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key') && (Ninja::isSelfHost() || (Ninja::isHosted() && $user_account->isEnterprisePaidClient()))) $user_account->bank_integrations->where("integration_type", BankIntegration::INTEGRATION_TYPE_NORDIGEN)->each(function ($bank_integration) { ProcessBankTransactionsNordigen::dispatch($bank_integration); }); diff --git a/app/Jobs/Bank/ProcessBankTransactionsNordigen.php b/app/Jobs/Bank/ProcessBankTransactionsNordigen.php index da9ac7f98571..fc77d49e5774 100644 --- a/app/Jobs/Bank/ProcessBankTransactionsNordigen.php +++ b/app/Jobs/Bank/ProcessBankTransactionsNordigen.php @@ -35,7 +35,7 @@ class ProcessBankTransactionsNordigen implements ShouldQueue public Company $company; public Nordigen $nordigen; public $nordigen_account; - + private bool $stop_loop = false; /** * Create a new job instance. */ diff --git a/app/Transformers/BankIntegrationTransformer.php b/app/Transformers/BankIntegrationTransformer.php index 8496b23e11ac..4b2288baf0e3 100644 --- a/app/Transformers/BankIntegrationTransformer.php +++ b/app/Transformers/BankIntegrationTransformer.php @@ -68,6 +68,7 @@ class BankIntegrationTransformer extends EntityTransformer 'created_at' => (int) $bank_integration->created_at, 'updated_at' => (int) $bank_integration->updated_at, 'archived_at' => (int) $bank_integration->deleted_at, + 'integration_type' => (string) $bank_integration->integration_type ?: '', ]; }