fix(user-importer): 🐛 Fixed an issue where the cleanup wouldn't delet…

…e users #4812
Ombi-app · Jul 3, 2023 · 46397cb · 46397cb
1 parent 9840077
commit 46397cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/Ombi.Core/Engine/UserDeletionEngine.cs b/src/Ombi.Core/Engine/UserDeletionEngine.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.VisualBasic;
 using Ombi.Core.Authentication;
 using Ombi.Store.Entities;
 using Ombi.Store.Entities.Requests;

diff --git a/src/Ombi.Schedule/Jobs/Plex/PlexUserImporter.cs b/src/Ombi.Schedule/Jobs/Plex/PlexUserImporter.cs
@@ -7,6 +7,7 @@
 using Microsoft.Extensions.Logging;
 using Ombi.Api.Plex;
 using Ombi.Core.Authentication;
+using Ombi.Core.Engine;
 using Ombi.Core.Settings;
 using Ombi.Core.Settings.Models.External;
 using Ombi.Helpers;
@@ -20,14 +21,16 @@ namespace Ombi.Schedule.Jobs.Plex
     public class PlexUserImporter : IPlexUserImporter
     {
         public PlexUserImporter(IPlexApi api, OmbiUserManager um, ILogger<PlexUserImporter> log,
-            ISettingsService<PlexSettings> plexSettings, ISettingsService<UserManagementSettings> ums, INotificationHubService notificationHubService)
+            ISettingsService<PlexSettings> plexSettings, ISettingsService<UserManagementSettings> ums, INotificationHubService notificationHubService,
+            IUserDeletionEngine userDeletionEngine)
         {
             _api = api;
             _userManager = um;
             _log = log;
             _plexSettings = plexSettings;
             _userManagementSettings = ums;
             _notification = notificationHubService;
+            _userDeletionEngine = userDeletionEngine;
             _plexSettings.ClearCache();
             _userManagementSettings.ClearCache();
         }
@@ -38,7 +41,7 @@ public PlexUserImporter(IPlexApi api, OmbiUserManager um, ILogger<PlexUserImport
         private readonly ISettingsService<PlexSettings> _plexSettings;
         private readonly ISettingsService<UserManagementSettings> _userManagementSettings;
         private readonly INotificationHubService _notification;
-
+        private readonly IUserDeletionEngine _userDeletionEngine;
 
         public async Task Execute(IJobExecutionContext job)
         {
@@ -90,7 +93,7 @@ public async Task Execute(IJobExecutionContext job)
                 foreach (var ombiUser in missingUsers)
                 {
                     _log.LogInformation("Deleting user {0} not found in Plex Server.", ombiUser.UserName);
-                    await _userManager.DeleteAsync(ombiUser);
+                    await _userDeletionEngine.DeleteUser(ombiUser);
                 }
             }