@@ -23,10 +23,14 @@ class Exceptions < Merb::Controller end def unauthenticated - render :template => "../../slices/merb-auth-slice-password/app/views/exceptions/unauthenticated" + if content_type == :html + render :template => "../../slices/merb-auth-slice-password/app/views/exceptions/unauthenticated" + else + return "" + end end def number_of_columns 1 end -end \ No newline at end of file +end app/controllers/exceptions.rb @@ -16,9 +16,7 @@ module Merb::Authentication::Strategies end end end -end -module Merb::Authentication::Strategies class PasswordFormWithTokenStrategy < Merb::Authentication::Strategies::Basic::Form def run! user = super @@ -29,6 +27,19 @@ module Merb::Authentication::Strategies user end end + + class RequestedBasicAuthStrategy < Merb::Authentication::Strategies::Basic::BasicAuth + def run! + user = super + if user + user + else + if request.params["auth"] == "basic" + request_basic_auth! + end + end + end + end end -Merb::Authentication.default_strategy_order = [Merb::Authentication::Strategies::CookieStrategy, Merb::Authentication::Strategies::PasswordFormWithTokenStrategy, Merb::Authentication::Strategies::Basic::BasicAuth] \ No newline at end of file +Merb::Authentication.default_strategy_order = [Merb::Authentication::Strategies::CookieStrategy, Merb::Authentication::Strategies::PasswordFormWithTokenStrategy, Merb::Authentication::Strategies::RequestedBasicAuthStrategy] \ No newline at end of file merb/merb-auth/strategies.rb 7485165acddf87079b0a92aabfa8e83f2a8420d3 Marcin Kulik marcin.kulik@gmail.com http://github.com/LunarLogicPolska/rubytime/commit/8bea9d633f2a593de1f56dd63f5c34d04027a387 8bea9d633f2a593de1f56dd63f5c34d04027a387 2009-04-22T10:32:31-07:00 2009-04-22T10:32:31-07:00 added authentication strategy for external API (requested-http-auth) e3647953bd2375b3b08f24c8a4f54e16abd2eaed Marcin Kulik marcin.kulik@gmail.com