Migrate ActivityLogEntryPoint.OnUserLockedOut to IEventConsumer

3 files changed, 66 insertions, 24 deletions

diff --git a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
index 8fc0b527f..0000195d8 100644
--- a/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
+++ b/Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
@@ -6,7 +6,6 @@ using Jellyfin.Data.Events;
 using MediaBrowser.Common.Plugins;
 using MediaBrowser.Common.Updates;
 using MediaBrowser.Controller.Authentication;
-using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Activity;
@@ -26,7 +25,6 @@ namespace Emby.Server.Implementations.Activity
         private readonly ISessionManager _sessionManager;
         private readonly IActivityManager _activityManager;
         private readonly ILocalizationManager _localization;
-        private readonly IUserManager _userManager;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ActivityLogEntryPoint"/> class.
@@ -35,19 +33,16 @@ namespace Emby.Server.Implementations.Activity
         /// <param name="activityManager">The activity manager.</param>
         /// <param name="localization">The localization manager.</param>
         /// <param name="installationManager">The installation manager.</param>
-        /// <param name="userManager">The user manager.</param>
         public ActivityLogEntryPoint(
             ISessionManager sessionManager,
             IActivityManager activityManager,
             ILocalizationManager localization,
-            IInstallationManager installationManager,
-            IUserManager userManager)
+            IInstallationManager installationManager)
         {
             _sessionManager = sessionManager;
             _activityManager = activityManager;
             _localization = localization;
             _installationManager = installationManager;
-            _userManager = userManager;
         }
 
         /// <inheritdoc />
@@ -63,25 +58,9 @@ namespace Emby.Server.Implementations.Activity
             _sessionManager.AuthenticationSucceeded += OnAuthenticationSucceeded;
             _sessionManager.SessionEnded += OnSessionEnded;
 
-            _userManager.OnUserLockedOut += OnUserLockedOut;
-
             return Task.CompletedTask;
         }
 
-        private async void OnUserLockedOut(object sender, GenericEventArgs<User> e)
-        {
-            await CreateLogEntry(new ActivityLog(
-                    string.Format(
-                        CultureInfo.InvariantCulture,
-                        _localization.GetLocalizedString("UserLockedOutWithName"),
-                        e.Argument.Username),
-                    NotificationType.UserLockedOut.ToString(),
-                    e.Argument.Id)
-            {
-                LogSeverity = LogLevel.Error
-            }).ConfigureAwait(false);
-        }
-
         private async void OnSessionEnded(object sender, SessionEventArgs e)
         {
             var session = e.SessionInfo;
@@ -251,8 +230,6 @@ namespace Emby.Server.Implementations.Activity
             _sessionManager.AuthenticationFailed -= OnAuthenticationFailed;
             _sessionManager.AuthenticationSucceeded -= OnAuthenticationSucceeded;
             _sessionManager.SessionEnded -= OnSessionEnded;
-
-            _userManager.OnUserLockedOut -= OnUserLockedOut;
         }
     }
 }
diff --git a/Jellyfin.Data/Events/Users/UserLockedOutEventArgs.cs b/Jellyfin.Data/Events/Users/UserLockedOutEventArgs.cs
new file mode 100644
index 000000000..cca3726dc
--- /dev/null
+++ b/Jellyfin.Data/Events/Users/UserLockedOutEventArgs.cs
@@ -0,0 +1,18 @@
+using Jellyfin.Data.Entities;
+
+namespace Jellyfin.Data.Events.Users
+{
+    /// <summary>
+    /// An event that occurs when a user is locked out.
+    /// </summary>
+    public class UserLockedOutEventArgs : GenericEventArgs<User>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserLockedOutEventArgs"/> class.
+        /// </summary>
+        /// <param name="arg">The user.</param>
+        public UserLockedOutEventArgs(User arg) : base(arg)
+        {
+        }
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Events/Consumers/Users/UserLockedOutLogger.cs b/Jellyfin.Server.Implementations/Events/Consumers/Users/UserLockedOutLogger.cs
new file mode 100644
index 000000000..a31f222ee
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Events/Consumers/Users/UserLockedOutLogger.cs
@@ -0,0 +1,47 @@
+using System.Globalization;
+using System.Threading.Tasks;
+using Jellyfin.Data.Entities;
+using Jellyfin.Data.Events.Users;
+using MediaBrowser.Controller.Events;
+using MediaBrowser.Model.Activity;
+using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.Notifications;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Server.Implementations.Events.Consumers.Users
+{
+    /// <summary>
+    /// Creates an entry in the activity log when a user is locked out.
+    /// </summary>
+    public class UserLockedOutLogger : IEventConsumer<UserLockedOutEventArgs>
+    {
+        private readonly ILocalizationManager _localizationManager;
+        private readonly IActivityManager _activityManager;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="UserLockedOutLogger"/> class.
+        /// </summary>
+        /// <param name="localizationManager">The localization manager.</param>
+        /// <param name="activityManager">The activity manager.</param>
+        public UserLockedOutLogger(ILocalizationManager localizationManager, IActivityManager activityManager)
+        {
+            _localizationManager = localizationManager;
+            _activityManager = activityManager;
+        }
+
+        /// <inheritdoc />
+        public async Task OnEvent(UserLockedOutEventArgs eventArgs)
+        {
+            await _activityManager.CreateAsync(new ActivityLog(
+                string.Format(
+                    CultureInfo.InvariantCulture,
+                    _localizationManager.GetLocalizedString("UserLockedOutWithName"),
+                    eventArgs.Argument.Username),
+                NotificationType.UserLockedOut.ToString(),
+                eventArgs.Argument.Id)
+            {
+                LogSeverity = LogLevel.Error
+            }).ConfigureAwait(false);
+        }
+    }
+}