starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-14 13:03:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
crobibero
2020-08-03 12:01:24 -06:00
parent f915c3e5d9
commit dbeeb7cf4a
8 changed files with 236 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -455,7 +455,7 @@ namespace Jellyfin.Api.Controllers
[ProducesResponseType(StatusCodes.Status200OK)]
public async Task<ActionResult<UserDto>> CreateUserByName([FromBody] CreateUserByName request)
{
var newUser = _userManager.CreateUser(request.Name);
var newUser = await _userManager.CreateUserAsync(request.Name).ConfigureAwait(false);
// no need to authenticate password for new user
if (request.Password != null)