rodauth 2.14.0 → 2.18.0

data/lib/rodauth/features/otp.rb

@@ -96,6 +96,12 @@ module Rodauth
       :otp_tmp_key
     )
 
+    internal_request_method :otp_setup_params
+    internal_request_method :otp_setup
+    internal_request_method :otp_auth
+    internal_request_method :valid_otp_auth?
+    internal_request_method :otp_disable
+
     route(:otp_auth) do |r|
       require_login
       require_account_session
@@ -297,7 +303,7 @@ module Rodauth
     end
 
     def otp_qr_code
-      RQRCode::QRCode.new(otp_provisioning_uri).as_svg(:module_size=>8)
+      RQRCode::QRCode.new(otp_provisioning_uri).as_svg(:module_size=>8, :viewbox=>true)
     end
 
     def otp_user_key

data/lib/rodauth/features/path_class_methods.rb

@@ -0,0 +1,22 @@
+# frozen-string-literal: true
+
+module Rodauth
+  Feature.define(:path_class_methods, :PathClassMethods) do
+    def post_configure
+      super
+
+      klass = self.class
+      klass.features.each do |feature_name|
+        feature = FEATURES[feature_name]
+        feature.routes.each do |handle_meth|
+          route = handle_meth.to_s.sub(/\Ahandle_/, '')
+          path_meth = :"#{route}_path"
+          url_meth = :"#{route}_url"
+          instance = klass.allocate.freeze
+          klass.define_singleton_method(path_meth){|opts={}| instance.send(path_meth, opts)}
+          klass.define_singleton_method(url_meth){|opts={}| instance.send(url_meth, opts)}
+        end
+      end
+    end
+  end
+end

data/lib/rodauth/features/recovery_codes.rb

@@ -59,6 +59,10 @@ module Rodauth
       :recovery_code_match?,
     )
 
+    internal_request_method :recovery_codes
+    internal_request_method :recovery_auth
+    internal_request_method :valid_recovery_auth?
+
     route(:recovery_auth) do |r|
       require_login
       require_account_session

data/lib/rodauth/features/remember.rb

@@ -46,6 +46,10 @@ module Rodauth
       :remove_remember_key
     )
 
+    internal_request_method :remember_setup
+    internal_request_method :remember_disable
+    internal_request_method :account_id_for_remember_key
+
     route do |r|
       require_account
       before_remember_route
@@ -83,7 +87,7 @@ module Rodauth
     end
 
     def remembered_session_id
-      return unless cookie = request.cookies[remember_cookie_key]
+      return unless cookie = _get_remember_cookie
       id, key = cookie.split('_', 2)
       return unless id && key
 
@@ -110,7 +114,7 @@ module Rodauth
 
       unless id = remembered_session_id
         # Only set expired cookie if there is already a cookie set.
-        forget_login if request.cookies[remember_cookie_key]
+        forget_login if _get_remember_cookie
         return
       end
 
@@ -187,6 +191,10 @@ module Rodauth
 
     private
 
+    def _get_remember_cookie
+      request.cookies[remember_cookie_key]
+    end
+
     def after_logout
       forget_login
       super if defined?(super)

data/lib/rodauth/features/reset_password.rb

@@ -57,6 +57,9 @@ module Rodauth
       :account_from_reset_password_key
     )
 
+    internal_request_method(:reset_password_request)
+    internal_request_method
+
     route(:reset_password_request) do |r|
       check_already_logged_in
       before_reset_password_request_route

data/lib/rodauth/features/sms_codes.rb

@@ -112,6 +112,13 @@ module Rodauth
       :sms_valid_phone?
     )
 
+    internal_request_method :sms_setup
+    internal_request_method :sms_confirm
+    internal_request_method :sms_request
+    internal_request_method :sms_auth
+    internal_request_method :valid_sms_auth?
+    internal_request_method :sms_disable
+
     route(:sms_request) do |r|
       require_login
       require_account_session

data/lib/rodauth/features/two_factor_base.rb

@@ -57,6 +57,8 @@ module Rodauth
       :two_factor_update_session
     )
 
+    internal_request_method :two_factor_disable
+
     route(:two_factor_manage, 'multifactor-manage') do |r|
       require_account
       before_two_factor_manage_route

data/lib/rodauth/features/verify_account.rb

@@ -60,6 +60,9 @@ module Rodauth
       :account_from_verify_account_key
     )
 
+    internal_request_method(:verify_account_resend)
+    internal_request_method
+
     route(:verify_account_resend) do |r|
       verify_account_check_already_logged_in
       before_verify_account_resend_route
@@ -193,8 +196,7 @@ module Rodauth
 
     def new_account(login)
       if account_from_login(login) && allow_resending_verify_account_email?
-        set_redirect_error_status(unopen_account_error_status)
-        set_error_reason :already_an_unverified_account_with_this_login
+        set_response_error_reason_status(:already_an_unverified_account_with_this_login, unopen_account_error_status)
         set_error_flash attempt_to_create_unverified_account_error_flash
         response.write resend_verify_account_view
         request.halt
@@ -271,8 +273,7 @@ module Rodauth
 
     def before_login_attempt
       unless open_account?
