Improve blocked user tracking and fire some events only once

1 files changed, 5 insertions, 1 deletions

diff --git a/config/initializers/warden.rb b/config/initializers/warden.rb
index d64b659c6d7..872e82c4df2 100644
--- a/config/initializers/warden.rb
+++ b/config/initializers/warden.rb
@@ -35,7 +35,11 @@ Rails.application.configure do |config|
   Warden::Manager.before_logout(scope: :user) do |user_warden, auth, opts|
     user = user_warden || auth.user
 
+    Gitlab::Auth::Activity.new(user, opts).tap do |activity|
+      activity.user_blocked! if user.blocked?
+      activity.user_session_destroyed!
+    end
+
     ActiveSession.destroy(user, auth.request.session.id)
-    Gitlab::Auth::Activity.new(user, opts).user_session_destroyed!
   end
 end