Adds 'origin' param to default failure redirect. Closes #569

lib/omniauth/failure_endpoint.rb

@@ -27,8 +27,13 @@ module OmniAuth
 
     def redirect_to_failure
       message_key = env['omniauth.error.type']
-      new_path = "#{env['SCRIPT_NAME']}#{OmniAuth.config.path_prefix}/failure?message=#{message_key}"
+      new_path = "#{env['SCRIPT_NAME']}#{OmniAuth.config.path_prefix}/failure?message=#{message_key}#{origin_query_param}"
       Rack::Response.new(["302 Moved"], 302, 'Location' => new_path).finish
     end
+
+    def origin_query_param
+      return "" unless env['omniauth.origin']
+      "&origin=#{CGI.escape(env['omniauth.origin'])}"
+    end
   end
 end

spec/omniauth/failure_endpoint_spec.rb

@@ -41,5 +41,11 @@ describe OmniAuth::FailureEndpoint do
       status, head, body = *subject.call(env)
       head["Location"].should == '/boo/failure?message=invalid_request'
     end
+
+    it 'should include the origin (escaped) if one is provided' do
+      env.merge! 'omniauth.origin' => '/origin-example'
+      status, head, body = *subject.call(env)
+      head['Location'].should be_include('&origin=%2Forigin-example')
+    end
   end
 end