rodauth 2.12.0 → 2.16.0

data/doc/path_class_methods.rdoc

@@ -0,0 +1,10 @@
+= Documentation for Path Class Methods Feature
+
+The path class methods feature allows for calling the *_path and *_url
+methods directly on the class, as opposed to an instance of the class.
+
+In order for the *_url methods to be used, you must use the base_url
+configuration so that determining the base URL doesn't depend on the
+submitted request, as the request will not be set when using the
+class method. Failure to do this will probably result in a NoMethodError
+being raised.

data/doc/release_notes/2.13.0.txt

@@ -0,0 +1,19 @@
+= New Features
+
+* A set_error_reason configuration method has been added.  This method
+  is called whenever a error occurs in Rodauth, with a symbol
+  describing the error.  The default implementation of this method does
+  nothing, it has been added to make it easier for Rodauth users to
+  implement custom handling for specific error types.  See the Rodauth
+  documentation for this method to see the list of symbols this method
+  can be called with.
+
+= Other Improvements
+
+* When using active_sessions and jwt_refresh together, and allowing for
+  expired JWTs when refreshing, you can now call
+  rodauth.check_active_session before r.rodauth.  Previously, this
+  did not work, and you had to call rodauth.check_active_session
+  after r.rodauth.
+
+* The default templates now also support Bootstrap 5.

data/doc/release_notes/2.14.0.txt

@@ -0,0 +1,17 @@
+= New Features
+
+* A remembered_session_id method has been added for getting the
+  account id from a valid remember token, without modifying the
+  session to log the account in.
+
+= Other Improvements
+
+* The jwt_refresh feature's support for allowing refresh with
+  an expired access token now works even if the Rodauth
+  configuration uses an incorrect prefix.
+
+* The internal account_in_unverified_grace_period? method now
+  returns false if an account has not been loaded and the
+  session has not been logged in. Previously, calling this
+  method in such cases would result in an exception being
+  raised.

data/doc/release_notes/2.15.0.txt

@@ -0,0 +1,48 @@
+= New Features
+
+* An internal_request feature has been added.  This feature allows
+  for interacting with Rodauth by calling methods, instead of having
+  to use a website or JSON API.  This feature is designed primarily
+  for administrative use, so that administrators can create accounts,
+  change passwords or logins for accounts, and handle similar actions
+  without the user of the account being involved.
+
+  For example, assuming you've loaded the change_password and
+  internal_request features, and that your Roda class that
+  is loading Rodauth is named App, you can change the password
+  for the account with id 1 using:
+
+    App.rodauth.change_password(account_id: 1, password: 'foobar')
+
+  The internal request methods are implemented as class methods
+  on the Rodauth::Auth subclass (the object returned by App.rodauth).
+  These methods call methods on a subclass of that class specific
+  to internal requests.
+
+  The reason the feature is named internal_request is that these
+  methods are implemented by submitting a request internally, that is
+  processed almost exactly the same way as Rodauth would process a
+  web request.
+
+  See the internal_request feature documentation for details on which
+  internal request methods are available and the options they take.
+
+* A path_class_methods feature has been added, that allows for calling
+  *_path and *_url as class methods.  If you would like to call the
+  *_url methods as class methods, make sure to use the base_url
+  configuration method to set the base URL so that it does not require
+  request-specific information.
+
+* Rodauth::Auth classes now have a configuration_name method that
+  returns the configuration name associated with the class. They also
+  have a configuration method that returns the configuration
+  associated with the class.
+
+* Rodauth::Feature now supports an internal_request_method method for
+  specifying which methods are supported as internal request methods.
+
+= Other Improvements
+
+* The default base_url configuration method will now use the domain
+  method to get the domain to use, instead of getting the domain
+  information directly from the request environment.

data/doc/release_notes/2.16.0.txt

@@ -0,0 +1,20 @@
+= New Features
+
+* Rodauth.lib has been added for using Rodauth purely as a library,
+  useful in non-web applications:
+
+    require 'rodauth'
+    rodauth = Rodauth.lib do
+      enable :create_account, :change_password
+    end
+    rodauth.create_account(login: 'foo@example.com', password: '...')
+    rodauth.change_password(account_id: 24601, password: '...')
+
+  This is built on top of the internal_request feature, and works by
+  creating a Roda application with the rodauth plugin, and returning
+  the related Rodauth::Auth class.
+
+= Other Improvements
+
+* The internal_request feature now works correctly for configurations
+  where only_json? is set to true.

