Merge branch 'userdb-efcore' of https://github.com/barronpm/jellyfin into userdb-efcore

2 files changed, 0 insertions, 48 deletions

diff --git a/Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs b/Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
index 4261f5b18..b0c02030e 100644
--- a/Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
+++ b/Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
@@ -135,52 +135,5 @@ namespace Jellyfin.Server.Implementations.Users
                 ? null
                 : Hex.Encode(PasswordHash.Parse(user.EasyPassword).Hash);
         }
-
-        /// <summary>
-        /// Hashes the provided string.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <param name="str">The string to hash.</param>
-        /// <returns>The hashed string.</returns>
-        public string GetHashedString(User user, string str)
-        {
-            if (string.IsNullOrEmpty(user.Password))
-            {
-                return _cryptographyProvider.CreatePasswordHash(str).ToString();
-            }
-
-            // TODO: make use of iterations parameter?
-            PasswordHash passwordHash = PasswordHash.Parse(user.Password);
-            var salt = passwordHash.Salt.ToArray();
-            return new PasswordHash(
-                passwordHash.Id,
-                _cryptographyProvider.ComputeHash(
-                    passwordHash.Id,
-                    Encoding.UTF8.GetBytes(str),
-                    salt),
-                salt,
-                passwordHash.Parameters.ToDictionary(x => x.Key, y => y.Value)).ToString();
-        }
-
-        /// <summary>
-        /// Hashes the provided string.
-        /// </summary>
-        /// <param name="user">The user.</param>
-        /// <param name="str">The string to hash.</param>
-        /// <returns>The hashed string.</returns>
-        public ReadOnlySpan<byte> GetHashed(User user, string str)
-        {
-            if (string.IsNullOrEmpty(user.Password))
-            {
-                return _cryptographyProvider.CreatePasswordHash(str).Hash;
-            }
-
-            // TODO: make use of iterations parameter?
-            PasswordHash passwordHash = PasswordHash.Parse(user.Password);
-            return _cryptographyProvider.ComputeHash(
-                    passwordHash.Id,
-                    Encoding.UTF8.GetBytes(str),
-                    passwordHash.Salt.ToArray());
-        }
     }
 }
diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index 152d525b0..2fd27d3b9 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Xml.Serialization;
 using Jellyfin.Data.Enums;
-using MediaBrowser.Model.Configuration;
 using AccessSchedule = Jellyfin.Data.Entities.AccessSchedule;
 
 namespace MediaBrowser.Model.Users