From: Tom Hughes <tom@compton.nu>
Date: Sat, 19 Nov 2011 00:25:17 +0000 (+0000)
Subject: Override oauth1_authorize pending a fixed version of oauth-plugin
X-Git-Tag: live~6541
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/093651c208e90c20c818c1bfc4d167131976a8cb

Override oauth1_authorize pending a fixed version of oauth-plugin
---

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 3c56a4bf4..295b01bb4 100644
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -34,4 +34,44 @@ class OauthController < ApplicationController
     end
     redirect_to :controller => 'oauth_clients', :action => 'index'
   end
+
+protected
+
+  def oauth1_authorize
+    unless @token
+      render :action=>"authorize_failure"
+      return
+    end
+
+    unless @token.invalidated?
+      if request.post?
+        if user_authorizes_token?
+          @token.authorize!(current_user)
+          if @token.oauth10?
+            callback_url = params[:oauth_callback] || @token.client_application.callback_url
+          else
+            callback_url = @token.oob? ? @token.client_application.callback_url : @token.callback_url
+          end
+          @redirect_url = URI.parse(callback_url) unless callback_url.blank?
+
+          unless @redirect_url.to_s.blank?
+            @redirect_url.query = @redirect_url.query.blank? ?
+            "oauth_token=#{@token.token}" :
+              @redirect_url.query + "&oauth_token=#{@token.token}"
+            unless @token.oauth10?
+              @redirect_url.query + "&oauth_verifier=#{@token.verifier}"
+            end
+            redirect_to @redirect_url.to_s
+          else
+            render :action => "authorize_success"
+          end
+        else
+          @token.invalidate!
+          render :action => "authorize_failure"
+        end
+      end
+    else
+      render :action => "authorize_failure"
+    end
+  end
 end