Merge pull request #19 from DianthuDia/rack/open_id/more_build_header

Support another build header of Rack/openid

Author: pboling

lib/omniauth/strategies/open_id.rb

@@ -24,19 +24,27 @@ class OpenID
       option :name, :open_id
       option :required, [AX[:email], AX[:name], AX[:first_name], AX[:last_name], 'email', 'fullname']
       option :optional, [AX[:nickname], AX[:city], AX[:state], AX[:website], AX[:image], 'postcode', 'nickname']
+      option :immediate, false
+      option :trust_root, proc{|root_uri| nil }
       option :store, ::OpenID::Store::Memory.new
       option :identifier, nil
       option :identifier_param, 'openid_url'
       option :trust_root, nil
 
       def dummy_app
-        lambda{|env| [401, {"WWW-Authenticate" => Rack::OpenID.build_header(
+        lambda{|env|
+          req = Rack::Request.new(env)
+          root_uri = "#{req.scheme}://#{req.host_with_port}/"
+
+          [401, {"WWW-Authenticate" => Rack::OpenID.build_header(
           :identifier => identifier,
           :return_to => callback_url,
           :trust_root => options.trust_root || %r{^(https?://[^/]+)}.match(callback_url) {|m| m[1]},
           :required => options.required,
           :optional => options.optional,
-          :method => 'post'
+          :method => 'post',
+          :immediate => options.immediate,
+          :trust_root => options.trust_root.call(root_uri)
         )}, []]}
       end