From: Tom Hughes <tom@compton.nu>
Date: Wed, 19 Aug 2009 07:45:24 +0000 (+0000)
Subject: Call the set_locale filter for oauth methods which display web
X-Git-Tag: live~6714
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9fec2fd137619eed257f146542ae44d792cc49dd

Call the set_locale filter for oauth methods which display web
pages to the user. Closes #2203.
---

diff --git a/app/controllers/oauth_clients_controller.rb b/app/controllers/oauth_clients_controller.rb
index 00606c1ec..94a7d4d5b 100644
--- a/app/controllers/oauth_clients_controller.rb
+++ b/app/controllers/oauth_clients_controller.rb
@@ -2,8 +2,9 @@ class OauthClientsController < ApplicationController
   layout 'site'
 
   before_filter :authorize_web
+  before_filter :set_locale
   before_filter :require_user
-  
+
   def index
     @client_applications = @user.client_applications
     @tokens = @user.oauth_tokens.find :all, :conditions => 'oauth_tokens.invalidated_at is null and oauth_tokens.authorized_at is not null'
@@ -22,7 +23,7 @@ class OauthClientsController < ApplicationController
       render :action => "new"
     end
   end
-  
+
   def show
     @client_application = @user.client_applications.find(params[:id])
   rescue ActiveRecord::RecordNotFound
@@ -33,7 +34,7 @@ class OauthClientsController < ApplicationController
   def edit
     @client_application = @user.client_applications.find(params[:id])
   end
-  
+
   def update
     @client_application = @user.client_applications.find(params[:id])
     if @client_application.update_attributes(params[:client_application])
diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index f8959beae..c8ae12277 100644
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -1,7 +1,8 @@
 class OauthController < ApplicationController
   layout 'site'
 
-  before_filter :authorize_web, :except => [:request_token, :access_token]
+  before_filter :authorize_web, :only => [:oauthorize, :revoke]
+  before_filter :set_locale, :only => [:oauthorize, :revoke]
   before_filter :require_user, :only => [:oauthorize]
   before_filter :verify_oauth_consumer_signature, :only => [:request_token]
   before_filter :verify_oauth_request_token, :only => [:access_token]
@@ -26,8 +27,8 @@ class OauthController < ApplicationController
     else
       render :nothing => true, :status => 401
     end
-  end 
-  
+  end
+
   def access_token
     @token = current_token && current_token.exchange!
     if @token
@@ -39,8 +40,8 @@ class OauthController < ApplicationController
 
   def oauthorize
     @token = RequestToken.find_by_token params[:oauth_token]
-    unless @token.invalidated?    
-      if request.post? 
+    unless @token.invalidated?
+      if request.post?
         any_auth = false
         @token.client_application.permissions.each do |pref|
           if params[pref]
@@ -51,7 +52,7 @@ class OauthController < ApplicationController
             @token.write_attribute(pref, false)
           end
         end
-        
+
         if any_auth
           @token.authorize!(@user)
           redirect_url = params[:oauth_callback] || @token.client_application.callback_url
@@ -69,7 +70,7 @@ class OauthController < ApplicationController
       render :action => "authorize_failure"
     end
   end
-  
+
   def revoke
     @token = @user.oauth_tokens.find_by_token params[:token]
     if @token
@@ -79,5 +80,4 @@ class OauthController < ApplicationController
     logger.info "about to redirect"
     redirect_to :controller => 'oauth_clients', :action => 'index'
   end
-  
 end