Merge remote-tracking branch 'upstream/pull/2111'

[rails.git] / app / controllers / oauth_controller.rb

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 59ebfd631b0075d1279a6738bf55a9278713602c..96b562b5ef4bdce00cabe31bc68e16a032b471e0 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -27,10 +27,10 @@ class OauthController < ApplicationController
   end
 
   def revoke
   end
 
   def revoke

-    @token = current_user.oauth_tokens.find_by_token params[:token]
+    @token = current_user.oauth_tokens.find_by :token => params[:token]

     if @token
       @token.invalidate!
     if @token
       @token.invalidate!

-      flash[:notice] = t("oauth.revoke.flash", :application => @token.client_application.name)
+      flash[:notice] = t(".flash", :application => @token.client_application.name)

     end
     redirect_to oauth_clients_url(:display_name => @token.user.display_name)
   end
     end
     redirect_to oauth_clients_url(:display_name => @token.user.display_name)
   end


@@ -38,8 +38,10 @@ class OauthController < ApplicationController
   protected
 
   def oauth1_authorize
   protected
 
   def oauth1_authorize

+    override_content_security_policy_directives(:form_action => []) if CSP_ENFORCE || defined?(CSP_REPORT_URL)
+

     if @token.invalidated?
     if @token.invalidated?

-      @message = t "oauth.oauthorize_failure.invalid"
+      @message = t "oauth.authorize_failure.invalid"

       render :action => "authorize_failure"
     elsif request.post?
       if user_authorizes_token?
       render :action => "authorize_failure"
     elsif request.post?
       if user_authorizes_token?


@@ -49,7 +51,7 @@ class OauthController < ApplicationController
                        else
                          @token.oob? ? @token.client_application.callback_url : @token.callback_url
                        end
                        else
                          @token.oob? ? @token.client_application.callback_url : @token.callback_url
                        end

-        @redirect_url = URI.parse(callback_url) unless callback_url.blank?
+        @redirect_url = URI.parse(callback_url) if callback_url.present?

 
         if @redirect_url.to_s.blank?
           render :action => "authorize_success"
 
         if @redirect_url.to_s.blank?
           render :action => "authorize_success"


@@ -61,15 +63,13 @@ class OauthController < ApplicationController
                                     "&oauth_token=#{@token.token}"
                                 end
 
                                     "&oauth_token=#{@token.token}"
                                 end
 

-          unless @token.oauth10?
-            @redirect_url.query += "&oauth_verifier=#{@token.verifier}"
-          end
+          @redirect_url.query += "&oauth_verifier=#{@token.verifier}" unless @token.oauth10?

 
           redirect_to @redirect_url.to_s
         end
       else
         @token.invalidate!
 
           redirect_to @redirect_url.to_s
         end
       else
         @token.invalidate!

-        @message = t("oauth.oauthorize_failure.denied", :app_name => @token.client_application.name)
+        @message = t("oauth.authorize_failure.denied", :app_name => @token.client_application.name)

         render :action => "authorize_failure"
       end
     end
         render :action => "authorize_failure"
       end
     end