Merge pull request #8927 from nielsvanvelzen/auth-depr

pull/8926/head
Claus Vium 2 years ago committed by GitHub
commit b015679267
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -157,7 +157,6 @@ namespace Jellyfin.Api.Controllers
/// </summary>
/// <param name="userId">The user id.</param>
/// <param name="pw">The password as plain text.</param>
/// <param name="password">The password sha1-hash.</param>
/// <response code="200">User authenticated.</response>
/// <response code="403">Sha1-hashed password only is not allowed.</response>
/// <response code="404">User not found.</response>
@ -166,10 +165,10 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status403Forbidden)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
[Obsolete("Authenticate with username instead")]
public async Task<ActionResult<AuthenticationResult>> AuthenticateUser(
[FromRoute, Required] Guid userId,
[FromQuery, Required] string pw,
[FromQuery] string? password)
[FromQuery, Required] string pw)
{
var user = _userManager.GetUserById(userId);
@ -178,11 +177,6 @@ namespace Jellyfin.Api.Controllers
return NotFound("User not found");
}
if (!string.IsNullOrEmpty(password) && string.IsNullOrEmpty(pw))
{
return StatusCode(StatusCodes.Status403Forbidden, "Only sha1 password is not allowed.");
}
AuthenticateUserByName request = new AuthenticateUserByName
{
Username = user.Username,

@ -1,6 +1,4 @@
using System;
namespace Jellyfin.Api.Models.UserDtos
namespace Jellyfin.Api.Models.UserDtos
{
/// <summary>
/// The authenticate user by name request body.
@ -16,11 +14,5 @@ namespace Jellyfin.Api.Models.UserDtos
/// Gets or sets the plain text password.
/// </summary>
public string? Pw { get; set; }
/// <summary>
/// Gets or sets the sha1-hashed password.
/// </summary>
[Obsolete("Send password using pw field")]
public string? Password { get; set; }
}
}

Loading…
Cancel
Save