rodauth 2.48.0 → 2.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9a5a66fe82750a982d493fd5e6558b4fef6f94f1761257b3242ff53014eb81b
-  data.tar.gz: ecd3f766f3b4d96acd2c7e651d71d1ad0cbb4e60e49db3d5e396a304866b733f
+  metadata.gz: 24077da1fc384a74f6e692220eeac283243ce13c0d219befdbd43c4a3498ab63
+  data.tar.gz: b05d593e3e12ebcf503c8de530613dea813cfa90984c058d1910bab7cb010674
 SHA512:
-  metadata.gz: 4471aa257cc7761633fca706db570b61cf4315f22d512c90a2419666f2c1bfd97647196a71fa8fd0d85f1cf16cede1beb69dce20ba6d98a29c52727aa6342c37
-  data.tar.gz: 0c3ac3e520ab620528ec8dd125cdee8092adea4ad6a2e1c877e30a10598219d0ad8abcb15eb40e1509561587323d8f05f653b68b3d7d112bd2cf44c9a6b8e6e5
+  metadata.gz: 8e6d8819e37fd3d417641dc1745360c9ff52df0ee90399ad844ad7d3c23990d1c74f9db31d698e17861881e8776f5fb3fb4aae07ab4d9e2762e257ffd334d51f
+  data.tar.gz: 902ece75d3590486435729195e741834c4613d379f47ca29b93ba68281810273b36ae94374c9c9b317ca49464e60c1be15d344b88c94bada8fd1f8ea5668dde1

data/lib/rodauth/features/base.rb

@@ -472,7 +472,7 @@ module Rodauth
     end
 
     def only_json?
-      scope.class.opts[:rodauth_json] == :only
+      scope.class.rodauth_json == :only
     end
 
     def post_configure
@@ -769,7 +769,7 @@ module Rodauth
     end
 
     def require_account_session
-      unless account_from_session
+      unless (@account_retrieval_type == :session ? account : account_from_session)
         clear_session
         login_required
       end
@@ -834,11 +834,11 @@ module Rodauth
     end
 
     def use_request_specific_csrf_tokens?
-      scope.opts[:rodauth_route_csrf] && scope.use_request_specific_csrf_tokens?
+      scope.class.rodauth_route_csrf? && scope.use_request_specific_csrf_tokens?
     end
 
     def check_csrf?
-      scope.opts[:rodauth_route_csrf]
+      scope.class.rodauth_route_csrf?
     end
 
     def function_name(name)

data/lib/rodauth/features/update_password_hash.rb

@@ -13,6 +13,8 @@ module Rodauth
           set_password(password)
         rescue Rodauth::SetPasswordFailure
           return false
+        else
+          @existing_password_hash_or_salt = nil
         end
       end
 

data/lib/rodauth/features/verify_account.rb

@@ -265,7 +265,7 @@ module Rodauth
 
     def _login_form_footer_links
       links = super
-      if !param_or_nil(login_param) || ((account || account_from_login(login_param_value)) && allow_resending_verify_account_email?)
+      if !param_or_nil(login_param) || ((account || (@account_retrieval_type != :login && account_from_login(login_param_value))) && allow_resending_verify_account_email?)
         links << [30, verify_account_resend_path, verify_account_resend_link_text]
       end
       links

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

data/lib/rodauth.rb

@@ -1,6 +1,7 @@
 # frozen-string-literal: true
 
 require 'securerandom'
+require 'roda'
 
 module Rodauth
   OPTS = {}.freeze
@@ -22,7 +23,7 @@ module Rodauth
   end
 
   def self.load_dependencies(app, opts=OPTS, &_)
-    json_opt = opts.fetch(:json, app.opts[:rodauth_json])
+    json_opt = opts.fetch(:json){app.opts[:rodauth_json]}
     if json_opt
       app.plugin :json
       app.plugin :json_parser
@@ -34,7 +35,7 @@ module Rodauth
         app.plugin :render
       end
 
-      case opts.fetch(:csrf, app.opts[:rodauth_csrf])
+      case opts.fetch(:csrf){app.opts[:rodauth_csrf]}
       when false
         # nothing
       when :rack_csrf
@@ -51,22 +52,23 @@ module Rodauth
   end
 
   def self.configure(app, opts=OPTS, &block)
-    json_opt = app.opts[:rodauth_json] = opts.fetch(:json, app.opts[:rodauth_json])
-    csrf = app.opts[:rodauth_csrf] = opts.fetch(:csrf, app.opts[:rodauth_csrf])
+    json_opt = app.opts[:rodauth_json] = opts.fetch(:json){app.rodauth_json}
+    csrf = app.opts[:rodauth_csrf] = opts.fetch(:csrf){app.opts[:rodauth_csrf]}
     app.opts[:rodauth_route_csrf] = case csrf
     when false, :rack_csrf
       false
     else
       json_opt != :only
     end
-    auth_class = (app.opts[:rodauths] ||= {})[opts[:name]] ||= opts[:auth_class] || Class.new(Auth)
+    name = opts[:name]
+    auth_class = (app.opts[:rodauths] ||= {})[name] ||= opts[:auth_class] || Class.new(Auth)
     if !auth_class.roda_class
       auth_class.roda_class = app
     elsif auth_class.roda_class != app
-      auth_class = app.opts[:rodauths][opts[:name]] = Class.new(auth_class)
+      auth_class = app.rodauths[name] = Class.new(auth_class)
       auth_class.roda_class = app
     end
-    auth_class.class_eval{@configuration_name = opts[:name] unless defined?(@configuration_name)}
+    auth_class.class_eval{@configuration_name = name unless defined?(@configuration_name)}
     auth_class.configure(&block) if block
     auth_class.send(:make_shape_friendly)
     auth_class.allocate.post_configure if auth_class.method_defined?(:post_configure)
@@ -519,8 +521,28 @@ module Rodauth
   end
 
   module ClassMethods
+    if Roda::RodaPlugins.respond_to?(:opt_attr_reader)
+      Roda::RodaPlugins.opt_attr_reader(self, :rodauths)
+      Roda::RodaPlugins.opt_attr_reader(self, :rodauth_json)
+      Roda::RodaPlugins.opt_attr_reader(self, :rodauth_route_csrf, name: :rodauth_route_csrf?)
+    # simplecov:disable
+    else
+      def rodauths
+        opts[:rodauths]
+      end
+
+      def rodauth_json
+        opts[:rodauth_json]
+      end
+
+      def rodauth_route_csrf?
+        opts[:rodauth_route_csrf]
+      end
+    # simplecov:enable
+    end
+
     def rodauth(name=nil)
-      opts[:rodauths][name]
+      rodauths[name]
     end
 
     def precompile_rodauth_templates
@@ -540,8 +562,8 @@ module Rodauth
     end
 
     def freeze
-      opts[:rodauths].each_value(&:freeze)
-      opts[:rodauths].freeze
+      rodauths.each_value(&:freeze)
+      rodauths.freeze
       super
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rodauth
 version: !ruby/object:Gem::Version
-  version: 2.48.0
+  version: 2.49.0
 platform: ruby
 authors:
 - Jeremy Evans