Merge from master & fix conflict

1 files changed, 0 insertions, 54 deletions

diff --git a/Emby.Server.Implementations/Library/InvalidAuthProvider.cs b/Emby.Server.Implementations/Library/InvalidAuthProvider.cs
deleted file mode 100644
index dc61aacd7..000000000
--- a/Emby.Server.Implementations/Library/InvalidAuthProvider.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Authentication;
-using MediaBrowser.Controller.Entities;
-
-namespace Emby.Server.Implementations.Library
-{
-    /// <summary>
-    /// An invalid authentication provider.
-    /// </summary>
-    public class InvalidAuthProvider : IAuthenticationProvider
-    {
-        /// <inheritdoc />
-        public string Name => "InvalidOrMissingAuthenticationProvider";
-
-        /// <inheritdoc />
-        public bool IsEnabled => true;
-
-        /// <inheritdoc />
-        public Task<ProviderAuthenticationResult> Authenticate(string username, string password)
-        {
-            throw new AuthenticationException("User Account cannot login with this provider. The Normal provider for this user cannot be found");
-        }
-
-        /// <inheritdoc />
-        public bool HasPassword(User user)
-        {
-            return true;
-        }
-
-        /// <inheritdoc />
-        public Task ChangePassword(User user, string newPassword)
-        {
-            return Task.CompletedTask;
-        }
-
-        /// <inheritdoc />
-        public void ChangeEasyPassword(User user, string newPassword, string newPasswordHash)
-        {
-            // Nothing here
-        }
-
-        /// <inheritdoc />
-        public string GetPasswordHash(User user)
-        {
-            return string.Empty;
-        }
-
-        /// <inheritdoc />
-        public string GetEasyPasswordHash(User user)
-        {
-            return string.Empty;
-        }
-    }
-}