data/doc/remember.rdoc

@@ -69,6 +69,7 @@ generate_remember_key_value :: A random string to use as the remember key.
 get_remember_key :: Retrieve the remember key from the database.
 load_memory :: If the remember key cookie is included in the request, and the user is not currently logged in, check the remember keys table and autologin the user if the remember key cookie matches the current remember key for the account. This method needs to be called manually inside the Roda route block to autologin users.
 logged_in_via_remember_key? :: Whether the current session was logged in via a remember key.
+remembered_session_id :: The session_id which is validly remembered, if any.
 remember_key_value :: The current value of the remember key/token.
 remember_login :: Set the cookie containing the remember token, so that future sessions will be autologged in.
 remember_view :: The HTML to use for the change remember settings form.

data/lib/rodauth/features/active_sessions.rb

@@ -57,6 +57,7 @@ module Rodauth
     def no_longer_active_session
       clear_session
       set_redirect_error_status inactive_session_error_status
+      set_error_reason :inactive_session
       set_redirect_error_flash active_sessions_error_flash
       redirect active_sessions_redirect
     end
@@ -176,4 +177,3 @@ module Rodauth
     end
   end
 end
-

data/lib/rodauth/features/base.rb

@@ -100,6 +100,7 @@ module Rodauth
       :set_notice_flash,
       :set_notice_now_flash,
       :set_redirect_error_flash,
+      :set_error_reason,
       :set_title,
       :translate,
       :update_session
@@ -114,6 +115,10 @@ module Rodauth
       :around_rodauth
     )
 
+    internal_request_method :account_exists?
+    internal_request_method :account_id_for_login
+    internal_request_method :internal_request_eval
+
     configuration_module_eval do
       def auth_class_eval(&block)
         auth.class_eval(&block)
@@ -294,6 +299,7 @@ module Rodauth
 
     def login_required
       set_redirect_error_status(login_required_error_status)
+      set_error_reason :login_required
       set_redirect_error_flash require_login_error_flash
       redirect require_login_redirect
     end
@@ -443,7 +449,9 @@ module Rodauth
     end
 
     def base_url
-      request.base_url
+      url = String.new("#{request.scheme}://#{domain}")
+      url << ":#{request.port}" if request.port != Rack::Request::DEFAULT_PORTS[request.scheme]
+      url
     end
 
     def domain
@@ -539,6 +547,11 @@ module Rodauth
     def set_response_error_status(status)
       response.status = status
     end
+    
+    def set_response_error_reason_status(reason, status)
+      set_error_reason(reason)
+      set_response_error_status(status)
+    end
 
     def throw_error(field, error)
       set_field_error(field, error)
@@ -550,6 +563,14 @@ module Rodauth
       throw_error(field, error)
     end
 
+    def set_error_reason(reason)
+    end
+
+    def throw_error_reason(reason, status, field, message)
+      set_error_reason(reason)
+      throw_error_status(status, field, message)
+    end
+
     def use_date_arithmetic?
       set_deadline_values?
     end
@@ -719,6 +740,10 @@ module Rodauth
       end
     end
 
+    def internal_request?
+      false
+    end
+
     def set_session_value(key, value)
       session[key] = value
     end

data/lib/rodauth/features/change_login.rb

@@ -19,6 +19,8 @@ module Rodauth
 
     auth_methods :change_login
 
+    internal_request_method
+
     route do |r|
       require_account
       before_change_login_route
@@ -30,7 +32,7 @@ module Rodauth
       r.post do
         catch_error do
           if change_login_requires_password? && !password_match?(param(password_param))
-            throw_error_status(invalid_password_error_status, password_param, invalid_password_message)
+            throw_error_reason(:invalid_password, invalid_password_error_status, password_param, invalid_password_message)
           end
 
           login = param(login_param)
@@ -39,7 +41,7 @@ module Rodauth
           end
 
           if require_login_confirmation? && login != param(login_confirm_param)
-            throw_error_status(unmatched_field_error_status, login_param, logins_do_not_match_message)
+            throw_error_reason(:logins_do_not_match, unmatched_field_error_status, login_param, logins_do_not_match_message)
           end
 
           transaction do
@@ -65,7 +67,7 @@ module Rodauth
 
     def change_login(login)
       if account_ds.get(login_column).downcase == login.downcase
