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

update dependencies

Browse Source
This commit is contained in:
Luke Pulverenti
2014-07-09 23:48:08 -04:00
parent 9b8c0d68ce
commit 3cfd765cb4
14 changed files with 88 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
MediaBrowser.Api/UserService.cs
View File

@@ -1,4 +1,5 @@
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net;
@@ -166,6 +167,7 @@ namespace MediaBrowser.Api
private readonly IUserManager _userManager;
private readonly IDtoService _dtoService;
private readonly ISessionManager _sessionMananger;
private readonly IServerConfigurationManager _config;
public IAuthorizationContext AuthorizationContext { get; set; }
@@ -176,25 +178,34 @@ namespace MediaBrowser.Api
/// <param name="dtoService">The dto service.</param>
/// <param name="sessionMananger">The session mananger.</param>
/// <exception cref="System.ArgumentNullException">xmlSerializer</exception>
public UserService(IUserManager userManager, IDtoService dtoService, ISessionManager sessionMananger)
public UserService(IUserManager userManager, IDtoService dtoService, ISessionManager sessionMananger, IServerConfigurationManager config)
{
_userManager = userManager;
_dtoService = dtoService;
_sessionMananger = sessionMananger;
_config = config;
}
public object Get(GetPublicUsers request)
{
if (!Request.IsLocal && !_sessionMananger.IsLocal(Request.RemoteIp))
if (Request.IsLocal || !_config.Configuration.IsStartupWizardCompleted)
{
return ToOptimizedResult(new List<UserDto>());
return Get(new GetUsers
{
IsDisabled = false
});
}
return Get(new GetUsers
if (_sessionMananger.IsLocal(Request.RemoteIp))
{
IsHidden = false,
IsDisabled = false
});
return Get(new GetUsers
{
IsHidden = false,
IsDisabled = false
});
}
return ToOptimizedResult(new List<UserDto>());
}
/// <summary>