Take security policy URLs from the configuration file

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 84bbcf1850e5c95cf6d6d925c0c009b3f7e83315..96b562b5ef4bdce00cabe31bc68e16a032b471e0 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -30,7 +30,7 @@ class OauthController < ApplicationController
     @token = current_user.oauth_tokens.find_by :token => params[:token]
     if @token
       @token.invalidate!
     @token = current_user.oauth_tokens.find_by :token => params[:token]
     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,10 +38,10 @@ class OauthController < ApplicationController
   protected
 
   def oauth1_authorize
   protected
 
   def oauth1_authorize

-    append_content_security_policy_directives(:form_action => %w[*])
+    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?


@@ -69,7 +69,7 @@ class OauthController < ApplicationController
         end
       else
         @token.invalidate!
         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