rodauth 2.39.0 → 2.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b8c2b404f5a8fad1607ba2bfd64ec4e03579a909ea324a0c9cda7705d9e79f7
-  data.tar.gz: bb2e8dcf2c4afa1d855379b69845c6d5efff8e097b5e95b38a11948c8d381d5d
+  metadata.gz: c1a80af909390a66924a6a3317b9234cd7b99032878b4ffd794fe621fba48b6d
+  data.tar.gz: cba66489bfb59d011d4d960b9b6f2d9c6c1f3f606661467ea888f6072d2f272b
 SHA512:
-  metadata.gz: 4316cb199e760aaa144e7c1b154f974f514abdea83b5a18d4f85dd01ff64a9d8c030fd028cee8c27c00d3402a951571b3ae1379ca7ef8653c991df47035ef5c7
-  data.tar.gz: 0f1fa083577edf23a8db579ab5df5c9ef0d6087c97a7d2cea2c1ef7071049e495d3f374f5657194db4d6feef2252bb708f85af3a1a66e7f116185406db488984
+  metadata.gz: f220a837ca8a81984accd87b52725633de82b7ea3452bf91bb3a43c529e4d03a785c6fccd4e5dc6c729a3f1fe33b8a8d535c25060c884dd38ef94c07d21f52ce
+  data.tar.gz: 91d278bf3d9e1f1eaa47ff77c98506581ece39b9ad61d6aa5588e98faf65261f804154980a8416d63cec77fe462fff2ce9e8e1186f1fcaf608f3703a94fed818

data/lib/rodauth/features/otp_unlock.rb

@@ -52,6 +52,7 @@ module Rodauth
       :otp_unlock_auth_success,
       :otp_unlock_available?,
       :otp_unlock_deadline_passed?,
+      :otp_unlock_not_available_set_refresh_header,
       :otp_unlock_refresh_tag,
     )
 
@@ -72,6 +73,7 @@ module Rodauth
         if otp_unlock_available?
           otp_unlock_view
         else
+          otp_unlock_not_available_set_refresh_header
           otp_unlock_not_available_view
         end
       end
@@ -201,6 +203,7 @@ module Rodauth
     end
 
     def otp_unlock_refresh_tag
+      # RODAUTH3: Remove
       "<meta http-equiv=\"refresh\" content=\"#{(otp_unlock_next_auth_attempt_after - Time.now).to_i + 1}\">"
     end
 
@@ -224,6 +227,10 @@ module Rodauth
       otp_unlock_data ? otp_unlock_data[otp_unlock_num_successes_column] : 0
     end
 
+    def otp_unlock_not_available_set_refresh_header
+      response.headers["refresh"] = ((otp_unlock_next_auth_attempt_after - Time.now).to_i + 1).to_s
+    end
+
     private
 
     def show_otp_auth_link?

data/lib/rodauth/features/reset_password.rb

@@ -50,6 +50,7 @@ module Rodauth
       :reset_password_email_link,
       :reset_password_key_insert_hash,
       :reset_password_key_value,
+      :reset_password_request_for_unverified_account,
       :set_reset_password_email_last_sent
     )
     auth_private_methods(
@@ -73,9 +74,7 @@ module Rodauth
             throw_error_reason(:no_matching_login, no_matching_login_error_status, login_param, no_matching_login_message)
           end
 
-          unless open_account?
-            throw_error_reason(:unverified_account, unopen_account_error_status, login_param, unverified_account_message)
-          end
+          reset_password_request_for_unverified_account unless open_account?
 
           if reset_password_email_recently_sent?
             set_redirect_error_flash reset_password_email_recently_sent_error_flash
@@ -174,6 +173,10 @@ module Rodauth
       end
     end
 
+    def reset_password_request_for_unverified_account
+      throw_error_reason(:unverified_account, unopen_account_error_status, login_param, unverified_account_message)
+    end
+
     def remove_reset_password_key
       password_reset_ds.delete
     end

data/lib/rodauth/version.rb

@@ -6,7 +6,7 @@ module Rodauth
   MAJOR = 2
 
   # The minor version of Rodauth, updated for new feature releases of Rodauth.
-  MINOR = 39
+  MINOR = 40
 
   # The patch version of Rodauth, updated only for bug fixes from the last
   # feature release.

data/templates/otp-unlock-not-available.str

@@ -2,4 +2,3 @@
 <p>#{rodauth.otp_unlock_required_consecutive_successes_label}: #{rodauth.otp_unlock_auths_required}</p>
 <p>#{rodauth.otp_unlock_next_auth_attempt_label}: #{rodauth.otp_unlock_next_auth_attempt_after.strftime(rodauth.strftime_format)}</p>
 <p>#{rodauth.otp_unlock_next_auth_attempt_refresh_label}</p>
-#{rodauth.otp_unlock_refresh_tag}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rodauth
 version: !ruby/object:Gem::Version
-  version: 2.39.0
+  version: 2.40.0
 platform: ruby
 authors:
 - Jeremy Evans
@@ -402,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Authentication and Account Management Framework for Rack Applications
 test_files: []