Made the OAuth 2 redirect_uri param in the options hash mandatory and…

… created a method to get it.

lib/oauth/controllers/consumer_controller.rb

@@ -25,7 +25,7 @@ def show
 
         unless @token
           if @consumer.ancestors.include?(Oauth2Token)
-            request_url = callback2_oauth_consumer_url(params[:id]) + callback2_querystring
+            request_url = callback2_oauth_consumer_url + callback2_querystring
             redirect_to @consumer.authorize_url(request_url)
           else
             request_url = callback_oauth_consumer_url(params[:id]) + callback2_querystring
@@ -45,7 +45,7 @@ def callback2_querystring
       end
 
       def callback2
-        @token = @consumer.access_token(current_user,params[:code], callback2_oauth_consumer_url(params[:id]))
+        @token = @consumer.access_token(current_user,params[:code], callback2_oauth_consumer_url)
         logger.info @token.inspect
         if @token
           # Log user in
@@ -118,6 +118,10 @@ def destroy
         end
       end
 
+      def callback2_oauth_consumer_url
+        @consumer.consumer.options[:redirect_uri]
+      end
+
       protected
 
       # Override this in your controller to decide where you want to redirect user to after callback is finished.