Merge branch 'dm-warden-hook-scope' into 'master'

Only run session related Warden hooks for user scope

Closes gitlab-ee#5857

See merge request gitlab-org/gitlab-ce!18771

1 files changed, 5 insertions, 5 deletions

diff --git a/config/initializers/warden.rb b/config/initializers/warden.rb
index bf079f8e1a7..8cc36820d3c 100644
--- a/config/initializers/warden.rb
+++ b/config/initializers/warden.rb
@@ -1,21 +1,21 @@
 Rails.application.configure do |config|
-  Warden::Manager.after_set_user do |user, auth, opts|
+  Warden::Manager.after_set_user(scope: :user) do |user, auth, opts|
     Gitlab::Auth::UniqueIpsLimiter.limit_user!(user)
   end
 
-  Warden::Manager.before_failure do |env, opts|
+  Warden::Manager.before_failure(scope: :user) do |env, opts|
     Gitlab::Auth::BlockedUserTracker.log_if_user_blocked(env)
   end
 
-  Warden::Manager.after_authentication do |user, auth, opts|
+  Warden::Manager.after_authentication(scope: :user) do |user, auth, opts|
     ActiveSession.cleanup(user)
   end
 
-  Warden::Manager.after_set_user only: :fetch do |user, auth, opts|
+  Warden::Manager.after_set_user(scope: :user, only: :fetch) do |user, auth, opts|
     ActiveSession.set(user, auth.request)
   end
 
-  Warden::Manager.before_logout do |user, auth, opts|
+  Warden::Manager.before_logout(scope: :user) do |user, auth, opts|
     ActiveSession.destroy(user || auth.user, auth.request.session.id)
   end
 end