lib/oauth/controllers/consumer_controller.rb in oauth-plugin-0.4.1 vs lib/oauth/controllers/consumer_controller.rb in oauth-plugin-0.5.0

@@ -23,11 +23,11 @@
           @token = nil
         end
 
         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
             @request_token = @consumer.get_request_token(request_url)
             session[@request_token.token]=@request_token.secret
@@ -43,12 +43,11 @@
       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
+        @token = @consumer.access_token(current_user,params[:code], callback2_oauth_consumer_url)
         if @token
           # Log user in
           if logged_in?
             flash[:notice] = "#{params[:id].humanize} was successfully connected to your account"
           else
@@ -114,9 +113,13 @@
         else
           flash[:notice] = "#{params[:id].humanize} was successfully disconnected from your account"
 
           go_back
         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.