-        @login_requirement_message = same_as_current_login_message
+        set_login_requirement_error_message(:same_as_current_login, same_as_current_login_message)
         return false
       end
 
@@ -82,7 +84,7 @@ module Rodauth
       updated = nil
       raised = raises_uniqueness_violation?{updated = update_account({login_column=>login}, account_ds.exclude(login_column=>login)) == 1}
       if raised
-        @login_requirement_message = already_an_account_with_this_login_message
+        set_login_requirement_error_message(:already_an_account_with_this_login, already_an_account_with_this_login_message)
       end
       updated && !raised
     end

data/lib/rodauth/features/change_password.rb

@@ -22,6 +22,8 @@ module Rodauth
       :invalid_previous_password_message
     )
 
+    internal_request_method
+
     route do |r|
       require_account
       before_change_password_route
@@ -33,16 +35,16 @@ module Rodauth
       r.post do
         catch_error do
           if change_password_requires_password? && !password_match?(param(password_param))
-            throw_error_status(invalid_password_error_status, password_param, invalid_previous_password_message)
+            throw_error_reason(:invalid_previous_password, invalid_password_error_status, password_param, invalid_previous_password_message)
           end
 
           password = param(new_password_param)
           if require_password_confirmation? && password != param(password_confirm_param)
-            throw_error_status(unmatched_field_error_status, new_password_param, passwords_do_not_match_message)
+            throw_error_reason(:passwords_do_not_match, unmatched_field_error_status, new_password_param, passwords_do_not_match_message)
           end
 
           if password_match?(password) 
-            throw_error_status(invalid_field_error_status, new_password_param, same_as_existing_password_message)
+            throw_error_reason(:same_as_existing_password, invalid_field_error_status, new_password_param, same_as_existing_password_message)
           end
 
           unless password_meets_requirements?(password)

data/lib/rodauth/features/close_account.rb

@@ -24,6 +24,8 @@ module Rodauth
       :delete_account
     )
 
+    internal_request_method
+
     route do |r|
       require_account
       before_close_account_route
@@ -35,7 +37,7 @@ module Rodauth
       r.post do
         catch_error do
           if close_account_requires_password? && !password_match?(param(password_param))
-            throw_error_status(invalid_password_error_status, password_param, invalid_password_message)
+            throw_error_reason(:invalid_password, invalid_password_error_status, password_param, invalid_password_message)
           end
 
           transaction do

data/lib/rodauth/features/confirm_password.rb

@@ -40,7 +40,7 @@ module Rodauth
           set_notice_flash confirm_password_notice_flash
           redirect confirm_password_redirect
         else
-          set_response_error_status(invalid_password_error_status)
+          set_response_error_reason_status(:invalid_password, invalid_password_error_status)
           set_field_error(password_param, invalid_password_message)
           set_error_flash confirm_password_error_flash
           confirm_password_view
@@ -53,6 +53,7 @@ module Rodauth
 
       if require_password_authentication? && has_password?
         set_redirect_error_status(password_authentication_required_error_status)
+        set_error_reason :password_authentication_required
         set_redirect_error_flash password_authentication_required_error_flash
         set_session_value(confirm_password_redirect_session_key, request.fullpath)
         redirect password_authentication_required_redirect
@@ -89,4 +90,3 @@ module Rodauth
     end
   end
 end
-

data/lib/rodauth/features/create_account.rb

@@ -27,6 +27,8 @@ module Rodauth
       :new_account
     )
 
+    internal_request_method
+
     route do |r|
       check_already_logged_in
       before_create_account_route
@@ -43,7 +45,7 @@ module Rodauth
 
         catch_error do
           if require_login_confirmation? && login != param(login_confirm_param)
-            throw_error_status(unmatched_field_error_status, login_param, logins_do_not_match_message)
+            throw_error_reason(:logins_do_not_match, unmatched_field_error_status, login_param, logins_do_not_match_message)
           end
 
           unless login_meets_requirements?(login)
@@ -52,11 +54,11 @@ module Rodauth
 
           if create_account_set_password?
             if require_password_confirmation? && password != param(password_confirm_param)
-              throw_error_status(unmatched_field_error_status, password_param, passwords_do_not_match_message)
+              throw_error_reason(:passwords_do_not_match, unmatched_field_error_status, password_param, passwords_do_not_match_message)
             end
 
             unless password_meets_requirements?(password)
