prevent addition of ? marks to callback url when not needed

Conflicts: lib/oauth/controllers/consumer_controller.rb
pelle · Apr 3, 2012 · 00b7892 · 00b7892
1 parent 851ec16
commit 00b7892
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/oauth/controllers/consumer_controller.rb b/lib/oauth/controllers/consumer_controller.rb
@@ -25,10 +25,10 @@ def show
 
         unless @token
           if @consumer.ancestors.include?(Oauth2Token)
-            request_url = callback2_oauth_consumer_url(params[:id]) + '?' + request.query_string
+            request_url = callback2_oauth_consumer_url(params[:id]) + callback2_querystring
             redirect_to @consumer.authorize_url(request_url)
           else
-            request_url = callback_oauth_consumer_url(params[:id]) + '?' + request.query_string
+            request_url = callback_oauth_consumer_url(params[:id]) + callback2_querystring
             @request_token = @consumer.get_request_token(request_url)
             session[@request_token.token]=@request_token.secret
             if @request_token.callback_confirmed?
@@ -39,7 +39,11 @@ def show
           end
         end
       end
-
+
+      def callback2_querystring
+        request.query_string.blank? ? '' : '?' + request.query_string
+      end
+
       def callback2
         @token = @consumer.access_token(current_user,params[:code], callback2_oauth_consumer_url(params[:id]))
         logger.info @token.inspect