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

recursively build out member groups

Browse Source
This commit is contained in:
Kyle Spearrin
2017-05-12 18:07:11 -04:00
parent a7d9b0db42
commit f3646aa1e6
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Models/Entry.cs
View File

@@ -18,11 +18,11 @@ namespace Bit.Core.Models
public string Name { get; set; } public string Name { get; set; }
public HashSet<string> Members { get; set; } = new HashSet<string>(); public HashSet<string> Members { get; set; } = new HashSet<string>();
public List<GroupEntry> GroupMembers { get; set; } = new List<GroupEntry>(); public List<GroupEntry> GroupMembers { get; set; } = new List<GroupEntry>();
public List<UserEntry> UserMembers { get; set; } = new List<UserEntry>();
} }
public class UserEntry : Entry public class UserEntry : Entry
{ {
public string Email { get; set; } public string Email { get; set; }
public List<GroupEntry> Groups { get; set; } = new List<GroupEntry>();
} }
} }

16
src/Core/Utilities/Sync.cs
View File

@@ -168,12 +168,12 @@ namespace Bit.Core.Utilities
users = await SyncUsersAsync(); users = await SyncUsersAsync();
} }
AssociateMembers(ref groups, ref users); AssociateGroups(groups, users);
} }
private static void AssociateMembers(ref List<GroupEntry> groups, ref List<UserEntry> users) private static void AssociateGroups(List<GroupEntry> groups, List<UserEntry> users)
{ {
if(groups == null) if(groups == null || !groups.Any())
{ {
return; return;
} }
@@ -186,12 +186,16 @@ namespace Bit.Core.Utilities
if(users != null) if(users != null)
{ {
group.UserMembers = users.Where(u => group.Members.Contains(u.DistinguishedName)).ToList(); var usersInThisGroup = users.Where(u => group.Members.Contains(u.DistinguishedName)).ToList();
foreach(var user in usersInThisGroup)
{
user.Groups.Add(group);
}
} }
AssociateGroups(group.GroupMembers, users);
} }
} }
// TODO: Handle nested group associations with recursion
} }
private static DateTime? ParseDate(ResultPropertyCollection collection, string dateKey) private static DateTime? ParseDate(ResultPropertyCollection collection, string dateKey)