Merge pull request #2350 from MediaBrowser/beta

Beta

1 files changed, 0 insertions, 67 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs
deleted file mode 100644
index a498d32fa..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Controller.Security;
-using MediaBrowser.Controller.Session;
-using ServiceStack.Web;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Server.Implementations.HttpServer.Security
-{
-    public class SessionContext : ISessionContext
-    {
-        private readonly IUserManager _userManager;
-        private readonly ISessionManager _sessionManager;
-        private readonly IAuthorizationContext _authContext;
-
-        public SessionContext(IUserManager userManager, IAuthorizationContext authContext, ISessionManager sessionManager)
-        {
-            _userManager = userManager;
-            _authContext = authContext;
-            _sessionManager = sessionManager;
-        }
-
-        public Task<SessionInfo> GetSession(IServiceRequest requestContext)
-        {
-            var authorization = _authContext.GetAuthorizationInfo(requestContext);
-
-            //if (!string.IsNullOrWhiteSpace(authorization.Token))
-            //{
-            //    var auth = GetTokenInfo(requestContext);
-            //    if (auth != null)
-            //    {
-            //        return _sessionManager.GetSessionByAuthenticationToken(auth, authorization.DeviceId, requestContext.RemoteIp, authorization.Version);
-            //    }
-            //}
-
-            var user = string.IsNullOrWhiteSpace(authorization.UserId) ? null : _userManager.GetUserById(authorization.UserId);
-            return _sessionManager.LogSessionActivity(authorization.Client, authorization.Version, authorization.DeviceId, authorization.Device, requestContext.RemoteIp, user);
-        }
-
-        private AuthenticationInfo GetTokenInfo(IServiceRequest request)
-        {
-            object info;
-            request.Items.TryGetValue("OriginalAuthenticationInfo", out info);
-            return info as AuthenticationInfo;
-        }
-
-        public Task<SessionInfo> GetSession(object requestContext)
-        {
-            var req = new ServiceStackServiceRequest((IRequest)requestContext);
-            return GetSession(req);
-        }
-
-        public async Task<User> GetUser(IServiceRequest requestContext)
-        {
-            var session = await GetSession(requestContext).ConfigureAwait(false);
-
-            return session == null || !session.UserId.HasValue ? null : _userManager.GetUserById(session.UserId.Value);
-        }
-
-        public Task<User> GetUser(object requestContext)
-        {
-            var req = new ServiceStackServiceRequest((IRequest)requestContext);
-            return GetUser(req);
-        }
-    }
-}