From f837ee25c15517c0b89d2846e4c5e5b9f5c3e305 Mon Sep 17 00:00:00 2001 From: Arthur Monney Date: Thu, 13 Jul 2023 22:54:01 +0200 Subject: [PATCH] :recycle: Apply Analytics tools --- .../admin/src/Actions/AttemptToAuthenticate.php | 2 ++ .../Actions/RedirectIfTwoFactorAuthenticatable.php | 14 ++++++++------ packages/admin/src/Contracts/LoginResponse.php | 2 ++ .../Auth/TwoFactorAuthenticatedController.php | 2 +- .../admin/src/Http/Livewire/Pages/Auth/Login.php | 2 +- .../src/Http/Requests/TwoFactorLoginRequest.php | 6 ++---- .../admin/src/Http/Responses/LoginResponse.php | 2 ++ packages/admin/src/ShopperServiceProvider.php | 8 +++++--- packages/core/src/Traits/ReviewRateable.php | 1 - 9 files changed, 23 insertions(+), 16 deletions(-) diff --git a/packages/admin/src/Actions/AttemptToAuthenticate.php b/packages/admin/src/Actions/AttemptToAuthenticate.php index 62f348f3e..a52b3db76 100644 --- a/packages/admin/src/Actions/AttemptToAuthenticate.php +++ b/packages/admin/src/Actions/AttemptToAuthenticate.php @@ -1,5 +1,7 @@ validateCredentials($data); @@ -26,23 +28,23 @@ public function handle(array $data, Closure $next): Response | Redirector protected function validateCredentials(array $request) { - $model = Shopper::auth()->getProvider()->getModel(); + $model = Shopper::auth()->getProvider()->getModel(); // @phpstan-ignore-line - return tap($model::where('email', $request['email'])->first(), function ($user) use ($request) { - if (! $user || ! Hash::check(value: $request['password'], hashedValue: $user->password)) { + return tap($model::where('email', $request['email'])->first(), function ($user) use ($request): void { + if (! $user || ! Hash::check(value: $request['password'], hashedValue: $user->password)) { $this->throwFailedAuthenticationException(); } }); } - protected function throwFailedAuthenticationException() + protected function throwFailedAuthenticationException(): void { throw ValidationException::withMessages([ 'email' => __('shopper::messages.login.failed'), ]); } - protected function twoFactorChallengeResponse($user, bool $remember): Redirector | Response + protected function twoFactorChallengeResponse($user, bool $remember): Redirector|Response { request()->session()->put([ 'login.id' => $user->getKey(), diff --git a/packages/admin/src/Contracts/LoginResponse.php b/packages/admin/src/Contracts/LoginResponse.php index 74c895535..9bf0e0454 100644 --- a/packages/admin/src/Contracts/LoginResponse.php +++ b/packages/admin/src/Contracts/LoginResponse.php @@ -1,5 +1,7 @@ challengedUser(); diff --git a/packages/admin/src/Http/Livewire/Pages/Auth/Login.php b/packages/admin/src/Http/Livewire/Pages/Auth/Login.php index ca7f18547..9a2750f96 100644 --- a/packages/admin/src/Http/Livewire/Pages/Auth/Login.php +++ b/packages/admin/src/Http/Livewire/Pages/Auth/Login.php @@ -54,7 +54,7 @@ public function authenticate() RedirectIfTwoFactorAuthenticatable::class, AttemptToAuthenticate::class, ])) - ->then(fn ($request) => app(LoginResponse::class)); + ->then(fn ($request) => app(LoginResponse::class)); } public function render(): View diff --git a/packages/admin/src/Http/Requests/TwoFactorLoginRequest.php b/packages/admin/src/Http/Requests/TwoFactorLoginRequest.php index 6e6439483..3eaf4292c 100644 --- a/packages/admin/src/Http/Requests/TwoFactorLoginRequest.php +++ b/packages/admin/src/Http/Requests/TwoFactorLoginRequest.php @@ -4,10 +4,8 @@ namespace Shopper\Http\Requests; -use Illuminate\Contracts\Auth\StatefulGuard; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Http\Exceptions\HttpResponseException; -use Illuminate\Validation\ValidationException; use Shopper\Contracts\TwoFactorAuthenticationProvider; use Shopper\Facades\Shopper; use Shopper\Http\Responses\FailedTwoFactorLoginResponse; @@ -51,7 +49,7 @@ public function validRecoveryCode(): ?string public function hasChallengedUser(): bool { - $model = Shopper::auth()->getProvider()->getModel(); + $model = Shopper::auth()->getProvider()->getModel(); // @phpstan-ignore-line return $this->session()->has('login.id') && $model::find($this->session()->get('login.id')); @@ -63,7 +61,7 @@ public function challengedUser() return $this->challengedUser; } - $model = Shopper::auth()->getProvider()->getModel(); + $model = Shopper::auth()->getProvider()->getModel(); // @phpstan-ignore-line if (! $this->session()->has('login.id') || ! $user = $model::find($this->session()->pull('login.id'))) { diff --git a/packages/admin/src/Http/Responses/LoginResponse.php b/packages/admin/src/Http/Responses/LoginResponse.php index 814469624..0336aa401 100644 --- a/packages/admin/src/Http/Responses/LoginResponse.php +++ b/packages/admin/src/Http/Responses/LoginResponse.php @@ -1,5 +1,7 @@ getLivewirePagesComponents()) as $alias => $component) { + foreach (array_merge( + config('shopper.components', []), + $this->getLivewirePagesComponents() + ) as $alias => $component) { Livewire::component("shopper-$alias", $component); } } diff --git a/packages/core/src/Traits/ReviewRateable.php b/packages/core/src/Traits/ReviewRateable.php index 9905bf52e..a893c20bb 100644 --- a/packages/core/src/Traits/ReviewRateable.php +++ b/packages/core/src/Traits/ReviewRateable.php @@ -4,7 +4,6 @@ namespace Shopper\Core\Traits; -use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Support\Collection; use Shopper\Core\Models\Review;