Update to 3.5.2 and .net core 2.1

1 files changed, 8 insertions, 7 deletions

diff --git a/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs b/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
index 9826a0d56..a919ce008 100644
--- a/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
+++ b/Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
@@ -5,6 +5,7 @@ using MediaBrowser.Controller.Security;
 using MediaBrowser.Controller.Session;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
+using System;
 
 namespace Emby.Server.Implementations.HttpServer.Security
 {
@@ -21,11 +22,11 @@ namespace Emby.Server.Implementations.HttpServer.Security
             _sessionManager = sessionManager;
         }
 
-        public Task<SessionInfo> GetSession(IRequest requestContext)
+        public SessionInfo GetSession(IRequest requestContext)
         {
             var authorization = _authContext.GetAuthorizationInfo(requestContext);
 
-            var user = string.IsNullOrWhiteSpace(authorization.UserId) ? null : _userManager.GetUserById(authorization.UserId);
+            var user = authorization.User;
             return _sessionManager.LogSessionActivity(authorization.Client, authorization.Version, authorization.DeviceId, authorization.Device, requestContext.RemoteIp, user);
         }
 
@@ -36,19 +37,19 @@ namespace Emby.Server.Implementations.HttpServer.Security
             return info as AuthenticationInfo;
         }
 
-        public Task<SessionInfo> GetSession(object requestContext)
+        public SessionInfo GetSession(object requestContext)
         {
             return GetSession((IRequest)requestContext);
         }
 
-        public async Task<User> GetUser(IRequest requestContext)
+        public User GetUser(IRequest requestContext)
         {
-            var session = await GetSession(requestContext).ConfigureAwait(false);
+            var session = GetSession(requestContext);
 
-            return session == null || !session.UserId.HasValue ? null : _userManager.GetUserById(session.UserId.Value);
+            return session == null || session.UserId.Equals(Guid.Empty) ? null : _userManager.GetUserById(session.UserId);
         }
 
-        public Task<User> GetUser(object requestContext)
+        public User GetUser(object requestContext)
         {
             return GetUser((IRequest)requestContext);
         }