reset_password.rb in rodauth-1.20.0

- old
+ new

@@ -2,15 +2,18 @@
 
 module Rodauth
   Feature.define(:reset_password, :ResetPassword) do
     depends :login, :email_base, :login_password_requirements_base
 
+    def_deprecated_alias :no_matching_reset_password_key_error_flash, :no_matching_reset_password_key_message
+
     notice_flash "Your password has been reset"
     notice_flash "An email has been sent to you with a link to reset the password for your account", 'reset_password_email_sent'
     error_flash "There was an error resetting your password"
     error_flash "There was an error requesting a password reset", 'reset_password_request'
     error_flash "An email has recently been sent to you with a link to reset your password", 'reset_password_email_recently_sent'
+    error_flash "There was an error resetting your password: invalid or expired password reset key", 'no_matching_reset_password_key'
     loaded_templates %w'reset-password-request reset-password password-field password-confirm-field reset-password-email'
     view 'reset-password', 'Reset Password'
     view 'reset-password-request', 'Request Password Reset', 'reset_password_request'
     additional_form_tags
     additional_form_tags 'reset_password_request'
@@ -24,18 +27,18 @@
     redirect(:reset_password_email_sent){default_post_email_redirect}
     redirect(:reset_password_email_recently_sent){default_post_email_redirect}
     
     auth_value_method :reset_password_deadline_column, :deadline
     auth_value_method :reset_password_deadline_interval, {:days=>1}
-    auth_value_method :no_matching_reset_password_key_message, "invalid password reset key"
     auth_value_method :reset_password_email_subject, 'Reset Password'
     auth_value_method :reset_password_key_param, 'key'
     auth_value_method :reset_password_autologin?, false
     auth_value_method :reset_password_table, :account_password_reset_keys
     auth_value_method :reset_password_id_column, :id
     auth_value_method :reset_password_key_column, :key
     auth_value_method :reset_password_email_last_sent_column, nil
+    auth_value_method :reset_password_explanatory_text, "<p>If you have forgotten your password, you can request a password reset:</p>"
     auth_value_method :reset_password_skip_resend_email_within, 300
     session_key :reset_password_session_key, :reset_password_key
 
     auth_value_methods :reset_password_request_link
 
@@ -103,10 +106,10 @@
         if key = session[reset_password_session_key]
           if account_from_reset_password_key(key)
             reset_password_view
           else
             session[reset_password_session_key] = nil
-            set_redirect_error_flash no_matching_reset_password_key_message
+            set_redirect_error_flash no_matching_reset_password_key_error_flash
             redirect require_login_redirect
           end
         end
       end
 