michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix emby/users/public not taking into account first run

Browse Source 
The previous implementation was not taking in account the first seup
phase. Now the check has been added.

A little method refactor has been done in order to make the code more
elegant.
This commit is contained in:
Davide Polonio 2020-03-03 20:20:35 +01:00
parent 737d4d2b3f
commit cd471ed4df
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
MediaBrowser.Api/UserService.cs
View File

@ -273,29 +273,31 @@ namespace MediaBrowser.Api
/// <returns>System.Object.</returns>
public object Get(GetPublicUsers request)
{
var users = _userManager
var result = _userManager
.Users
.Where(item => !item.Policy.IsDisabled)
.Where(item => !item.Policy.IsHidden);
.Where(item => !item.Policy.IsDisabled);
var deviceId = _authContext.GetAuthorizationInfo(Request).DeviceId;
if (!string.IsNullOrWhiteSpace(deviceId))
if (ServerConfigurationManager.Configuration.IsStartupWizardCompleted)
{
users = users.Where(i => _deviceManager.CanAccessDevice(i, deviceId));
var deviceId = _authContext.GetAuthorizationInfo(Request).DeviceId;
result = result.Where(item => !item.Policy.IsHidden);
if (!string.IsNullOrWhiteSpace(deviceId))
{
result = result.Where(i => _deviceManager.CanAccessDevice(i, deviceId));
}
if (!_networkManager.IsInLocalNetwork(Request.RemoteIp))
{
result = result.Where(i => i.Policy.EnableRemoteAccess);
}
}
if (!_networkManager.IsInLocalNetwork(Request.RemoteIp))
{
users = users.Where(i => i.Policy.EnableRemoteAccess);
}
var result = users
.OrderBy(u => u.Name)
.Select(i => _userManager.GetPublicUserDto(i, Request.RemoteIp))
.ToArray();
return ToOptimizedResult(result);
return ToOptimizedResult(result
.OrderBy(u => u.Name)
.Select(i => _userManager.GetPublicUserDto(i, Request.RemoteIp))
.ToArray()
);
}
/// <summary>