changing callback_path to callback_url to take into account relative root url

Author: angelkbrown

lib/omniauth/strategies/ldap.rb

@@ -57,18 +57,18 @@ def request_phase
         # Fast-path: if a trusted identity header is present, skip the login form
         # and jump to the callback where we will complete using directory lookup.
         if header_username
-          return Rack::Response.new([], 302, "Location" => callback_path).finish
+          return Rack::Response.new([], 302, "Location" => callback_url).finish
         end
 
         # If credentials were POSTed directly to /auth/:provider, redirect to the callback path.
         # This mirrors the behavior of many OmniAuth providers and allows test helpers (like
         # OmniAuth::Test::PhonySession) to populate `env['omniauth.auth']` on the callback request.
         if request.post? && request.params["username"].to_s != "" && request.params["password"].to_s != ""
-          return Rack::Response.new([], 302, "Location" => callback_path).finish
+          return Rack::Response.new([], 302, "Location" => callback_url).finish
         end
 
         OmniAuth::LDAP::Adaptor.validate(@options)
-        f = OmniAuth::Form.new(title: options[:title] || "LDAP Authentication", url: callback_path)
+        f = OmniAuth::Form.new(title: options[:title] || "LDAP Authentication", url: callback_url)
         f.text_field("Login", "username")
         f.password_field("Password", "password")
         f.button("Sign In")

spec/omniauth/strategies/ldap_spec.rb

@@ -70,7 +70,7 @@ def make_env(path = "/auth/ldap", props = {})
     end
 
     it "has the callback as the action for the form" do
-      expect(last_response.body).to include("action='/auth/ldap/callback'")
+      expect(last_response.body).to include("action='http://example.org/auth/ldap/callback'")
     end
 
     it "has a text field for each of the fields" do