Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

1 files changed, 2 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs
index f40d117c4..a498d32fa 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/Security/SessionContext.cs
@@ -34,8 +34,8 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
             //    }
             //}
 
-            var session = _sessionManager.GetSession(authorization.DeviceId, authorization.Client, authorization.Version);
-            return Task.FromResult(session);
+            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)