bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-05 23:53:21 +00:00
Code Issues Releases Wiki Activity

filter users from filtered groups

Browse Source
This commit is contained in:
Kyle Spearrin
2017-12-12 15:55:24 -05:00
parent 1e5e28e2b6
commit 2c2f1921c1
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/Services/AzureDirectoryService.cs
View File

@@ -57,13 +57,20 @@ namespace Bit.Core.Services
List<GroupEntry> groups = null; List<GroupEntry> groups = null;
if(SettingsService.Instance.Sync.SyncGroups) if(SettingsService.Instance.Sync.SyncGroups)
{ {
groups = await GetGroupsAsync(force || (users?.Any(u => !u.Deleted && !u.Disabled) ?? false)); var filter = CreateSetFromFilter(SettingsService.Instance.Sync.GroupFilter);
groups = await GetGroupsAsync(force || (users?.Any(u => !u.Deleted && !u.Disabled) ?? false), filter);
if(filter != null && users != null)
{
users = users.Where(u => u.Disabled || u.Deleted ||
groups.Any(g => g.UserMemberExternalIds.Contains(u.ExternalId))).ToList();
}
} }
return new Tuple<List<GroupEntry>, List<UserEntry>>(groups, users); return new Tuple<List<GroupEntry>, List<UserEntry>>(groups, users);
} }
private async static Task<List<GroupEntry>> GetGroupsAsync(bool force = false) private async static Task<List<GroupEntry>> GetGroupsAsync(bool force, Tuple<bool, HashSet<string>> filter)
{ {
if(!SettingsService.Instance.Sync.SyncGroups) if(!SettingsService.Instance.Sync.SyncGroups)
{ {
@@ -88,7 +95,6 @@ namespace Bit.Core.Services
var entries = new List<GroupEntry>(); var entries = new List<GroupEntry>();
var changedGroupIds = new List<string>(); var changedGroupIds = new List<string>();
var getFullResults = SettingsService.Instance.GroupDeltaToken == null || force; var getFullResults = SettingsService.Instance.GroupDeltaToken == null || force;
var filter = CreateSetFromFilter(SettingsService.Instance.Sync.GroupFilter);
try try
{ {
@@ -140,7 +146,7 @@ namespace Bit.Core.Services
} }
catch { } catch { }
if(getFullResults || (!getFullResults && !changedGroupIds.Any())) if(getFullResults || !changedGroupIds.Any())
{ {
return entries; return entries;
} }
@@ -197,7 +203,7 @@ namespace Bit.Core.Services
return entry; return entry;
} }
private async static Task<List<UserEntry>> GetUsersAsync(bool force = false) private async static Task<List<UserEntry>> GetUsersAsync(bool force)
{ {
if(!SettingsService.Instance.Sync.SyncUsers) if(!SettingsService.Instance.Sync.SyncUsers)
{ {