diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs index bcaf80d69c..d5266038b7 100644 --- a/MediaBrowser.Api/UserService.cs +++ b/MediaBrowser.Api/UserService.cs @@ -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 /// The dto service. /// The session mananger. /// xmlSerializer - 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()); + 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()); } /// diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj index f06d1bc672..f6651a9e30 100644 --- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj +++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj @@ -48,9 +48,9 @@ Always - + False - ..\packages\NLog.3.0.0.0\lib\net45\NLog.dll + ..\packages\NLog.3.1.0.0\lib\net45\NLog.dll False diff --git a/MediaBrowser.Common.Implementations/packages.config b/MediaBrowser.Common.Implementations/packages.config index f00c85d717..71d9749da7 100644 --- a/MediaBrowser.Common.Implementations/packages.config +++ b/MediaBrowser.Common.Implementations/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index 91c1508fc1..326b865462 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -42,20 +42,23 @@ - ..\packages\Microsoft.Bcl.Async.1.0.16\lib\portable-net40+sl4+win8+wp71\Microsoft.Threading.Tasks.dll + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.dll - ..\packages\Microsoft.Bcl.Async.1.0.16\lib\portable-net40+sl4+win8+wp71\Microsoft.Threading.Tasks.Extensions.dll + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\portable-net40+sl4+win8+wp71+wpa81\Microsoft.Threading.Tasks.Extensions.dll ..\packages\PropertyChanged.Fody.1.41.0.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\PropertyChanged.dll False + + ..\packages\Microsoft.Bcl.1.1.9\lib\portable-net40+sl4+win8+wp71+wpa81\System.IO.dll + - ..\packages\Microsoft.Bcl.1.0.19\lib\portable-net40+sl4+win8+wp71\System.Runtime.dll + ..\packages\Microsoft.Bcl.1.1.9\lib\portable-net40+sl4+win8+wp71+wpa81\System.Runtime.dll - ..\packages\Microsoft.Bcl.1.0.19\lib\portable-net40+sl4+win8+wp71\System.Threading.Tasks.dll + ..\packages\Microsoft.Bcl.1.1.9\lib\portable-net40+sl4+win8+wp71+wpa81\System.Threading.Tasks.dll @@ -894,8 +897,12 @@ xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\portable\" /y /d /r /i ) - + + + + +