From 07cbaa582a7ab07a990d55bd1135a5b99e6328e2 Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Mon, 24 Oct 2022 13:44:04 +0200 Subject: [PATCH] update changepassword method for crmclient version --- app/Http/Controllers/CustomerController.php | 47 ++++++--- app/Http/Requests/CustomerUpdatePassword.php | 40 ++++++++ app/Lib/Utils.php | 99 +++++++++++++++++++ .../front/sable/customer/dashboard.blade.php | 9 ++ .../front/sable/sass/fo/base/_common.scss | 3 +- 5 files changed, 185 insertions(+), 13 deletions(-) create mode 100644 app/Http/Requests/CustomerUpdatePassword.php diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 3b425eb7..7443bc5b 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -3,8 +3,10 @@ namespace App\Http\Controllers; use App\Http\Requests\CustomerRegisterRequest; +use App\Http\Requests\CustomerUpdatePassword; use App\Http\Requests\LoginRequest; use App\Http\Requests\UpdateInfosRequest; +use App\Lib\Utils; use App\Mail\PasswordResetMail; use App\Mail\RegisterConfirmMail; use App\Models\Customers; @@ -400,23 +402,44 @@ class CustomerController extends Controller /** * changement de mot de passe depuis le profil * - * @param Request $request + * @param CustomerUpdatePassword $request * @return \Illuminate\Http\RedirectResponse */ - public function changePasswordWhenAuthenticated(Request $request) + public function changePasswordWhenAuthenticated(CustomerUpdatePassword $request) { - $request->validate([ - 'password' => 'required|min:8|confirmed|max:255' - ]); + /** @var \App\Models\Customers */ + $customer = Auth::guard('customer')->user(); - $crm = app('crmApi'); - $customer = $crm->changePwdCustomer(Auth::guard('customer')->user()->crm_id, $request->password); + /** @var \LDC\LDCCRM\CrmApiV2 */ + $crm = app('crmAPI'); - if ($customer->status === "OK") { - return back()->with('success', __("Modifications enregistrés !")); - } else { - return back()->withErrors(__("Une erreur est survenue, merci de réessayer ultérieurement.")); - } + // Test old password. + try { + // Ne devrait pas survenir, $crm->login throws ApiError::authFailed(). + if (!$crm->login($customer->email, $request->password_old)) { + // Mauvais identifiants. + return back()->withErrors('L\'ancien mot de passe ne correspond pas.'); + } + + $crmCustomer = $crm->getCustomer($customer->hashcode); + + $crmCustomer->password = $request->password; + $crmCustomer->save(); + } catch (ApiErrorException $e) { + if ($e->getApiError()->equals(ApiError::authFailed())) { + return back()->withErrors('L\'ancien mot de passe ne correspond pas.'); + } + Utils::sendEmailErrorManually($e); + // Une erreur critique est survenue avec la CRM. + return back()->withErrors('Une erreur est survenue, merci de réessayer ultérieurement.'); + } catch (\TypeError | CrmException $e) { + Utils::sendEmailErrorManually($e); + // Une erreur critique est survenue avec la CRM. + return back()->withErrors('Une erreur est survenue, merci de réessayer ultérieurement.'); + } catch (ValidationException $e) { + return back()->withErrors(sprintf('Nouveau mot de passe : %s', $e->getMessage())); + } //end try + return back()->with('success', __("Modifications enregistrés !")); } /** diff --git a/app/Http/Requests/CustomerUpdatePassword.php b/app/Http/Requests/CustomerUpdatePassword.php new file mode 100644 index 00000000..22893b89 --- /dev/null +++ b/app/Http/Requests/CustomerUpdatePassword.php @@ -0,0 +1,40 @@ +check(); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + 'password_old' => 'required', + 'password' => [ + 'required', 'confirmed', 'min:8', 'max:255', + Password::min(8) + ->mixedCase() + ->letters() + ->numbers() + ->symbols() + ->uncompromised() + ], + ]; + } +} diff --git a/app/Lib/Utils.php b/app/Lib/Utils.php index 9aa9cdde..a86deecd 100644 --- a/app/Lib/Utils.php +++ b/app/Lib/Utils.php @@ -2,6 +2,9 @@ namespace App\Lib; +use Illuminate\Support\Facades\Mail; +use Throwable; + class Utils { /** @@ -22,4 +25,100 @@ class Utils } return $randomString; } + + /** + * Manually send an exception to team instead of going trough the error handler + * (requires package kwaadpepper/exception-handler) + * + * @param Throwable $e + * @return void + */ + public static function sendEmailErrorManually(Throwable $e) + { + Mail::send([ + 'html' => 'exception-handler::emails.exception', + 'text' => 'exception-handler::emails.exception-plain' + ], [ + 'appName' => config('app.name'), + 'code' => $e->getCode(), + 'line' => $e->getLine(), + 'ename' => \get_class($e), + 'emessage' => self::getAnonymizedMessage($e->getMessage()), + 'file' => str_replace(\realpath(\sprintf('%s/../', \app_path())), '', $e->getFile()), + 'stackTrace' => self::getAnonymizedStackTrace($e), + 'uri' => app()->runningInConsole() ? + 'CONSOLE' : ( + (request() and request()->fullUrl()) ? + request()->fullUrl() : 'none') + ], function ($m) { + /** @var \Illuminate\Mail\Message $m */ + $m->to( + config('mail.contactsList.serviceweb'), + sprintf('%s Exception Handler', config('app.name')) + )->subject('Need help !, an error occured in your application, please check Logs ASAP'); + }); + Log::alert(sprintf('Envoie d\'une erreur par mail : %s', json_encode($e))); + } + + /** + * Anonymize at least Sql queries + * + * @param string $message + * @return string + */ + private static function getAnonymizedMessage(string $message): string + { + $message = \preg_replace('/^(.*)( \(SQL:.*\))$/', '$1', $message) ?? $message; + return $message; + } + + /** + * Anonymize stack trace + * + * @param Throwable $e + * @return string + */ + private static function getAnonymizedStackTrace(Throwable $e): string + { + $projectPath = \realpath(\sprintf('%s/../', \app_path())); + $traceStack = $e->getTrace(); + $traceStr = ''; + $maxStackStage = 0; + foreach ($traceStack as $stackStage => $stack) { + $maxStackStage = $stackStage; + $traceStr .= \sprintf( + '#%s %s(%d): ', + $stackStage, + str_replace($projectPath, '', $stack['file']), + $stack['line'] + ); + $traceStr .= "{$stack['class']}->{$stack['function']}("; + $traceArgs = ''; + if (isset($stack['args'])) { + $argsCount = count($stack['args']); + for ($i = 0; $i < $argsCount; $i++) { + $type = \gettype($stack['args'][$i]); + switch ($type) { + case 'object': + $traceArgs .= sprintf('Object(%s)', \get_class($stack['args'][$i])); + break; + case 'array': + $traceArgs .= sprintf('Array(%d)', \count($stack['args'][$i])); + break; + case 'string': + $traceArgs .= sprintf('String(%d)', \strlen($stack['args'][$i])); + break; + default: + $traceArgs .= \gettype($stack['args'][$i]); + } + $traceArgs .= ($i !== ($argsCount - 1) ? ',' : ''); + } + $traceStr .= $traceArgs; + } //end if + $traceStr .= ")\n"; + } //end foreach + $maxStackStage++; + $traceStr .= "#$maxStackStage {main}"; + return $traceStr; + } } diff --git a/resources/views/front/sable/customer/dashboard.blade.php b/resources/views/front/sable/customer/dashboard.blade.php index 27c93250..826df5bd 100644 --- a/resources/views/front/sable/customer/dashboard.blade.php +++ b/resources/views/front/sable/customer/dashboard.blade.php @@ -135,6 +135,15 @@
@csrf
+
+ +
+
+