@@ -87,6 +87,10 @@ module Mhs def login_model self.login_model_name.classify.constantize end + + def login_controller + self.login_controller_name.classify.constantize + end def set_login_model_scope &blk self.login_model_scope = blk @@ -125,7 +129,7 @@ module Mhs cookies[:remember_me_token] = { :value => model.remember_me_token , :expires => model.remember_me_token_expires_at } end set_current_user model - elsif not ActionController::HttpAuthentication::Basic.authorization(request).blank? + elsif not ActionController::HttpAuthentication::Basic.authorization(request).blank? && self.class.login_controller.mhs_authentication_system_options[:basic_auth_enabled] model = authenticate_with_http_basic do |login_attribute_value, password| login_attribute = self.class.login_model.mhs_authentication_system_options[:login_attribute] instance_eval(&self.class.login_model_scope).login(login_attribute => login_attribute_value, :password => password) lib/controller.rb @@ -42,7 +42,8 @@ module Mhs :reminder_email_subject => "Support Reminder", :signup_email_subject => "Welcome", :track_pre_login_url => true, - :reset_session_after_logout => true + :reset_session_after_logout => true, + :basic_auth_enabled => true }.merge(options) if mhs_authentication_system_options[:allow_signup] lib/login_controller.rb 8be1164fc06d3b1dbc8d9922fb230374d8852978 Joshua Clayton jclayton@fusionary.com http://github.com/mvanholstyn/mhs_authentication_system/commit/7acc23556fa7b2a911164cfd2d4bc5f9583fc2fc 7acc23556fa7b2a911164cfd2d4bc5f9583fc2fc 2009-03-29T20:11:10-07:00 2009-03-23T19:47:26-07:00 Modified login_controller to define :basic_auth_enabled option for turning basic auth account lookup off. Signed-off-by: Mark Van Holstyn <mvanholstyn@gmail.com> ffa8983323386721dc06c82e9db4136b16f79f65 Mark Van Holstyn mvanholstyn@gmail.com