rodauth 2.37.0 → 2.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c4f8a9edcebe8714dfa15132986c74e12e1823837ab71230008c42df9c2432d
-  data.tar.gz: f5cb984675323f2c2b83bd1d7be0626f511381b69e090c1d39bfb7b31d09321d
+  metadata.gz: f79db7dec7147665538bf0b4f8e0c6c554d88396b294f19e5a5ed26543c31d1c
+  data.tar.gz: ea377861679a55895bc325b1cf3932970b0de9c773615ba2daecb5805704ae02
 SHA512:
-  metadata.gz: 3cdaaafebe4a7dba8b985dd1fbf39087a95fb3a49150e67487024e9374c50da6eced618ef702bfb70fbc483f83f9c29dba873d07bac2b4c1ec442007f3556f61
-  data.tar.gz: 8774b5ae4c7e430f76705857bd0e80a59a0171c60b9693581ee7eae7c07a1c300b89c38c7d7f660cf01e48e6c2190597449eec4cadf57cd38c08cbe8a2783886
+  metadata.gz: 8e13b4dc188867866ee0eda53765091bb48f583d65957e488737b612bde4cf4ae9caa18edd2d88b3c609a7a3e25a51eec42fc5aa25e4083ea51c283310a36cb9
+  data.tar.gz: d50e275056bf3196a025e1933ab97ecd88d784c80ec97412cf046bb9718f558da4b321f7fbf52ba09d3554059157ef67f3f407625fd65c237fd2334e170066a7

data/lib/rodauth/features/base.rb

@@ -67,6 +67,7 @@ module Rodauth
     auth_value_method :unopen_account_error_status, 403
     translatable_method :unverified_account_message, "unverified account, please verify account before logging in"
     auth_value_method :default_field_attributes, ''
+    auth_value_method :use_template_fixed_locals?, true
 
     redirect(:require_login){"#{prefix}/login"}
 
@@ -409,6 +410,7 @@ module Rodauth
 
     def button_opts(value, opts)
       opts = Hash[template_opts].merge!(opts)
+      _merge_fixed_locals_opts(opts, button_fixed_locals)
       opts[:locals] = {:value=>value, :opts=>opts}
       opts[:cache] = cache_templates
       opts[:cache_key] = :rodauth_button
@@ -542,6 +544,12 @@ module Rodauth
       has_password? ? ['password'] : []
     end
 
+    def has_password?
+      return @has_password if defined?(@has_password)
+      return false unless account || session_value
+      @has_password = !!get_password_hash
+    end
+
     private
 
     def _around_rodauth
@@ -555,6 +563,20 @@ module Rodauth
       s
     end
 
+    if RUBY_VERSION >= '2.1'
+      def button_fixed_locals
+        '(value:, opts:)'
+      end
+    # :nocov:
+    else
+      # Work on Ruby 2.0 when using Tilt 2.6+, as Ruby 2.0 does
+      # not support required keyword arguments.
+      def button_fixed_locals
+        '(value: nil, opts: nil)'
+      end
+    end
+    # :nocov:
+
     def database_function_password_match?(name, hash_id, password, salt)
       db.get(Sequel.function(function_name(name), hash_id, password_hash_using_salt(password, salt)))
     end
@@ -718,12 +740,6 @@ module Rodauth
       end
     end
 
-    def has_password?
-      return @has_password if defined?(@has_password)
-      return false unless account || session_value
-      @has_password = !!get_password_hash
-    end
-
     def password_hash_using_salt(password, salt)
       BCrypt::Engine.hash_secret(password, salt)
     end
@@ -766,7 +782,7 @@ module Rodauth
     end
 
     def compute_raw_hmac(data)
-      raise ArgumentError, "hmac_secret not set" unless hmac_secret
+      raise ConfigurationError, "hmac_secret not set" unless hmac_secret
       compute_raw_hmac_with_secret(data, hmac_secret)
     end
 
@@ -885,7 +901,7 @@ module Rodauth
 
     def require_response(meth)
       send(meth)
-      raise RuntimeError, "#{meth.to_s.sub(/\A_/, '')} overridden without returning a response (should use redirect or request.halt). This is a bug in your Rodauth configuration, not a bug in Rodauth itself."
+      raise ConfigurationError, "#{meth.to_s.sub(/\A_/, '')} overridden without returning a response (should use redirect or request.halt)."
     end
 
     def set_session_value(key, value)
@@ -912,6 +928,7 @@ module Rodauth
 
     def _view_opts(page)
       opts = template_opts.dup
+      _merge_fixed_locals_opts(opts, '(rodauth: self.rodauth)')
       opts[:locals] = opts[:locals] ? opts[:locals].dup : {}
       opts[:locals][:rodauth] = self
       opts[:cache] = cache_templates
@@ -919,6 +936,14 @@ module Rodauth
       _template_opts(opts, page)
     end
 
+    def _merge_fixed_locals_opts(opts, fixed_locals)
+      if use_template_fixed_locals? && !opts[:locals]
+        fixed_locals_opts = {default_fixed_locals: fixed_locals}
+        fixed_locals_opts.merge!(opts[:template_opts]) if opts[:template_opts]
+        opts[:template_opts] = fixed_locals_opts
+      end
+    end
+
     # Set the template path only if there isn't an overridden template in the application.
     # Result should replace existing template opts.
     def _template_opts(opts, page)
@@ -930,6 +955,10 @@ module Rodauth
     end
 
     def _view(meth, page)
