about summary refs log tree commit diff
path: root/app/controllers/oauth
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-04-08 02:30:50 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-04-08 02:30:50 +0200
commit4b621188adcd3e68272fc58db3cb5dfe51e71b38 (patch)
tree45df5941a51262e9ad1f316208ff4cde9c7732c5 /app/controllers/oauth
parenta872f2f4c64f4a370fa1a92a28f9c07c1dd3b06d (diff)
Fix #1165 - before_action was called before protect_from_forgery
Diffstat (limited to 'app/controllers/oauth')
-rw-r--r--app/controllers/oauth/authorizations_controller.rb4
-rw-r--r--app/controllers/oauth/authorized_applications_controller.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index cdbfde0fb..e9cdf9fa8 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
-  include Localized
-
   skip_before_action :authenticate_resource_owner!
 
   before_action :store_current_location
   before_action :authenticate_resource_owner!
 
+  include Localized
+
   private
 
   def store_current_location
diff --git a/app/controllers/oauth/authorized_applications_controller.rb b/app/controllers/oauth/authorized_applications_controller.rb
index 09dd5d3c4..395fbc51b 100644
--- a/app/controllers/oauth/authorized_applications_controller.rb
+++ b/app/controllers/oauth/authorized_applications_controller.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicationsController
-  include Localized
-
   skip_before_action :authenticate_resource_owner!
 
   before_action :store_current_location
   before_action :authenticate_resource_owner!
 
+  include Localized
+
   private
 
   def store_current_location