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

2nd half of changes

Browse Source
This commit is contained in:
Patrick Barron
2020-05-12 22:25:45 -04:00
parent c1360a1dc3 bac4bf96a0
commit b7621d762c
14 changed files with 211 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Api/UserService.cs
View File

@@ -276,12 +276,12 @@ namespace MediaBrowser.Api
{
var result = _userManager
.Users
.Where(item => !item.Policy.IsDisabled);
.Where(item => !item.HasPermission(PermissionKind.IsDisabled));
if (ServerConfigurationManager.Configuration.IsStartupWizardCompleted)
{
var deviceId = _authContext.GetAuthorizationInfo(Request).DeviceId;
result = result.Where(item => !item.Policy.IsHidden);
result = result.Where(item => !item.HasPermission(PermissionKind.IsHidden));
if (!string.IsNullOrWhiteSpace(deviceId))
{
@@ -290,12 +290,12 @@ namespace MediaBrowser.Api
if (!_networkManager.IsInLocalNetwork(Request.RemoteIp))
{
result = result.Where(i => i.Policy.EnableRemoteAccess);
result = result.Where(i => i.HasPermission(PermissionKind.EnableRemoteAccess));
}
}
return ToOptimizedResult(result
.OrderBy(u => u.Name)
.OrderBy(u => u.Username)
.Select(i => _userManager.GetPublicUserDto(i, Request.RemoteIp))
.ToArray()
);