chore: unrequire current password (oauth logins)

SychO9 · Nov 8, 2023 · 6270ae1 · 6270ae1
1 parent 454bb43
commit 6270ae1
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 21 deletions.
diff --git a/src/Forum/Controller/ResetPasswordController.php b/src/Forum/Controller/ResetPasswordController.php
@@ -50,10 +50,6 @@ public function render(Request $request)
             throw new InvalidConfirmationTokenException;
         }
 
-        $errors = $request->getAttribute('session')->get('errors');
-
-//        dd($errors);
-
         return $this->view->make('sycho-force-password-reset::reset-password')
             ->with('passwordToken', $token->token)
             ->with('csrfToken', $request->getAttribute('session')->token());

diff --git a/src/Forum/Controller/SavePasswordController.php b/src/Forum/Controller/SavePasswordController.php
@@ -81,19 +81,6 @@ public function handle(Request $request): ResponseInterface
         $token = PasswordToken::findOrFail(Arr::get($input, 'passwordToken'));
 
         $password = Arr::get($input, 'password');
-        $currentPassword = Arr::get($input, 'current_password');
-
-        if (! $currentPassword || ! $token->user->checkPassword($currentPassword)) {
-            return $this->displayWithErrors($request, $token, [
-                'current_password' => $this->translator->trans('validation.password')
-            ]);
-        }
-
-        if ($currentPassword === $password) {
-            return $this->displayWithErrors($request, $token, [
-                'password' => $this->translator->trans('sycho-force-password-reset.forum.new_password_must_be_different')
-            ]);
-        }
 
         try {
             // todo: probably shouldn't use the user validator for this,

diff --git a/views/reset-password.blade.php b/views/reset-password.blade.php
@@ -20,10 +20,6 @@
     <input type="hidden" name="csrfToken" value="{{ $csrfToken }}">
     <input type="hidden" name="passwordToken" value="{{ $passwordToken }}">
 
-    <p class="form-group">
-      <input type="password" class="form-control" name="current_password" autocomplete="password" placeholder="{{ $translator->trans('sycho-force-password-reset.forum.current_password_label') }}">
-    </p>
-
     <p class="form-group">
       <input type="password" class="form-control" name="password" autocomplete="new-password" placeholder="{{ $translator->trans('core.views.reset_password.new_password_label') }}">
     </p>