From 46397cbda6911bd52f17043238a160e8f77b35c2 Mon Sep 17 00:00:00 2001
From: tidusjar <tidusjar@gmail.com>
Date: Mon, 3 Jul 2023 20:11:38 +0100
Subject: [PATCH] =?UTF-8?q?fix(user-importer):=20=F0=9F=90=9B=20Fixed=20an?=
 =?UTF-8?q?=20issue=20where=20the=20cleanup=20wouldn't=20delete=20users=20?=
 =?UTF-8?q?#4812?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Ombi.Core/Engine/UserDeletionEngine.cs      | 1 +
 src/Ombi.Schedule/Jobs/Plex/PlexUserImporter.cs | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Ombi.Core/Engine/UserDeletionEngine.cs b/src/Ombi.Core/Engine/UserDeletionEngine.cs
index 1c8fd63ca9..eef7bd2f19 100644
--- 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
index 3b931b5860..68a7026a35 100644
--- 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,7 +21,8 @@ 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;
@@ -28,6 +30,7 @@ public PlexUserImporter(IPlexApi api, OmbiUserManager um, ILogger<PlexUserImport
             _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);
                 }
             }