-              throw_error_status(invalid_field_error_status, password_param, password_does_not_meet_requirements_message)
+              throw_error_reason(:password_does_not_meet_requirements, invalid_field_error_status, password_param, password_does_not_meet_requirements_message)
             end
 
             if account_password_hash_column
@@ -100,7 +102,7 @@ module Rodauth
       raised = raises_uniqueness_violation?{id = db[accounts_table].insert(account)}
 
       if raised
-        @login_requirement_message = already_an_account_with_this_login_message
+        set_login_requirement_error_message(:already_an_account_with_this_login, already_an_account_with_this_login_message)
       end
 
       if id

data/lib/rodauth/features/disallow_common_passwords.rb

@@ -32,7 +32,7 @@ module Rodauth
 
     def password_not_one_of_the_most_common?(password)
       return true unless password_one_of_most_common?(password)
-      @password_requirement_message = password_is_one_of_the_most_common_message
+      set_password_requirement_error_message(:password_is_one_of_the_most_common, password_is_one_of_the_most_common_message)
       false
     end
   end

data/lib/rodauth/features/disallow_password_reuse.rb

@@ -65,7 +65,7 @@ module Rodauth
       end
 
       return true unless match
-      @password_requirement_message = password_same_as_previous_password_message
+      set_password_requirement_error_message(:password_same_as_previous_password, password_same_as_previous_password_message)
       false
     end
 

data/lib/rodauth/features/email_auth.rb

@@ -49,6 +49,10 @@ module Rodauth
 
     auth_private_methods :account_from_email_auth_key
 
+    internal_request_method
+    internal_request_method :email_auth_request
+    internal_request_method :valid_email_auth?
+
     route(:email_auth_request) do |r|
       check_already_logged_in
       before_email_auth_request_route
@@ -58,6 +62,7 @@ module Rodauth
           _email_auth_request
         else
           set_redirect_error_status(no_matching_login_error_status)
+          set_error_reason :no_matching_login
           set_redirect_error_flash email_auth_request_error_flash
         end
 
@@ -90,6 +95,7 @@ module Rodauth
         key = session[email_auth_session_key] || param(email_auth_key_param)
         unless account_from_email_auth_key(key)
           set_redirect_error_status(invalid_key_error_status)
+          set_error_reason :invalid_email_auth_key
           set_redirect_error_flash email_auth_error_flash
           redirect email_auth_email_sent_redirect
         end

data/lib/rodauth/features/internal_request.rb

