github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-20 05:13:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(user-importer): 🐛 Fixed an issue where the cleanup wouldn't delete users #4812

Browse source
This commit is contained in:
tidusjar 2023-07-03 20:11:38 +01:00
commit 46397cbda6
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Ombi.Core/Engine/UserDeletionEngine.cs
View file

@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.VisualBasic;
using Ombi.Core.Authentication; using Ombi.Core.Authentication;
using Ombi.Store.Entities; using Ombi.Store.Entities;
using Ombi.Store.Entities.Requests; using Ombi.Store.Entities.Requests;

9
src/Ombi.Schedule/Jobs/Plex/PlexUserImporter.cs
View file

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