Merge pull request #5892 from crobibero/password-obsolete
This commit is contained in:
commit
1a54338e38
|
@ -1485,7 +1485,7 @@ namespace Emby.Server.Implementations.Session
|
|||
user = await _userManager.AuthenticateUser(
|
||||
request.Username,
|
||||
request.Password,
|
||||
request.PasswordSha1,
|
||||
null,
|
||||
request.RemoteEndPoint,
|
||||
true).ConfigureAwait(false);
|
||||
}
|
||||
|
|
|
@ -177,11 +177,9 @@ namespace Jellyfin.Api.Controllers
|
|||
return StatusCode(StatusCodes.Status403Forbidden, "Only sha1 password is not allowed.");
|
||||
}
|
||||
|
||||
// Password should always be null
|
||||
AuthenticateUserByName request = new AuthenticateUserByName
|
||||
{
|
||||
Username = user.Username,
|
||||
Password = null,
|
||||
Pw = pw
|
||||
};
|
||||
return await AuthenticateUserByName(request).ConfigureAwait(false);
|
||||
|
@ -208,7 +206,6 @@ namespace Jellyfin.Api.Controllers
|
|||
DeviceId = auth.DeviceId,
|
||||
DeviceName = auth.Device,
|
||||
Password = request.Pw,
|
||||
PasswordSha1 = request.Password,
|
||||
RemoteEndPoint = HttpContext.GetNormalizedRemoteIp().ToString(),
|
||||
Username = request.Username
|
||||
}).ConfigureAwait(false);
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
namespace Jellyfin.Api.Models.UserDtos
|
||||
using System;
|
||||
|
||||
namespace Jellyfin.Api.Models.UserDtos
|
||||
{
|
||||
/// <summary>
|
||||
/// The authenticate user by name request body.
|
||||
|
@ -18,6 +20,7 @@
|
|||
/// <summary>
|
||||
/// Gets or sets the sha1-hashed password.
|
||||
/// </summary>
|
||||
[Obsolete("Send password using pw field")]
|
||||
public string? Password { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,6 +12,7 @@ namespace MediaBrowser.Controller.Session
|
|||
|
||||
public string Password { get; set; }
|
||||
|
||||
[Obsolete("Send full password in Password field")]
|
||||
public string PasswordSha1 { get; set; }
|
||||
|
||||
public string App { get; set; }
|
||||
|
|
Loading…
Reference in New Issue
Block a user