Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
paulwer 2023-12-11 21:21:42 +01:00
parent a364bc24de
commit 16378d551d
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Bank/NordigenController.php
View File

@ -154,7 +154,7 @@ class NordigenController extends BaseController
return response()->redirectTo(($context && array_key_exists("redirect", $context) ? $context["redirect"] : config('ninja.app_url')) . "?action=nordigen_connect&status=failed&reason=ref-invalid"); return response()->redirectTo(($context && array_key_exists("redirect", $context) ? $context["redirect"] : config('ninja.app_url')) . "?action=nordigen_connect&status=failed&reason=ref-invalid");
$company = Company::where('company_key', $context["company_key"])->first(); $company = Company::where('company_key', $context["company_key"])->firstOrFail();
$account = $company->account; $account = $company->account;
if (!(($account->bank_integration_nordigen_secret_id && $account->bank_integration_nordigen_secret_key) || (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key')))) if (!(($account->bank_integration_nordigen_secret_id && $account->bank_integration_nordigen_secret_key) || (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key'))))

21
app/Jobs/Bank/ProcessBankTransactionsNordigen.php
View File

@ -30,8 +30,9 @@ class ProcessBankTransactionsNordigen implements ShouldQueue
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
private Account $account; private Account $account;
private BankIntegration $bank_integration; private BankIntegration $bank_integration;
private string $secret_id;
private string $secret_key;
private ?string $from_date; private ?string $from_date;
@ -56,10 +57,18 @@ class ProcessBankTransactionsNordigen implements ShouldQueue
if ($this->bank_integration->integration_type != BankIntegration::INTEGRATION_TYPE_NORDIGEN) if ($this->bank_integration->integration_type != BankIntegration::INTEGRATION_TYPE_NORDIGEN)
throw new \Exception("Invalid BankIntegration Type"); throw new \Exception("Invalid BankIntegration Type");
if (!(($this->account->bank_integration_nordigen_secret_id && $this->account->bank_integration_nordigen_secret_key) || (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key')))) if (!(($this->account->bank_integration_secret_id && $this->account->integration_secret_key) || (config('ninja.nordigen.secret_id') && config('ninja.nordigen.secret_key'))))
throw new \Exception("Missing credentials for bank_integration service nortigen"); throw new \Exception("Missing credentials for bank_integration service nortigen");
$this->nordigen = ($this->account->bank_integration_nordigen_secret_id && $this->account->bank_integration_nordigen_secret_key) ? new Nordigen($this->account->bank_integration_nordigen_secret_id, $this->account->bank_integration_nordigen_secret_key) : new Nordigen(config('ninja.nordigen.secret_id'), config('ninja.nordigen.secret_key')); if ($this->account->bank_integration_secret_id && $this->account->bank_integration_secret_key) {
$this->secret_id = $this->account->bank_integration_secret_id;
$this->secret_key = $this->account->bank_integration_secret_key;
} else {
$this->secret_id = config('ninja.nordigen.secret_id');
$this->secret_key = config('ninja.nordigen.secret_key');
}
$this->nordigen = new Nordigen($this->secret_id, $this->secret_key);
} }
/** /**
@ -80,8 +89,7 @@ class ProcessBankTransactionsNordigen implements ShouldQueue
try { try {
$this->updateAccount(); $this->updateAccount();
} catch (\Exception $e) { } catch (\Exception $e) {
$secretId = $this->account->bank_integration_nordigen_secret_id ?: config('ninja.nortigen.secret_id'); nlog("{$this->secret_id} - exited abnormally => " . $e->getMessage());
nlog("{$secretId} - exited abnormally => " . $e->getMessage());
$content = [ $content = [
"Processing transactions for account: {$this->bank_integration->account->key} failed", "Processing transactions for account: {$this->bank_integration->account->key} failed",
@ -101,8 +109,7 @@ class ProcessBankTransactionsNordigen implements ShouldQueue
try { try {
$this->processTransactions(); $this->processTransactions();
} catch (\Exception $e) { } catch (\Exception $e) {
$secretId = $this->account->bank_integration_nordigen_secret_id ?: config('ninja.nortigen.secret_id'); nlog("{$this->secret_id} - exited abnormally => " . $e->getMessage());
nlog("{$secretId} - exited abnormally => " . $e->getMessage());
$content = [ $content = [
"Processing transactions for account: {$this->bank_integration->account->key} failed", "Processing transactions for account: {$this->bank_integration->account->key} failed",

1
app/Jobs/Bank/ProcessBankTransactionsYodlee.php
View File

@ -11,7 +11,6 @@
namespace App\Jobs\Bank; namespace App\Jobs\Bank;
use App\Helpers\Bank\Yodlee\Nordigen;
use App\Helpers\Bank\Yodlee\Transformer\AccountTransformer; use App\Helpers\Bank\Yodlee\Transformer\AccountTransformer;
use App\Helpers\Bank\Yodlee\Yodlee; use App\Helpers\Bank\Yodlee\Yodlee;
use App\Libraries\MultiDB; use App\Libraries\MultiDB;