MAGETWO-70943: Incorrect reset password flow

Author: roman

app/code/Magento/Customer/Model/AccountManagement.php

@@ -661,7 +661,7 @@ private function handleUnknownTemplate($template)
     /**
      * @inheritdoc
      */
-    public function resetPassword($email, $resetToken, $newPassword): bool
+    public function resetPassword($email, $resetToken, $newPassword)
     {
         if (!$email) {
             $customer = $this->matchCustomerByRpToken($resetToken);
@@ -1093,7 +1093,7 @@ public function isCustomerInStore($customerWebsiteId, $storeId)
      * @throws \Magento\Framework\Exception\NoSuchEntityException If customer doesn't exist
      * @throws LocalizedException
      */
-    private function validateResetPasswordToken(?int $customerId, ?string $resetPasswordLinkToken) : bool
+    private function validateResetPasswordToken($customerId, $resetPasswordLinkToken)
     {
         if ($customerId !== null && $customerId <= 0) {
             throw new InputException(

app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html

@@ -22,7 +22,6 @@
                 <tr>
                     <td align="center">
                         <a href="{{var this.getUrl($store,'customer/account/createPassword/',[_query:[token:$customer.rp_token],_nosid:1])}}" target="_blank">{{trans "Set a New Password"}}</a>
-
                     </td>
                 </tr>
             </table>