alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 17:44:43 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

update session listener

Browse Source
This commit is contained in:
Luke Pulverenti
2015-03-16 12:47:14 -04:00
parent 3c92842bce
commit f988539e13
3 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1687,16 +1687,11 @@ namespace MediaBrowser.Server.Implementations.Session
AccessToken = token
});
if (result.Items.Length == 0)
{
return null;
}
var info = result.Items[0];
var info = result.Items.FirstOrDefault();
if (info == null)
{
return null;
return Task.FromResult<SessionInfo>(null);
}
return GetSessionByAuthenticationToken(info, deviceId, remoteEndpoint, null);

8
MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
View File

@@ -85,7 +85,8 @@ namespace MediaBrowser.Server.Implementations.Session
async void _httpServer_WebSocketConnecting(object sender, WebSocketConnectingEventArgs e)
{
if (e.QueryString.AllKeys.Contains("api_key", StringComparer.OrdinalIgnoreCase))
var token = e.QueryString["api_key"];
if (!string.IsNullOrWhiteSpace(token))
{
var session = await GetSession(e.QueryString, e.Endpoint).ConfigureAwait(false);
@@ -98,6 +99,11 @@ namespace MediaBrowser.Server.Implementations.Session
private Task<SessionInfo> GetSession(NameValueCollection queryString, string remoteEndpoint)
{
if (queryString == null)
{
throw new ArgumentNullException("queryString");
}
var token = queryString["api_key"];
if (string.IsNullOrWhiteSpace(token))
{