+      unless scope.respond_to?(meth)
+        raise ConfigurationError, "attempted to render a built-in view/email template (#{page.inspect}), but rendering is disabled"
+      end
+
       scope.send(meth, _view_opts(page))
     end
   end

data/lib/rodauth/features/email_auth.rb

@@ -163,6 +163,10 @@ module Rodauth
       methods
     end
 
+    def email_auth_email_recently_sent?
+      (email_last_sent = get_email_auth_email_last_sent) && (Time.now - email_last_sent < email_auth_skip_resend_email_within)
+    end
+
     private
 
     def _multi_phase_login_forms
@@ -171,10 +175,6 @@ module Rodauth
       forms
     end
 
-    def email_auth_email_recently_sent?
-      (email_last_sent = get_email_auth_email_last_sent) && (Time.now - email_last_sent < email_auth_skip_resend_email_within)
-    end
-
     def _email_auth_request
       if email_auth_email_recently_sent?
         set_redirect_error_flash email_auth_email_recently_sent_error_flash

data/lib/rodauth/features/jwt.rb

@@ -64,7 +64,7 @@ module Rodauth
     end
 
     def jwt_secret
-      raise ArgumentError, "jwt_secret not set"
+      raise ConfigurationError, "jwt_secret not set"
     end
 
     def jwt_session_hash
@@ -105,7 +105,7 @@ module Rodauth
       jwt_decode_opts
     end
 
-    if JWT::VERSION::MAJOR > 2 || (JWT::VERSION::MAJOR == 2 && JWT::VERSION::MINOR >= 4)
+    if JWT.gem_version >= Gem::Version.new("2.4")
       def _jwt_decode_secrets
         secrets = [jwt_secret, jwt_old_secret]
         secrets.compact!

data/lib/rodauth/features/lockout.rb

@@ -237,6 +237,10 @@ module Rodauth
       account_lockouts_ds.update(account_lockouts_email_last_sent_column=>Sequel::CURRENT_TIMESTAMP) if account_lockouts_email_last_sent_column
     end
 
+    def unlock_account_email_recently_sent?
+      (email_last_sent = get_unlock_account_email_last_sent) && (Time.now - email_last_sent < unlock_account_skip_resend_email_within)
+    end
+
     private
 
     attr_reader :unlock_account_key_value
@@ -278,10 +282,6 @@ module Rodauth
       return_response unlock_account_request_view
     end
 
-    def unlock_account_email_recently_sent?
-      (email_last_sent = get_unlock_account_email_last_sent) && (Time.now - email_last_sent < unlock_account_skip_resend_email_within)
-    end
-
     def use_date_arithmetic?
       super || db.database_type == :mysql
     end

data/lib/rodauth/features/reset_password.rb

@@ -204,16 +204,16 @@ module Rodauth
       end
     end
 
+    def reset_password_email_recently_sent?
+      (email_last_sent = get_reset_password_email_last_sent) && (Time.now - email_last_sent < reset_password_skip_resend_email_within)
+    end
+
     private
 
     def _login_form_footer_links
       super << [20, reset_password_request_path, reset_password_request_link_text]
     end
 
-    def reset_password_email_recently_sent?
-      (email_last_sent = get_reset_password_email_last_sent) && (Time.now - email_last_sent < reset_password_skip_resend_email_within)
-    end
-
     attr_reader :reset_password_key_value
 
     def after_login_failure

data/lib/rodauth/features/sms_codes.rb

@@ -514,7 +514,7 @@ module Rodauth
     end
 
     def sms_send(phone, message)
-      raise NotImplementedError, "sms_send needs to be defined in the Rodauth configuration for SMS sending to work"
+      raise ConfigurationError, "sms_send needs to be defined in the Rodauth configuration for SMS sending to work"
     end
 
     def update_sms(values)

data/lib/rodauth/features/verify_account.rb

@@ -240,6 +240,10 @@ module Rodauth
       send_verify_account_email
     end
 
+    def verify_account_email_recently_sent?
+      account && (email_last_sent = get_verify_account_email_last_sent) && (Time.now - email_last_sent < verify_account_skip_resend_email_within)
+    end
+
     private
 
     def _login_form_footer_links
@@ -250,10 +254,6 @@ module Rodauth
       links
     end
 
-    def verify_account_email_recently_sent?
-      (email_last_sent = get_verify_account_email_last_sent) && (Time.now - email_last_sent < verify_account_skip_resend_email_within)
-    end
-
     attr_reader :verify_account_key_value
 
     def before_login_attempt

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 = 37
+  MINOR = 38
 
   # The patch version of Rodauth, updated only for bug fixes from the last
   # feature release.

data/lib/rodauth.rb

@@ -3,6 +3,8 @@
 require 'securerandom'
 
 module Rodauth
+  class ConfigurationError < StandardError; end
+
   def self.lib(opts={}, &block) 
     require 'roda'
     c = Class.new(Roda)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rodauth
 version: !ruby/object:Gem::Version
-  version: 2.37.0
+  version: 2.38.0
 platform: ruby
 authors:
 - Jeremy Evans
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-19 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -382,7 +381,6 @@ metadata:
   documentation_uri: https://rodauth.jeremyevans.net/documentation.html
   mailing_list_uri: https://github.com/jeremyevans/rodauth/discussions
   source_code_uri: https://github.com/jeremyevans/rodauth
-post_install_message:
 rdoc_options:
 - "--quiet"
 - "--line-numbers"
@@ -404,8 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Authentication and Account Management Framework for Rack Applications
 test_files: []