change authentication flow

pull/2363/head
dkanada 4 years ago
parent 6341d986a9
commit 26dd67a441

@ -1379,20 +1379,16 @@ namespace Emby.Server.Implementations.Session
user = _userManager.GetUserByName(request.Username);
}
if (user != null)
if (user == null)
{
// TODO: Move this to userManager?
if (!string.IsNullOrEmpty(request.DeviceId)
&& !_deviceManager.CanAccessDevice(user, request.DeviceId))
{
throw new SecurityException("User is not allowed access from this device.");
}
AuthenticationFailed?.Invoke(this, new GenericEventArgs<AuthenticationRequest>(request));
throw new SecurityException("Invalid username or password entered.");
}
if (user == null)
if (!string.IsNullOrEmpty(request.DeviceId)
&& !_deviceManager.CanAccessDevice(user, request.DeviceId))
{
AuthenticationFailed?.Invoke(this, new GenericEventArgs<AuthenticationRequest>(request));
throw new SecurityException("Invalid user or password entered.");
throw new SecurityException("User is not allowed access from this device.");
}
if (enforcePassword)

Loading…
Cancel
Save