-        set_redirect_error_status(unopen_account_error_status)
-        set_error_reason :unverified_account
+        set_response_error_reason_status(:unverified_account, unopen_account_error_status)
         set_error_flash attempt_to_login_to_unverified_account_error_flash
         response.write resend_verify_account_view
         request.halt

data/lib/rodauth/features/verify_login_change.rb

@@ -50,6 +50,8 @@ module Rodauth
       :account_from_verify_login_change_key
     )
 
+    internal_request_method
+
     route do |r|
       before_verify_login_change_route
 

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

data/lib/rodauth.rb

@@ -3,6 +3,17 @@
 require 'securerandom'
 
 module Rodauth
+  def self.lib(opts={}, &block) 
+    require 'roda'
+    c = Class.new(Roda)
+    c.plugin(:rodauth, opts) do
+      enable :internal_request
+      instance_exec(&block)
+    end
+    c.freeze
+    c.rodauth
+  end
+
   def self.load_dependencies(app, opts={})
     json_opt = opts.fetch(:json, app.opts[:rodauth_json])
     if json_opt
@@ -46,6 +57,7 @@ module Rodauth
       auth_class = app.opts[:rodauths][opts[: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.configure(&block) if block
   end
 
@@ -107,6 +119,7 @@ module Rodauth
     attr_accessor :dependencies
     attr_accessor :routes
     attr_accessor :configuration
+    attr_reader :internal_request_methods
 
     def route(name=feature_name, default=name.to_s.tr('_', '-'), &block)
       route_meth = :"#{name}_route"
@@ -152,6 +165,10 @@ module Rodauth
       FEATURES[name] = feature
     end
 
+    def internal_request_method(name=feature_name)
+      (@internal_request_methods ||= []) << name
+    end
+
     def configuration_module_eval(&block)
       configuration.module_eval(&block)
     end
@@ -260,6 +277,8 @@ module Rodauth
       attr_reader :features
       attr_reader :routes
       attr_accessor :route_hash
+      attr_reader :configuration_name
+      attr_reader :configuration
     end
 
     def self.inherited(subclass)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.18.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -268,6 +268,7 @@ extra_rdoc_files:
 - doc/email_base.rdoc
 - doc/error_reasons.rdoc
 - doc/http_basic_auth.rdoc
+- doc/internal_request.rdoc
 - doc/json.rdoc
 - doc/jwt.rdoc
 - doc/jwt_cors.rdoc
@@ -281,6 +282,7 @@ extra_rdoc_files:
 - doc/password_expiration.rdoc
 - doc/password_grace_period.rdoc
 - doc/password_pepper.rdoc
+- doc/path_class_methods.rdoc
 - doc/recovery_codes.rdoc
 - doc/remember.rdoc
 - doc/reset_password.rdoc
@@ -326,6 +328,10 @@ extra_rdoc_files:
 - doc/release_notes/2.12.0.txt
 - doc/release_notes/2.13.0.txt
 - doc/release_notes/2.14.0.txt
+- doc/release_notes/2.15.0.txt
+- doc/release_notes/2.16.0.txt
+- doc/release_notes/2.17.0.txt
+- doc/release_notes/2.18.0.txt
 - doc/release_notes/2.2.0.txt
 - doc/release_notes/2.3.0.txt
 - doc/release_notes/2.4.0.txt
@@ -378,6 +384,7 @@ files:
 - doc/guides/status_column.rdoc
 - doc/guides/totp_or_recovery.rdoc
 - doc/http_basic_auth.rdoc
+- doc/internal_request.rdoc
 - doc/json.rdoc
 - doc/jwt.rdoc
 - doc/jwt_cors.rdoc
@@ -391,6 +398,7 @@ files:
 - doc/password_expiration.rdoc
 - doc/password_grace_period.rdoc
 - doc/password_pepper.rdoc
+- doc/path_class_methods.rdoc
 - doc/recovery_codes.rdoc
 - doc/release_notes/1.0.0.txt
 - doc/release_notes/1.1.0.txt
@@ -423,6 +431,10 @@ files:
 - doc/release_notes/2.12.0.txt
 - doc/release_notes/2.13.0.txt
 - doc/release_notes/2.14.0.txt
+- doc/release_notes/2.15.0.txt
+- doc/release_notes/2.16.0.txt
+- doc/release_notes/2.17.0.txt
+- doc/release_notes/2.18.0.txt
 - doc/release_notes/2.2.0.txt
 - doc/release_notes/2.3.0.txt
 - doc/release_notes/2.4.0.txt
@@ -464,6 +476,7 @@ files:
 - lib/rodauth/features/email_auth.rb
 - lib/rodauth/features/email_base.rb
 - lib/rodauth/features/http_basic_auth.rb
+- lib/rodauth/features/internal_request.rb
 - lib/rodauth/features/json.rb
 - lib/rodauth/features/jwt.rb
 - lib/rodauth/features/jwt_cors.rb
@@ -477,6 +490,7 @@ files:
 - lib/rodauth/features/password_expiration.rb
 - lib/rodauth/features/password_grace_period.rb
 - lib/rodauth/features/password_pepper.rb
+- lib/rodauth/features/path_class_methods.rb
 - lib/rodauth/features/recovery_codes.rb
 - lib/rodauth/features/remember.rb
 - lib/rodauth/features/reset_password.rb
@@ -576,7 +590,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Authentication and Account Management Framework for Rack Applications