Preserve query string in callback url

oa-core/lib/omniauth/strategy.rb

@@ -60,6 +60,10 @@ module OmniAuth
     def callback_path
       options[:callback_path] || "#{path_prefix}/#{name}/callback"
     end
+
+    def query_string
+      request.query_string.empty? ? "" : "?#{request.query_string}"
+    end
     
     def call_app!
       @env['omniauth.strategy'] = self
@@ -82,7 +86,7 @@ module OmniAuth
     end
     
     def callback_url
-      full_host + callback_path
+      full_host + callback_path + query_string
     end
     
     def session

oa-core/spec/omniauth/strategy_spec.rb

@@ -47,6 +47,14 @@ describe OmniAuth::Strategy do
 
           strategy.callback_url.should == 'http://example.com/auth/test/callback'
         end
+
+        it 'preserves the query parameters' do
+          strategy.stub(:full_host).and_return('http://example.com')
+          begin
+            strategy.call({'PATH_INFO' => '/auth/test', 'QUERY_STRING' => 'id=5'})
+          rescue RuntimeError; end
+          strategy.callback_url.should == 'http://example.com/auth/test/callback?id=5'
+        end
       end
     end
     
@@ -79,6 +87,15 @@ describe OmniAuth::Strategy do
 
           strategy.callback_url.should == 'http://example.com/radical'
         end
+
+        it 'preserves the query parameters' do
+          @options = {:callback_path => '/radical'}
+          strategy.stub(:full_host).and_return('http://example.com')
+          begin
+            strategy.call({'QUERY_STRING' => 'id=5'})
+          rescue RuntimeError; end
+          strategy.callback_url.should == 'http://example.com/radical?id=5'
+        end
       end
     end
     
@@ -103,6 +120,14 @@ describe OmniAuth::Strategy do
 
           strategy.callback_url.should == 'http://example.com/wowzers/test/callback'
         end
+
+        it 'preserves the query parameters' do
+          strategy.stub(:full_host).and_return('http://example.com')
+          begin
+            strategy.call({'PATH_INFO' => '/wowzers/test', 'QUERY_STRING' => 'id=5'})
+          rescue RuntimeError; end
+          strategy.callback_url.should == 'http://example.com/wowzers/test/callback?id=5'
+        end
       end
     end
   end