Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 09:44:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

language is now persistent over whole flow + fixes

Browse Source
This commit is contained in:
paulwer 2023-12-20 17:58:06 +01:00
parent cb311c52f8
commit d7daca49d4
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,12 +17,9 @@ use App\Http\Requests\Nordigen\ConfirmNordigenBankIntegrationRequest;
use App\Http\Requests\Nordigen\ConnectNordigenBankIntegrationRequest; use App\Http\Requests\Nordigen\ConnectNordigenBankIntegrationRequest;
use App\Jobs\Bank\ProcessBankTransactionsNordigen; use App\Jobs\Bank\ProcessBankTransactionsNordigen;
use App\Models\BankIntegration; use App\Models\BankIntegration;
use App\Models\Company;
use App\Models\User;
use App\Utils\Ninja; use App\Utils\Ninja;
use Cache; use Cache;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Log;
use Nordigen\NordigenPHP\Exceptions\NordigenExceptions\NordigenException; use Nordigen\NordigenPHP\Exceptions\NordigenExceptions\NordigenException;
class NordigenController extends BaseController class NordigenController extends BaseController
@ -36,6 +33,7 @@ class NordigenController extends BaseController
$data = $request->all(); $data = $request->all();
$context = $request->getTokenContent(); $context = $request->getTokenContent();
$lang = $data['lang'] ?? 'en'; $lang = $data['lang'] ?? 'en';
$context["lang"] = $lang;
if (!$context) if (!$context)
return view('bank.nordigen.handler', [ return view('bank.nordigen.handler', [
@ -136,6 +134,8 @@ class NordigenController extends BaseController
{ {
$data = $request->all(); $data = $request->all();
$context = $request->getTokenContent(); $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
$lang = $data['lang'] ?? 'en'; $lang = $data['lang'] ?? 'en';
if (!$context || $context["context"] != "nordigen" || !array_key_exists("requisitionId", $context)) if (!$context || $context["context"] != "nordigen" || !array_key_exists("requisitionId", $context))

6
app/Http/Requests/Nordigen/ConfirmNordigenBankIntegrationRequest.php
View File

@ -42,11 +42,9 @@ class ConfirmNordigenBankIntegrationRequest extends Request
} }
public function getTokenContent() public function getTokenContent()
{ {
if ($this->state) { $input = $this->all();
$this->token = $this->state;
}
$data = Cache::get($this->token); $data = Cache::get($input['ref']);
return $data; return $data;
} }

4
app/Http/Requests/Nordigen/ConnectNordigenBankIntegrationRequest.php
View File

@ -14,9 +14,7 @@ namespace App\Http\Requests\Nordigen;
use App\Http\Requests\Request; use App\Http\Requests\Request;
use App\Libraries\MultiDB; use App\Libraries\MultiDB;
use App\Models\Company; use App\Models\Company;
use App\Models\User;
use Cache; use Cache;
use Log;
class ConnectNordigenBankIntegrationRequest extends Request class ConnectNordigenBankIntegrationRequest extends Request
{ {
@ -52,7 +50,7 @@ class ConnectNordigenBankIntegrationRequest extends Request
if (!array_key_exists('redirect', $input)) { if (!array_key_exists('redirect', $input)) {
$context = $this->getTokenContent(); $context = $this->getTokenContent();
$input["redirect"] = isset($context["is_react"]) && $context['is_react'] ? redirect(config('ninja.react_url') . "/#/settings/bank_accounts") : redirect(config('ninja.app_url')); $input["redirect"] = isset($context["is_react"]) && $context['is_react'] ? config('ninja.react_url') . "/#/settings/bank_accounts" : config('ninja.app_url');
$this->replace($input); $this->replace($input);
} }