starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-22 16:54:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update to 3.5.2 and .net core 2.1

Browse Source
This commit is contained in:
stefan
2018-09-12 19:26:21 +02:00
parent c32d865638
commit 48facb797e
1419 changed files with 27525 additions and 88927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Emby.Server.Implementations/HttpServer/Security/SessionContext.cs
View File

@@ -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);
}