alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-31 12:58:28 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into authenticationdb-efcore

Browse Source 
# Conflicts:
#	Jellyfin.Api/Helpers/RequestHelpers.cs
This commit is contained in:
Patrick Barron
2021-05-18 18:09:46 -04:00
parent 12fa5c0c41 88a7875a27
commit a225f34796
618 changed files with 6419 additions and 3479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Emby.Server.Implementations/Session/SessionManager.cs
View File

@@ -1454,17 +1454,14 @@ namespace Emby.Server.Implementations.Session
user = _userManager.GetUserById(request.UserId);
}
if (user == null)
{
user = _userManager.GetUserByName(request.Username);
}
user ??= _userManager.GetUserByName(request.Username);
if (enforcePassword)
{
user = await _userManager.AuthenticateUser(
request.Username,
request.Password,
request.PasswordSha1,
null,
request.RemoteEndPoint,
true).ConfigureAwait(false);
}