alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-05 07:18:47 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fix web socket session creation

Browse Source
This commit is contained in:
Luke Pulverenti
2016-09-14 17:34:19 -04:00
parent 0c95297269
commit d95c0e8324
5 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MediaBrowser.Server.Implementations/Session/SessionManager.cs
View File

@@ -1341,8 +1341,19 @@ namespace MediaBrowser.Server.Implementations.Session
private async Task<AuthenticationResult> AuthenticateNewSessionInternal(AuthenticationRequest request, bool enforcePassword)
{
var user = _userManager.Users
.FirstOrDefault(i => string.Equals(request.Username, i.Name, StringComparison.OrdinalIgnoreCase));
User user = null;
if (!string.IsNullOrWhiteSpace(request.UserId))
{
var idGuid = new Guid(request.UserId);
user = _userManager.Users
.FirstOrDefault(i => i.Id == idGuid);
}
if (user == null)
{
user = _userManager.Users
.FirstOrDefault(i => string.Equals(request.Username, i.Name, StringComparison.OrdinalIgnoreCase));
}
if (user != null && !string.IsNullOrWhiteSpace(request.DeviceId))
{