Various fixes for beta v3

Author: JoshuaTheMiller

source/GitHubApp/Controllers/OrchestratorController.cs

@@ -12,14 +12,14 @@ namespace GitHubApp.Controllers
     public class OrchestratorController : ControllerBase
     {        
         private readonly IGitHubFacadeFactory gitHubFacadeFactory;
-        private readonly IActiveDirectoryFacade activeDirectoryFacade;
+        private readonly IActiveDirectoryFacade activeDirectoryFacade;        
         private readonly AppOptions appOptions;
 
         public OrchestratorController(IGitHubFacadeFactory gitHubFacadeFactory, IActiveDirectoryFacade activeDirectoryFacade, IOptions<AppOptions> appOptions)
         {
             this.gitHubFacadeFactory = gitHubFacadeFactory;
             this.activeDirectoryFacade = activeDirectoryFacade;
-            this.appOptions = appOptions.Value;
+            this.appOptions = appOptions.Value;            
         }
 
         [HttpPost(Name = "Sync All Orgs")]

source/GitHubApp/Controllers/SyncController.cs

@@ -10,14 +10,14 @@ namespace GitHubApp.Controllers
     public sealed class SyncController : ControllerBase
     {
         private readonly IGitHubFacadeFactory gitHubFacadeFactory;
-        private readonly IActiveDirectoryFacade activeDirectoryFacade;
+        private readonly IActiveDirectoryFacade activeDirectoryFacade;        
         private readonly AppOptions appOptions;
 
         public SyncController(IGitHubFacadeFactory gitHubFacadeFactory, IActiveDirectoryFacade activeDirectoryFacade, IOptions<AppOptions> appOptions)
         {
             this.gitHubFacadeFactory = gitHubFacadeFactory;
             this.activeDirectoryFacade = activeDirectoryFacade;
-            this.appOptions = appOptions.Value;
+            this.appOptions = appOptions.Value;            
         }
 
         [HttpGet(Name = "Syncronize Org")]        

source/Gttsb.Gh/AppOptions.cs source/Gttsb.Core/AppOptions.cssource/Gttsb.Gh/AppOptions.cs renamed to source/Gttsb.Core/AppOptions.cs

@@ -1,4 +1,4 @@
-namespace Gttsb.Gh
+namespace Gttsb.Core
 {
     public sealed class AppOptions
     {
@@ -9,5 +9,6 @@ public sealed class AppOptions
         // Perhaps it is user error on Josh's part.
         public Dictionary<string, string> EmailReplaceRules { get; init; } = new Dictionary<string, string>();
         public string[] EmailTextToReplaceRules { get; init; } = Array.Empty<string>();
+        public string GitHubIdAppend { get; init; } = string.Empty;
     }
 }

source/Gttsb.Core/GroupSyncer.cs

@@ -1,16 +1,16 @@
 namespace Gttsb.Core
 {
-    internal sealed class GroupSyncer : IGroupSyncer
+    public sealed class GroupSyncer : IGroupSyncer
     {
         private readonly IActiveDirectoryFacade _activeDirectoryFacade;
         private readonly IInstalledGitHubFacade _gitHubFacade;
-        private readonly IEmailToCloudIdConverter _emailToGitHubIdConverter;
+        private readonly AppOptions _appOptions;
 
-        public GroupSyncer(IActiveDirectoryFacade activeDirectoryFacade, IInstalledGitHubFacade gitHubFacade, IEmailToCloudIdConverter emailToCloudIdConverter)
+        public GroupSyncer(IActiveDirectoryFacade activeDirectoryFacade, IInstalledGitHubFacade gitHubFacade, AppOptions appOptions)
         {
             _activeDirectoryFacade = activeDirectoryFacade;
             _gitHubFacade = gitHubFacade;
-            _emailToGitHubIdConverter = emailToCloudIdConverter;
+            _appOptions = appOptions;
         }
 
         public Task<GroupSyncResult> SyncronizeGroupsAsync(string gitHubOrg, IEnumerable<TeamDefinition> teams, bool createDeployment) => SyncronizeGroupsAsync(gitHubOrg, teams, true, createDeployment);
@@ -140,14 +140,24 @@ private async Task<GroupSyncResult> SyncronizeGroupsAsync(string gitHubOrg, IEnu
                 m.Id,
                 m.DisplayName,
                 m.Email,
-                GitHubId = _emailToGitHubIdConverter.ToId(m.Email)
+                GitHubId = m.PotentialGitHubId + _appOptions.GitHubIdAppend
             });
 
             // Check if user is valid
             var validUsersForTeam = new List<ValidGitHubId>();
             var usersWithSyncIssues = new List<GitHubUser>();
             foreach (var user in groupMembersWithGitHubIds)
             {
+                if(string.IsNullOrWhiteSpace(user.GitHubId))
+                {
+                    usersWithSyncIssues.Add(new GitHubUser
+                    (
+                        Email: user.Email,
+                        GitHubId: new ValidGitHubId(user.GitHubId)
+                    ));
+                    continue;
+                }
+
                 var validUser = await _gitHubFacade.DoesUserExistAsync(user.GitHubId);
 
                 if (validUser == null)

source/Gttsb.Core/GroupSyncerBuilder.cs

@@ -2,9 +2,9 @@
 {
     public static class GroupSyncerBuilder
     {
-        public static IGroupSyncer Build(IActiveDirectoryFacade adFacade, IInstalledGitHubFacade gFacade, IEmailToCloudIdConverter emailToCloudIdConverter)
+        public static IGroupSyncer Build(IActiveDirectoryFacade adFacade, IInstalledGitHubFacade gFacade, AppOptions appOptions)
         {
-            return new GroupSyncer(adFacade, gFacade, emailToCloudIdConverter);
+            return new GroupSyncer(adFacade, gFacade, appOptions);
         }
     }
 }

source/Gttsb.Core/Member.cs

@@ -1,4 +1,4 @@
 namespace Gttsb.Core
 {
-    public record Member(string DisplayName, string Email, string Id);
+    public record Member(string DisplayName, string Email, string Id, string PotentialGitHubId);
 }

source/Gttsb.Gh/ActiveDirectoryFacade.cs

@@ -29,22 +29,36 @@ public async Task<MembersResponse> FetchMembersAsync(string groupDisplayName)
                 return new MembersResponse(Success: false, Enumerable.Empty<Member>());
             }
 
-            var groupInQuestion = groups[0];      
+            var groupInQuestion = groups[0];
 
+            // TODO: do proper "string escape" here
+            var filteredExtensionName = _azureOptions.ExtensionPropertyWithGitHubId.Replace(";", "").Replace(",", "").ReplaceLineEndings("").Replace(" ", "");
             var members = await _graphServiceClient.Groups[groupInQuestion.Id].Members
-                .Request()
-                .Select("id,mail,displayName")
+                .Request()                
+                .Select($"id,mail,displayName,{filteredExtensionName}")
                 .GetAsync();
 
             Func<User, Member> memberToUser = (User m) => {
                 // TODO: handle exception case?
-                var asUser = m;
+
+                if(m.AdditionalData.TryGetValue(filteredExtensionName, out var gitHubId))
+                {                    
+                    return new Member
+                    (
+                        DisplayName: m.DisplayName,
+                        Email: m.Mail,
+                        Id: m.Id,
+                        PotentialGitHubId: gitHubId.ToString() ?? string.Empty
+                    );
+                }
+
                 return new Member
-                (
-                    DisplayName: asUser.DisplayName,
-                    Email: asUser.Mail,
-                    Id: asUser.Id
-                );
+                    (
+                        DisplayName: m.DisplayName,
+                        Email: m.Mail,
+                        Id: m.Id,
+                        PotentialGitHubId: string.Empty
+                    );
             };
 
             var users = members.Select(m => memberToUser((User)m)).ToList();

source/Gttsb.Gh/Bootstrap.cs

@@ -41,18 +41,7 @@ public static async Task<bool> StartTeamSyncAsync(IActiveDirectoryFacade activeD
             var securityManagers = inputs.SecurityManagerTeams.Concat(appOptions.SecurityManagerTeams).Distinct().ToList();
             var groupDisplayNames = inputs.GitHubTeamNames.Concat(new[] { inputs.OrganizationMembersGroup }).Concat(securityManagers).Distinct().ToDictionary(t => t);
 
-            var org = gitHubFacade.OrgName;
-
-            var emailReplaceRuleDictionaries = new[] { inputs.EmailReplaceRules, appOptions.EmailReplaceRules };
-            var emailReplaceRules = emailReplaceRuleDictionaries
-                .SelectMany(d => d)
-                .ToLookup(p => p.Key, p => p.Value)
-                .ToDictionary(g => g.Key, g => g.First());
-            var itemsToReplaceRules = inputs.EmailTextToReplaceRules.Concat(appOptions.EmailTextToReplaceRules);            
-
-            var emailToCloudIdBuilder = EmailToCloudIdBuilder.Build(string.Empty, inputs.EmailAppend, itemsToReplaceRules, emailReplaceRules);
-
-            var groupSyncer = GroupSyncerBuilder.Build(activeDirectoryFacade, gitHubFacade, emailToCloudIdBuilder);
+            var org = gitHubFacade.OrgName;            
 
             var groupsToSyncronize = groupDisplayNames.Select(g => new
             {
@@ -68,6 +57,8 @@ public static async Task<bool> StartTeamSyncAsync(IActiveDirectoryFacade activeD
 
             var usersWithSyncIssues = new List<GitHubUser>();
 
+            var groupSyncer = GroupSyncerBuilder.Build(activeDirectoryFacade, gitHubFacade, appOptions);
+
             if (securityManagers.Any())
             {
                 var memberSyncResult = await groupSyncer.SyncronizeMembersAsync(org, securityManagers.Select(s => groupsToSyncronize[s]).ToArray());

source/Gttsb.Gh/InstalledGitHubFacade.cs

@@ -55,7 +55,7 @@ public async Task<IReadOnlyDictionary<string, GitHubTeam>> GetAllTeamsAsync(stri
 
             var result = await graphQlClient.Run(query);
 
-            return result.ToDictionary(t=> t.Name, t => new GitHubTeam(t.DatabaseId, t.Name, t.Members.Select(m => new GitHubUser(m.Email, new ValidGitHubId(m.Login))).ToList()));
+            return result.ToDictionary(t=> t.Name, t => new GitHubTeam(t.DatabaseId, t.Name, t.Members.Select(m => new GitHubUser(m.Email, new ValidGitHubId(m.Login))).ToList()), StringComparer.InvariantCultureIgnoreCase);
         }
 
         public async Task AddTeamMemberAsync(GitHubTeam team, ValidGitHubId userGitHubId)