From 1efe0fb9928d6ed314ec7bd2d6bd570fec82260d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 16 Feb 2022 09:13:23 +1100 Subject: [PATCH] Fixes for incorrectly implemented guards --- .../ClientPortal/DocumentController.php | 2 +- app/Http/Livewire/Profile/Settings/General.php | 2 +- .../Livewire/Profile/Settings/NameWebsiteLogo.php | 10 +++++----- .../Livewire/Profile/Settings/PersonalAddress.php | 14 +++++++------- .../Livewire/Profile/Settings/ShippingAddress.php | 14 +++++++------- .../ClientPortal/Documents/ShowDocumentRequest.php | 6 +++--- .../ClientPortal/Tasks/ShowTasksRequest.php | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/ClientPortal/DocumentController.php b/app/Http/Controllers/ClientPortal/DocumentController.php index fe48891b05bf..0b78238236c2 100644 --- a/app/Http/Controllers/ClientPortal/DocumentController.php +++ b/app/Http/Controllers/ClientPortal/DocumentController.php @@ -75,7 +75,7 @@ class DocumentController extends Controller ->get(); $documents->map(function ($document) { - if (auth()->user('contact')->client->id != $document->documentable->id) { + if (auth()->guard('contact')->user()->client->id != $document->documentable->id) { abort(401, 'Permission denied'); } }); diff --git a/app/Http/Livewire/Profile/Settings/General.php b/app/Http/Livewire/Profile/Settings/General.php index 4b333431a671..6f77f05a4410 100644 --- a/app/Http/Livewire/Profile/Settings/General.php +++ b/app/Http/Livewire/Profile/Settings/General.php @@ -37,7 +37,7 @@ class General extends Component public function mount() { - $profile = auth()->user('contact'); + $profile = auth()->guard('contact')->user(); $this->fill([ 'profile' => $profile, diff --git a/app/Http/Livewire/Profile/Settings/NameWebsiteLogo.php b/app/Http/Livewire/Profile/Settings/NameWebsiteLogo.php index dfb5a1e71e94..3101dd2f10d1 100644 --- a/app/Http/Livewire/Profile/Settings/NameWebsiteLogo.php +++ b/app/Http/Livewire/Profile/Settings/NameWebsiteLogo.php @@ -25,11 +25,11 @@ class NameWebsiteLogo extends Component public function mount() { $this->fill([ - 'profile' => auth()->user('contact')->client, - 'name' => auth()->user('contact')->client->present()->name, - 'vat_number' => auth()->user('contact')->client->present()->vat_number, - 'website' => auth()->user('contact')->client->present()->website, - 'phone' => auth()->user('contact')->client->present()->phone, + 'profile' => auth()->guard('contact')->user()->client, + 'name' => auth()->guard('contact')->user()->client->present()->name, + 'vat_number' => auth()->guard('contact')->user()->client->present()->vat_number, + 'website' => auth()->guard('contact')->user()->client->present()->website, + 'phone' => auth()->guard('contact')->user()->client->present()->phone, 'saved' => ctrans('texts.save'), ]); } diff --git a/app/Http/Livewire/Profile/Settings/PersonalAddress.php b/app/Http/Livewire/Profile/Settings/PersonalAddress.php index 83fb576ae87a..e423d689d119 100644 --- a/app/Http/Livewire/Profile/Settings/PersonalAddress.php +++ b/app/Http/Livewire/Profile/Settings/PersonalAddress.php @@ -31,13 +31,13 @@ class PersonalAddress extends Component public function mount($countries) { $this->fill([ - 'profile' => auth()->user('contact')->client, - 'address1' => auth()->user('contact')->client->address1, - 'address2' => auth()->user('contact')->client->address2, - 'city' => auth()->user('contact')->client->city, - 'state' => auth()->user('contact')->client->state, - 'postal_code' => auth()->user('contact')->client->postal_code, - 'country_id' => auth()->user('contact')->client->country_id, + 'profile' => auth()->guard('contact')->user()->client, + 'address1' => auth()->guard('contact')->user()->client->address1, + 'address2' => auth()->guard('contact')->user()->client->address2, + 'city' => auth()->guard('contact')->user()->client->city, + 'state' => auth()->guard('contact')->user()->client->state, + 'postal_code' => auth()->guard('contact')->user()->client->postal_code, + 'country_id' => auth()->guard('contact')->user()->client->country_id, 'countries' => $countries, 'saved' => ctrans('texts.save'), diff --git a/app/Http/Livewire/Profile/Settings/ShippingAddress.php b/app/Http/Livewire/Profile/Settings/ShippingAddress.php index 871794cd890b..66035904941a 100644 --- a/app/Http/Livewire/Profile/Settings/ShippingAddress.php +++ b/app/Http/Livewire/Profile/Settings/ShippingAddress.php @@ -31,13 +31,13 @@ class ShippingAddress extends Component public function mount($countries) { $this->fill([ - 'profile' => auth()->user('contact')->client, - 'shipping_address1' => auth()->user('contact')->client->shipping_address1, - 'shipping_address2' => auth()->user('contact')->client->shipping_address2, - 'shipping_city' => auth()->user('contact')->client->shipping_city, - 'shipping_state' => auth()->user('contact')->client->shipping_state, - 'shipping_postal_code' => auth()->user('contact')->client->shipping_postal_code, - 'shipping_country_id' => auth()->user('contact')->client->shipping_country_id, + 'profile' => auth()->guard('contact')->user()->client, + 'shipping_address1' => auth()->guard('contact')->user()->client->shipping_address1, + 'shipping_address2' => auth()->guard('contact')->user()->client->shipping_address2, + 'shipping_city' => auth()->guard('contact')->user()->client->shipping_city, + 'shipping_state' => auth()->guard('contact')->user()->client->shipping_state, + 'shipping_postal_code' => auth()->guard('contact')->user()->client->shipping_postal_code, + 'shipping_country_id' => auth()->guard('contact')->user()->client->shipping_country_id, 'countries' => $countries, 'saved' => ctrans('texts.save'), diff --git a/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php b/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php index a11f50fe6068..97ce78a408b0 100644 --- a/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php +++ b/app/Http/Requests/ClientPortal/Documents/ShowDocumentRequest.php @@ -27,9 +27,9 @@ class ShowDocumentRequest extends FormRequest */ public function authorize() { - return auth()->user('contact')->client->id == $this->document->documentable_id - || $this->document->documentable->client_id == auth()->user('contact')->client->id - || $this->document->company_id == auth()->user('contact')->company->id; + return auth()->guard('contact')->user()->client_id == $this->document->documentable_id + || $this->document->documentable->client_id == auth()->guard('contact')->user()->client_id + || $this->document->company_id == auth()->guard('contact')->user()->company_id; } /** diff --git a/app/Http/Requests/ClientPortal/Tasks/ShowTasksRequest.php b/app/Http/Requests/ClientPortal/Tasks/ShowTasksRequest.php index 91c9366d2d4e..19388598936a 100644 --- a/app/Http/Requests/ClientPortal/Tasks/ShowTasksRequest.php +++ b/app/Http/Requests/ClientPortal/Tasks/ShowTasksRequest.php @@ -23,7 +23,7 @@ class ShowTasksRequest extends FormRequest */ public function authorize() { - return (bool)auth()->user('contact')->client->getSetting('enable_client_portal_tasks'); + return (bool)auth()->guard('contact')->user()->client->getSetting('enable_client_portal_tasks'); } /**