michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #4711 from barronpm/api-fixes

Browse Source 
Add required attributes to parameters
This commit is contained in:
Claus Vium 2020-12-08 08:36:32 +01:00 committed by GitHub
commit 4c199ac9a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Jellyfin.Api/Controllers/UserController.cs
View File

@ -267,7 +267,7 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(StatusCodes.Status404NotFound)] [ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult> UpdateUserPassword( public async Task<ActionResult> UpdateUserPassword(
[FromRoute, Required] Guid userId, [FromRoute, Required] Guid userId,
[FromBody] UpdateUserPassword request) [FromBody, Required] UpdateUserPassword request)
{ {
if (!RequestHelpers.AssertCanUpdateUser(_authContext, HttpContext.Request, userId, true)) if (!RequestHelpers.AssertCanUpdateUser(_authContext, HttpContext.Request, userId, true))
{ {
@ -325,7 +325,7 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(StatusCodes.Status404NotFound)] [ProducesResponseType(StatusCodes.Status404NotFound)]
public ActionResult UpdateUserEasyPassword( public ActionResult UpdateUserEasyPassword(
[FromRoute, Required] Guid userId, [FromRoute, Required] Guid userId,
[FromBody] UpdateUserEasyPassword request) [FromBody, Required] UpdateUserEasyPassword request)
{ {
if (!RequestHelpers.AssertCanUpdateUser(_authContext, HttpContext.Request, userId, true)) if (!RequestHelpers.AssertCanUpdateUser(_authContext, HttpContext.Request, userId, true))
{ {
@ -367,13 +367,8 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(StatusCodes.Status403Forbidden)] [ProducesResponseType(StatusCodes.Status403Forbidden)]
public async Task<ActionResult> UpdateUser( public async Task<ActionResult> UpdateUser(
[FromRoute, Required] Guid userId, [FromRoute, Required] Guid userId,
[FromBody] UserDto updateUser) [FromBody, Required] UserDto updateUser)
{ {
if (updateUser == null)
{
return BadRequest();
}
if (!RequestHelpers.AssertCanUpdateUser(_authContext, HttpContext.Request, userId, false)) if (!RequestHelpers.AssertCanUpdateUser(_authContext, HttpContext.Request, userId, false))
{ {
return Forbid("User update not allowed."); return Forbid("User update not allowed.");
@ -407,13 +402,8 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(StatusCodes.Status403Forbidden)] [ProducesResponseType(StatusCodes.Status403Forbidden)]
public async Task<ActionResult> UpdateUserPolicy( public async Task<ActionResult> UpdateUserPolicy(
[FromRoute, Required] Guid userId, [FromRoute, Required] Guid userId,
[FromBody] UserPolicy newPolicy) [FromBody, Required] UserPolicy newPolicy)
{ {
if (newPolicy == null)
{
return BadRequest();
}
var user = _userManager.GetUserById(userId); var user = _userManager.GetUserById(userId);
// If removing admin access // If removing admin access
@ -462,7 +452,7 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(StatusCodes.Status403Forbidden)] [ProducesResponseType(StatusCodes.Status403Forbidden)]
public async Task<ActionResult> UpdateUserConfiguration( public async Task<ActionResult> UpdateUserConfiguration(
[FromRoute, Required] Guid userId, [FromRoute, Required] Guid userId,
[FromBody] UserConfiguration userConfig) [FromBody, Required] UserConfiguration userConfig)
{ {
if (!RequestHelpers.AssertCanUpdateUser(_authContext, HttpContext.Request, userId, false)) if (!RequestHelpers.AssertCanUpdateUser(_authContext, HttpContext.Request, userId, false))
{ {
@ -483,7 +473,7 @@ namespace Jellyfin.Api.Controllers
[HttpPost("New")] [HttpPost("New")]
[Authorize(Policy = Policies.RequiresElevation)] [Authorize(Policy = Policies.RequiresElevation)]
[ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status200OK)]
public async Task<ActionResult<UserDto>> CreateUserByName([FromBody] CreateUserByName request) public async Task<ActionResult<UserDto>> CreateUserByName([FromBody, Required] CreateUserByName request)
{ {
var newUser = await _userManager.CreateUserAsync(request.Name).ConfigureAwait(false); var newUser = await _userManager.CreateUserAsync(request.Name).ConfigureAwait(false);