From 9a01cd8590ffcae8ce561e6f733bf59fe54932fa Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Wed, 24 Jun 2020 20:19:47 -0400
Subject: [PATCH 1/3] Fix user deletion.

---
 .../Users/UserManager.cs                      | 19 ++++++++++++++-----
 MediaBrowser.Api/UserService.cs               | 11 ++---------
 .../Library/IUserManager.cs                   |  4 ++--
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/Jellyfin.Server.Implementations/Users/UserManager.cs b/Jellyfin.Server.Implementations/Users/UserManager.cs
index 9041147588..d86b25f81e 100644
--- a/Jellyfin.Server.Implementations/Users/UserManager.cs
+++ b/Jellyfin.Server.Implementations/Users/UserManager.cs
@@ -192,15 +192,15 @@ namespace Jellyfin.Server.Implementations.Users
         }
 
         /// <inheritdoc/>
-        public void DeleteUser(User user)
+        public void DeleteUser(Guid userId)
         {
+            var dbContext = _dbProvider.CreateContext();
+            var user = dbContext.Users.Find(userId);
             if (user == null)
             {
-                throw new ArgumentNullException(nameof(user));
+                throw new ArgumentNullException(nameof(userId));
             }
 
-            var dbContext = _dbProvider.CreateContext();
-
             if (dbContext.Users.Find(user.Id) == null)
             {
                 throw new ArgumentException(string.Format(
@@ -226,9 +226,18 @@ namespace Jellyfin.Server.Implementations.Users
                         CultureInfo.InvariantCulture,
                         "The user '{0}' cannot be deleted because there must be at least one admin user in the system.",
                         user.Username),
-                    nameof(user));
+                    nameof(userId));
+            }
+
+            // Clear all entities related to the user from the database.
+            if (user.ProfileImage != null)
+            {
+                dbContext.Remove(user.ProfileImage);
             }
 
+            dbContext.RemoveRange(user.Permissions);
+            dbContext.RemoveRange(user.Preferences);
+            dbContext.RemoveRange(user.AccessSchedules);
             dbContext.Users.Remove(user);
             dbContext.SaveChanges();
             OnUserDeleted?.Invoke(this, new GenericEventArgs<User>(user));
diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 131def5542..6e9d788dc1 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -365,15 +365,8 @@ namespace MediaBrowser.Api
 
         public Task DeleteAsync(DeleteUser request)
         {
-            var user = _userManager.GetUserById(request.Id);
-
-            if (user == null)
-            {
-                throw new ResourceNotFoundException("User not found");
-            }
-
-            _sessionMananger.RevokeUserTokens(user.Id, null);
-            _userManager.DeleteUser(user);
+            _userManager.DeleteUser(request.Id);
+            _sessionMananger.RevokeUserTokens(request.Id, null);
             return Task.CompletedTask;
         }
 
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index fe3e4f9e68..4ff3cee0f0 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -111,8 +111,8 @@ namespace MediaBrowser.Controller.Library
         /// <summary>
         /// Deletes the specified user.
         /// </summary>
-        /// <param name="user">The user to be deleted.</param>
-        void DeleteUser(User user);
+        /// <param name="userId">The if of the user to be deleted.</param>
+        void DeleteUser(Guid userId);
 
         /// <summary>
         /// Resets the password.

From 2967dd6afd158fc278697fa593852de45e99b84a Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Wed, 24 Jun 2020 20:36:58 -0400
Subject: [PATCH 2/3] Change to ResourceNotFoundException

---
 Jellyfin.Server.Implementations/Users/UserManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jellyfin.Server.Implementations/Users/UserManager.cs b/Jellyfin.Server.Implementations/Users/UserManager.cs
index d86b25f81e..ae5c311bf2 100644
--- a/Jellyfin.Server.Implementations/Users/UserManager.cs
+++ b/Jellyfin.Server.Implementations/Users/UserManager.cs
@@ -12,6 +12,7 @@ using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
 using MediaBrowser.Common;
 using MediaBrowser.Common.Cryptography;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Authentication;
 using MediaBrowser.Controller.Drawing;
@@ -198,7 +199,7 @@ namespace Jellyfin.Server.Implementations.Users
             var user = dbContext.Users.Find(userId);
             if (user == null)
             {
-                throw new ArgumentNullException(nameof(userId));
+                throw new ResourceNotFoundException(nameof(userId));
             }
 
             if (dbContext.Users.Find(user.Id) == null)

From 5ee419ebe4ada7de98f877daa49dfc1755b375ef Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Wed, 24 Jun 2020 21:07:39 -0400
Subject: [PATCH 3/3] Fix typo

---
 MediaBrowser.Controller/Library/IUserManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index 4ff3cee0f0..e73fe71205 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -111,7 +111,7 @@ namespace MediaBrowser.Controller.Library
         /// <summary>
         /// Deletes the specified user.
         /// </summary>
-        /// <param name="userId">The if of the user to be deleted.</param>
+        /// <param name="userId">The id of the user to be deleted.</param>
         void DeleteUser(Guid userId);
 
         /// <summary>