Merge branch 'thedevdojo:main' into main

hazbu · Jul 26, 2023 · 6d005a9 · 6d005a9
2 parents 7906375 + 7069ba5
commit 6d005a9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 32 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/wave/src/Http/Controllers/SettingsController.php b/wave/src/Http/Controllers/SettingsController.php
@@ -75,18 +75,14 @@ public function profilePut(Request $request){
     public function securityPut(Request $request){
 
         $validator = Validator::make($request->all(), [
-            'current_password' => 'required',
+            'current_password' => 'required|current_password',
             'password' => 'required|confirmed|min:'.config('wave.auth.min_password_length'),
         ]);
 
         if ($validator->fails()) {
             return back()->with(['message' => $validator->errors()->first(), 'message_type' => 'danger']);
         }
 
-        if (! Hash::check($request->current_password, $request->user()->password)) {
-            return back()->with(['message' => 'Incorrect current password entered.', 'message_type' => 'danger']);
-        }
-
         auth()->user()->forceFill([
             'password' => bcrypt($request->password)
         ])->save();

diff --git a/wave/src/Http/Livewire/Settings/Security.php b/wave/src/Http/Livewire/Settings/Security.php
@@ -13,7 +13,7 @@ class Security extends Component
     protected function rules()
     {
         return [
-            'current_password' => 'required',
+            'current_password' => 'required|current_password',
             'password' => 'required|confirmed|min:'.config('wave.auth.min_password_length')
         ];
     }