Merge remote-tracking branch 'upstream/master' into api-upload-subtitle

1 files changed, 8 insertions, 4 deletions

diff --git a/MediaBrowser.Controller/Net/ISessionContext.cs b/MediaBrowser.Controller/Net/ISessionContext.cs
index 5c3c19f6b..a60dc2ea1 100644
--- a/MediaBrowser.Controller/Net/ISessionContext.cs
+++ b/MediaBrowser.Controller/Net/ISessionContext.cs
@@ -1,15 +1,19 @@
-using MediaBrowser.Controller.Entities;
+#pragma warning disable CS1591
+
+using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.Services;
+using Microsoft.AspNetCore.Http;
 
 namespace MediaBrowser.Controller.Net
 {
     public interface ISessionContext
     {
         SessionInfo GetSession(object requestContext);
+
         User GetUser(object requestContext);
 
-        SessionInfo GetSession(IRequest requestContext);
-        User GetUser(IRequest requestContext);
+        SessionInfo GetSession(HttpContext requestContext);
+
+        User GetUser(HttpContext requestContext);
     }
 }