wip #5792 @1:00

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index 98dc02535dc9c1d5eaeddeaac33d8170e8b64d62..495786e27e30b43a40c05fcd63c6f4ee4e96868e 100644 (file)
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -326,12 +326,11 @@ class AjaxController extends CubistFrontController
 
         $remember = $request->remember_me ? true : false;
 
-
         if (Auth::guard('web-clients')->attempt($data, $remember)) {
             $request->session()->regenerate();
             return Auth::guard('web-clients')->user();
         } else {
-            return false;
+            throw ValidationException::withMessages(['password' => __('Erreur lors de la validation du formulaire')]);
         }
     }
 
@@ -372,12 +371,25 @@ class AjaxController extends CubistFrontController
                 $validation[$key] = 'required|string|max:255';
             }elseif(in_array($key,['phone'])){
                 $validation[$key] = 'required|numeric';
+            }elseif ($key === "actually_password"){
+                $validation[$key] = 'required';
+            }elseif ($key === "password"){
+                $validation[$key] = 'required|confirmed|min:8';
             }
-
         }
 
         $data = $this->validation_form($request, $validation);
+
+        $data['password'] = Hash::make($data['password']);
+        $password = $data['actually_password'];
+        $actuallyPassword = Auth::guard('web-clients')->user()->password;
         $email = Auth::guard('web-clients')->user()->email;
+
+        if (!Hash::check($password,$actuallyPassword)) {
+            throw ValidationException::withMessages(['password' => __('Le mot de passe est incorrect')]);
+        }
+        unset($data['actually_password']);
+
         $client = Client::where('email',$email)->update($data);
     }
 

diff --git a/resources/views/pages/my_account.blade.php b/resources/views/pages/my_account.blade.php
index 5dde497da4b503ea97fffda9ed147f81326814c9..91b8abf22c09d559814ba58de704524ac6cb9994 100644 (file)
--- a/resources/views/pages/my_account.blade.php
+++ b/resources/views/pages/my_account.blade.php
@@ -81,16 +81,26 @@
                             <h2 class="text-2xl m-0">{{ __('Modifier mon mot de passe') }}</h2>
                         </div>
                         <div class="ajax-form flex flex-col pt-12">
-                            <form class="form-portal max-w-half-form" @submit.prevent="update('update-details')">
+                            <form id="update-password" class="form-portal max-w-half-form" @submit.prevent="update('update-password')">
                                 <div class="form-group fields grid">
                                     <label class="form-input text-navy">
                                         {{ __('Mot de passe actuel') }}<span>*</span>
-                                        <input class="py-3 mt-3" type="text" required="required" name="password" />
+                                        <div class="relative">
+                                            <input class="py-3 mt-3" :type="type" required="required" name="actually_password" />
+                                            <button class="btn-show-pwd bg-white w-12" @click.prevent="toggleType">
+                                                <span v-if="type === 'password' ">
+                                                    @svg('icon-eye')
+                                                </span>
+                                                <span v-else>
+                                                    @svg('icon-eye-hidden')
+                                                </span>
+                                            </button>
+                                        </div>
                                     </label>
                                     <label class="form-input text-navy">
                                         {{ __('Nouveau mot de passe') }}<span>*</span>
                                         <div class="relative">
-                                            <input class="py-3 mt-3" :type="type" required="required" name="new_password" />
+                                            <input class="py-3 mt-3" :type="type" required="required" name="password" />
                                             <button class="btn-show-pwd bg-white w-12" @click.prevent="toggleType">
                                                 <span v-if="type === 'password' ">
                                                     @svg('icon-eye')
@@ -104,7 +114,7 @@
                                     <label class="form-input text-navy">
                                         {{ __('Confirmer le nouveau mot de passe') }}<span>*</span>
                                         <div class="relative">
-                                            <input class="py-3 mt-3" :type="type" required="required" name="confirm_password" />
+                                            <input class="py-3 mt-3" :type="type" required="required" name="password_confirmation" />
                                             <button class="btn-show-pwd bg-white w-12" @click.prevent="toggleType">
                                                 <span v-if="type === 'password' ">
                                                     @svg('icon-eye')