update home sections
This commit is contained in:
parent
fd71890247
commit
ccb694a89a
|
@ -182,7 +182,7 @@ namespace Emby.Server.Implementations.Library
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<bool> AuthenticateUser(string username, string passwordSha1, string remoteEndPoint)
|
public Task<User> AuthenticateUser(string username, string passwordSha1, string remoteEndPoint)
|
||||||
{
|
{
|
||||||
return AuthenticateUser(username, passwordSha1, null, remoteEndPoint);
|
return AuthenticateUser(username, passwordSha1, null, remoteEndPoint);
|
||||||
}
|
}
|
||||||
|
@ -226,7 +226,7 @@ namespace Emby.Server.Implementations.Library
|
||||||
return builder.ToString();
|
return builder.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<bool> AuthenticateUser(string username, string passwordSha1, string passwordMd5, string remoteEndPoint)
|
public async Task<User> AuthenticateUser(string username, string passwordSha1, string passwordMd5, string remoteEndPoint)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(username))
|
if (string.IsNullOrWhiteSpace(username))
|
||||||
{
|
{
|
||||||
|
@ -307,7 +307,7 @@ namespace Emby.Server.Implementations.Library
|
||||||
|
|
||||||
_logger.Info("Authentication request for {0} {1}.", user.Name, success ? "has succeeded" : "has been denied");
|
_logger.Info("Authentication request for {0} {1}.", user.Name, success ? "has succeeded" : "has been denied");
|
||||||
|
|
||||||
return success;
|
return success ? user : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task UpdateInvalidLoginAttemptCount(User user, int newValue)
|
private async Task UpdateInvalidLoginAttemptCount(User user, int newValue)
|
||||||
|
|
|
@ -227,11 +227,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
|
||||||
throw new LiveTvConflictException();
|
throw new LiveTvConflictException();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected virtual bool EnableMediaProbing
|
|
||||||
{
|
|
||||||
get { return false; }
|
|
||||||
}
|
|
||||||
|
|
||||||
protected async Task<bool> IsAvailable(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
|
protected async Task<bool> IsAvailable(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|
|
@ -1404,12 +1404,14 @@ namespace Emby.Server.Implementations.Session
|
||||||
{
|
{
|
||||||
var result = await _userManager.AuthenticateUser(request.Username, request.PasswordSha1, request.PasswordMd5, request.RemoteEndPoint).ConfigureAwait(false);
|
var result = await _userManager.AuthenticateUser(request.Username, request.PasswordSha1, request.PasswordMd5, request.RemoteEndPoint).ConfigureAwait(false);
|
||||||
|
|
||||||
if (!result)
|
if (result == null)
|
||||||
{
|
{
|
||||||
EventHelper.FireEventIfNotNull(AuthenticationFailed, this, new GenericEventArgs<AuthenticationRequest>(request), _logger);
|
EventHelper.FireEventIfNotNull(AuthenticationFailed, this, new GenericEventArgs<AuthenticationRequest>(request), _logger);
|
||||||
|
|
||||||
throw new SecurityException("Invalid user or password entered.");
|
throw new SecurityException("Invalid user or password entered.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
user = result;
|
||||||
}
|
}
|
||||||
|
|
||||||
var token = await GetAuthorizationToken(user.Id.ToString("N"), request.DeviceId, request.App, request.AppVersion, request.DeviceName).ConfigureAwait(false);
|
var token = await GetAuthorizationToken(user.Id.ToString("N"), request.DeviceId, request.App, request.AppVersion, request.DeviceName).ConfigureAwait(false);
|
||||||
|
|
|
@ -461,7 +461,7 @@ namespace MediaBrowser.Api
|
||||||
{
|
{
|
||||||
var success = await _userManager.AuthenticateUser(user.Name, request.CurrentPassword, Request.RemoteIp).ConfigureAwait(false);
|
var success = await _userManager.AuthenticateUser(user.Name, request.CurrentPassword, Request.RemoteIp).ConfigureAwait(false);
|
||||||
|
|
||||||
if (!success)
|
if (success != null)
|
||||||
{
|
{
|
||||||
throw new ArgumentException("Invalid user or password entered.");
|
throw new ArgumentException("Invalid user or password entered.");
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,7 +66,7 @@ namespace MediaBrowser.Controller.Library
|
||||||
/// <param name="remoteEndPoint">The remote end point.</param>
|
/// <param name="remoteEndPoint">The remote end point.</param>
|
||||||
/// <returns>Task{System.Boolean}.</returns>
|
/// <returns>Task{System.Boolean}.</returns>
|
||||||
/// <exception cref="System.ArgumentNullException">user</exception>
|
/// <exception cref="System.ArgumentNullException">user</exception>
|
||||||
Task<bool> AuthenticateUser(string username, string passwordSha1, string remoteEndPoint);
|
Task<User> AuthenticateUser(string username, string passwordSha1, string remoteEndPoint);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Refreshes metadata for each user
|
/// Refreshes metadata for each user
|
||||||
|
@ -164,7 +164,7 @@ namespace MediaBrowser.Controller.Library
|
||||||
/// <param name="passwordMd5">The password MD5.</param>
|
/// <param name="passwordMd5">The password MD5.</param>
|
||||||
/// <param name="remoteEndPoint">The remote end point.</param>
|
/// <param name="remoteEndPoint">The remote end point.</param>
|
||||||
/// <returns>Task<System.Boolean>.</returns>
|
/// <returns>Task<System.Boolean>.</returns>
|
||||||
Task<bool> AuthenticateUser(string username, string passwordSha1, string passwordMd5, string remoteEndPoint);
|
Task<User> AuthenticateUser(string username, string passwordSha1, string passwordMd5, string remoteEndPoint);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Starts the forgot password process.
|
/// Starts the forgot password process.
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.10.6")]
|
[assembly: AssemblyVersion("3.2.10.7")]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user