@@ -0,0 +1,371 @@
+# frozen-string-literal: true
+
+require 'stringio'
+
+module Rodauth
+  INVALID_DOMAIN = "invalidurl @@.com"
+
+  class InternalRequestError < StandardError
+    attr_accessor :flash
+    attr_accessor :reason
+    attr_accessor :field_errors
+
+    def initialize(attrs)
+      return super if attrs.is_a?(String)
+
+      @flash = attrs[:flash]
+      @reason = attrs[:reason]
+      @field_errors = attrs[:field_errors] || {}
+
+      super(build_message)
+    end
+
+    private
+
+    def build_message
+      extras = []
+      extras << reason if reason
+      extras << field_errors unless field_errors.empty?
+      extras = (" (#{extras.join(", ")})" unless extras.empty?)
+
+      "#{flash}#{extras}"
+    end
+  end
+
+  module InternalRequestMethods
+    attr_accessor :session
+    attr_accessor :params
+    attr_reader :flash
+    attr_accessor :internal_request_block
+
+    def domain
+      d = super
+      if d == INVALID_DOMAIN
+        raise InternalRequestError, "must set domain in configuration, as it cannot be determined from internal request"
+      end
+      d
+    end
+
+    def raw_param(k)
+      @params[k]
+    end
+
+    def set_error_flash(message)
+      @flash = message
+      _handle_internal_request_error
+    end
+    alias set_redirect_error_flash set_error_flash
+
+    def set_notice_flash(message)
+      @flash = message
+    end
+    alias set_notice_now_flash set_notice_flash
+
+    def modifications_require_password?
+      false
+    end
+    alias require_login_confirmation? modifications_require_password?
+    alias require_password_confirmation? modifications_require_password?
+    alias change_login_requires_password? modifications_require_password?
+    alias change_password_requires_password? modifications_require_password?
+    alias close_account_requires_password? modifications_require_password?
+    alias two_factor_modifications_require_password? modifications_require_password?
+
+    def otp_setup_view
+      hash = {:otp_setup=>otp_user_key}
+      hash[:otp_setup_raw] = otp_key if hmac_secret
+      _return_from_internal_request(hash)
+    end
+
+    def add_recovery_codes_view
+      _return_from_internal_request(recovery_codes)
+    end
+
+    def handle_internal_request(meth)
+      catch(:halt) do
+        _around_rodauth do
+          before_rodauth
+          send(meth, request)
+        end
+      end
+
+      @internal_request_return_value
+    end
+
+    def only_json?
+      false
+    end
+
+    private
+
+    def internal_request?
+      true
+    end
+
+    def set_error_reason(reason)
+      @error_reason = reason
+    end
+
+    def after_login
+      super
+      _set_internal_request_return_value(account_id) unless @return_false_on_error
+    end
+
+    def after_remember
+      super
+      if params[remember_param] == remember_remember_param_value
+        _set_internal_request_return_value("#{account_id}_#{convert_token_key(remember_key_value)}")
+      end
+    end
+
+    def after_load_memory
+      super
+      _return_from_internal_request(session_value)
+    end
+
+    def before_change_password_route
+      super
+      params[new_password_param] ||= params[password_param]
+    end
+
+    def before_email_auth_request_route
+      super
+      _set_login_param_from_account
+    end
+
+    def before_login_route
+      super
+      _set_login_param_from_account
+    end
+
+    def before_unlock_account_request_route
+      super
+      _set_login_param_from_account
+    end
+
+    def before_reset_password_request_route
+      super
+      _set_login_param_from_account
+    end
+
+    def before_verify_account_resend_route
+      super
+      _set_login_param_from_account
+    end
+
+    def account_from_key(token, status_id=nil)
+      return super unless session_value
+      return unless yield session_value
+      ds = account_ds(session_value)
+      ds = ds.where(account_status_column=>status_id) if status_id && !skip_status_checks?
+      ds.first
+    end
+
+    def _set_internal_request_return_value(value)
+      @internal_request_return_value = value
+    end
+
+    def _return_from_internal_request(value)
+      _set_internal_request_return_value(value)
+      throw(:halt)
+    end
+
+    def _handle_internal_request_error
+      if @return_false_on_error
+        _return_from_internal_request(false)
+      else
+        raise InternalRequestError.new(flash: @flash, reason: @error_reason, field_errors: @field_errors)
+      end
+    end
+
+    def _return_false_on_error!
+      @return_false_on_error = true
+    end
+
+    def _set_login_param_from_account
+      if session_value && !params[login_param] && (account = account_ds(session_value).first)
+        params[login_param] = account[login_column]
+      end
+    end
+
+    def _get_remember_cookie
+      params[remember_param]
+    end
+
+    def _handle_internal_request_eval(_)
+      v = instance_eval(&internal_request_block)
+      _set_internal_request_return_value(v) unless defined?(@internal_request_return_value)
+    end
+
+    def _handle_account_id_for_login(_)
+      raise InternalRequestError, "no login provided" unless login = param_or_nil(login_param)
+      raise InternalRequestError, "no account for login" unless account = account_from_login(login)
+      _return_from_internal_request(account[account_id_column])
+    end
+
+    def _handle_account_exists?(_)
+      raise InternalRequestError, "no login provided" unless login = param_or_nil(login_param)
+      _return_from_internal_request(!!account_from_login(login))
+    end
+
+    def _handle_lock_account(_)
+      raised_uniqueness_violation{account_lockouts_ds(session_value).insert(_setup_account_lockouts_hash(session_value, generate_unlock_account_key))}
+    end
+
+    def _handle_remember_setup(request)
+      params[remember_param] = remember_remember_param_value
+      _handle_remember(request)
+    end
+
+    def _handle_remember_disable(request)
+      params[remember_param] = remember_disable_param_value
+      _handle_remember(request)
+    end
+
+    def _handle_account_id_for_remember_key(request)
+      load_memory
+      raise InternalRequestError, "invalid remember key"
+    end
+
+    def _handle_otp_setup_params(request)
+      request.env['REQUEST_METHOD'] = 'GET'
+      _handle_otp_setup(request)
+    end
+
+    def _predicate_internal_request(meth, request)
+      _return_false_on_error!
+      _set_internal_request_return_value(true)
+      send(meth, request)
+    end
+
+    def _handle_valid_login_and_password?(request)
+      _predicate_internal_request(:_handle_login, request)
+    end
+
+    def _handle_valid_email_auth?(request)
+      _predicate_internal_request(:_handle_email_auth, request)
+    end
+
+    def _handle_valid_otp_auth?(request)
+      _predicate_internal_request(:_handle_otp_auth, request)
+    end
+
+    def _handle_valid_recovery_auth?(request)
+      _predicate_internal_request(:_handle_recovery_auth, request)
+    end
+
+    def _handle_valid_sms_auth?(request)
+      _predicate_internal_request(:_handle_sms_auth, request)
+    end
+  end
+
+  module InternalRequestClassMethods
+    def internal_request(route, opts={}, &block)
+      opts = opts.dup
+      
+      env = {
+         'REQUEST_METHOD'=>'POST',
+         'PATH_INFO'=>'/',
+         "SCRIPT_NAME" => "",
+         "HTTP_HOST" => INVALID_DOMAIN,
+         "SERVER_NAME" => INVALID_DOMAIN,
+         "SERVER_PORT" => 443,
+         "CONTENT_TYPE" => "application/x-www-form-urlencoded",
+         "rack.input"=>StringIO.new(''),
+         "rack.url_scheme"=>"https"
+      }
+      env.merge!(opts.delete(:env)) if opts[:env]
+
+      session = {}
+      session.merge!(opts.delete(:session)) if opts[:session]
+
+      params = {}
+      params.merge!(opts.delete(:params)) if opts[:params]
+
+      scope = roda_class.new(env)
+      rodauth = new(scope)
+      rodauth.session = session
+      rodauth.params = params
+      rodauth.internal_request_block = block
+
+      unless account_id = opts.delete(:account_id)
+        if (account_login = opts.delete(:account_login))
+          if (account = rodauth.send(:_account_from_login, account_login))
+            account_id = account[rodauth.account_id_column]
+          else
+            raise InternalRequestError, "no account for login: #{account_login.inspect}"
+          end
+        end
+      end
+
+      if account_id
+        session[rodauth.session_key] = account_id
+        unless authenticated_by = opts.delete(:authenticated_by)
+          authenticated_by = case route
+          when :otp_auth, :sms_request, :sms_auth, :recovery_auth, :valid_otp_auth?, :valid_sms_auth?, :valid_recovery_auth?
+            ['internal1']
+          else
+            ['internal1', 'internal2']
+          end
+        end
+        session[rodauth.authenticated_by_session_key] = authenticated_by
+      end
+
+      opts.keys.each do |k|
+        meth = :"#{k}_param"
+        params[rodauth.public_send(meth).to_s] = opts.delete(k) if rodauth.respond_to?(meth)
+      end
+
+      unless opts.empty?
+        warn "unhandled options passed to #{route}: #{opts.inspect}"
+      end
+
+      rodauth.handle_internal_request(:"_handle_#{route}")
+    end
+  end
+
+  Feature.define(:internal_request, :InternalRequest) do
+    configuration_module_eval do
+      def internal_request_configuration(&block)
+        @auth.instance_exec do
+          (@internal_request_configuration_blocks ||= []) << block
+        end
+      end
+    end
+
+    def post_configure
+      super
+
+      return if is_a?(InternalRequestMethods)
+
+      klass = self.class
+      internal_class = Class.new(klass) do
+        @roda_class = klass.roda_class
+        @features = klass.features.clone
+        @routes = klass.routes.clone
+        @route_hash = klass.route_hash.clone
+        @configuration = klass.configuration.clone
+        @configuration.instance_variable_set(:@auth, self)
+      end
+
+      if blocks = klass.instance_variable_get(:@internal_request_configuration_blocks)
+        configuration = internal_class.configuration
+        blocks.each do |block|
+          configuration.instance_exec(&block)
+        end
+      end
+      internal_class.send(:extend, InternalRequestClassMethods)
+      internal_class.send(:include, InternalRequestMethods)
+      internal_class.allocate.post_configure
+
+      ([:base] + internal_class.features).each do |feature_name|
+        feature = FEATURES[feature_name]
+        if meths = feature.internal_request_methods
+          meths.each do |name|
+            klass.define_singleton_method(name){|opts={}, &block| internal_class.internal_request(name, opts, &block)}
+          end
+        end
+      end
+    end
+  end
+end