diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2018-12-10 20:30:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-10 20:30:45 -0500 |
| commit | 191f7163a0c1688bf079a01d835af4aac10ca060 (patch) | |
| tree | c7d21926b5858e18fbadb0af0bf6a92f49de43c8 /Emby.Server.Implementations/Library/UserManager.cs | |
| parent | 59750496d590b06b80cf781817d77031b1749d4e (diff) | |
| parent | 7c2248727aec0d407ca5ad811b8c86b4efc1c19c (diff) | |
Merge pull request #22 from nvllsvm/byeprop1
Remove some proprietary libs
Diffstat (limited to 'Emby.Server.Implementations/Library/UserManager.cs')
| -rw-r--r-- | Emby.Server.Implementations/Library/UserManager.cs | 38 |
1 files changed, 1 insertions, 37 deletions
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 +} |
