From 7c2248727aec0d407ca5ad811b8c86b4efc1c19c Mon Sep 17 00:00:00 2001 From: Andrew Rabert Date: Mon, 10 Dec 2018 19:27:54 -0500 Subject: Remove Emby.Server.Connect --- Emby.Server.Implementations/Library/UserManager.cs | 38 +--------------------- 1 file changed, 1 insertion(+), 37 deletions(-) (limited to 'Emby.Server.Implementations/Library/UserManager.cs') diff --git a/Emby.Server.Implementations/Library/UserManager.cs b/Emby.Server.Implementations/Library/UserManager.cs index b13a255aa..a13e8248f 100644 --- a/Emby.Server.Implementations/Library/UserManager.cs +++ b/Emby.Server.Implementations/Library/UserManager.cs @@ -272,20 +272,6 @@ namespace Emby.Server.Implementations.Library authenticationProvider = authResult.Item1; success = authResult.Item2; } - - // Maybe user accidently entered connect credentials. let's be flexible - if (!success && user.ConnectLinkType.HasValue && !string.IsNullOrWhiteSpace(user.ConnectUserName)) - { - try - { - await _connectFactory().Authenticate(user.ConnectUserName, password).ConfigureAwait(false); - success = true; - } - catch - { - - } - } } else { @@ -318,23 +304,6 @@ namespace Emby.Server.Implementations.Library } } - // Try originally entered username - if (!success && (user == null || !string.Equals(user.ConnectUserName, username, StringComparison.OrdinalIgnoreCase))) - { - try - { - var connectAuthResult = await _connectFactory().Authenticate(username, password).ConfigureAwait(false); - - user = Users.FirstOrDefault(i => string.Equals(i.ConnectUserId, connectAuthResult.User.Id, StringComparison.OrdinalIgnoreCase)); - - success = user != null; - } - catch - { - - } - } - if (user == null) { throw new SecurityException("Invalid username or password entered."); @@ -777,11 +746,6 @@ namespace Emby.Server.Implementations.Library throw new ArgumentNullException("user"); } - if (user.ConnectLinkType.HasValue) - { - await _connectFactory().RemoveConnect(user).ConfigureAwait(false); - } - var allUsers = Users.ToList(); if (allUsers.FirstOrDefault(u => u.Id == user.Id) == null) @@ -1277,4 +1241,4 @@ namespace Emby.Server.Implementations.Library } } -} \ No newline at end of file +} -- cgit v1.2.3