From 647ac08e801b410992c44a6a2ad192bbf36e062b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Fri, 14 Jun 2024 19:14:07 +0200 Subject: [PATCH] Fixed issue with retrieving company key by adding Cache facade and using stored data for company key instead of token --- app/Http/Requests/GoCardless/OAuthConnectRequest.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Http/Requests/GoCardless/OAuthConnectRequest.php b/app/Http/Requests/GoCardless/OAuthConnectRequest.php index 32b746621a9d..56722de8912d 100644 --- a/app/Http/Requests/GoCardless/OAuthConnectRequest.php +++ b/app/Http/Requests/GoCardless/OAuthConnectRequest.php @@ -15,6 +15,7 @@ namespace App\Http\Requests\GoCardless; use App\Libraries\MultiDB; use App\Models\Company; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Support\Facades\Cache; class OAuthConnectRequest extends FormRequest { @@ -35,12 +36,16 @@ class OAuthConnectRequest extends FormRequest public function getCompany(): \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Builder|\App\Models\BaseModel { + $data = Cache::get( + key: $this->token, + ); + MultiDB::findAndSetDbByCompanyKey( - $this->company_key, + company_key: $data['company_key'], ); return Company::query() - ->where('company_key', $this->company_key) + ->where('company_key', $data['company_key']) ->firstOrFail(); } }