aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
diff options
context:
space:
mode:
authorVasily <JustAMan@users.noreply.github.com>2019-11-27 11:50:06 +0300
committerGitHub <noreply@github.com>2019-11-27 11:50:06 +0300
commit5263aaa026ed9789e77ba2dee4b9e15077dcea7a (patch)
tree8f82e91993c393ba2eda2815f19389eccfcc75b0 /Emby.Server.Implementations/Session/SessionWebSocketListener.cs
parentc45d54efb2352a504a66fe5f5b2df01a55cde8f6 (diff)
parent080b1069914cdca8a4e342ce9fa0a58578248420 (diff)
Merge pull request #1503 from cvium/webapi_v2
Move StartupWizard to ASP.NET Web Api
Diffstat (limited to 'Emby.Server.Implementations/Session/SessionWebSocketListener.cs')
-rw-r--r--Emby.Server.Implementations/Session/SessionWebSocketListener.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Session/SessionWebSocketListener.cs b/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
index 63ec75762..930f2d35d 100644
--- a/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -4,7 +4,6 @@ using MediaBrowser.Controller.Net;
using MediaBrowser.Controller.Session;
using MediaBrowser.Model.Events;
using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Services;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
@@ -67,7 +66,7 @@ namespace Emby.Server.Implementations.Session
{
if (queryString == null)
{
- throw new ArgumentNullException(nameof(queryString));
+ return null;
}
var token = queryString["api_key"];
@@ -75,6 +74,7 @@ namespace Emby.Server.Implementations.Session
{
return null;
}
+
var deviceId = queryString["deviceId"];
return _sessionManager.GetSessionByAuthenticationToken(token, deviceId, remoteEndpoint);
}