Role Assignment fixes review comments

Author: shuagarw

src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClient.cs

@@ -228,8 +228,8 @@ public List<PSADObject> ListUserGroups(string principal)
         public List<PSADObject> GetObjectsByObjectId(List<string> objectIds)
         {
             List<PSADObject> result = new List<PSADObject>();
-            var aadObjectList = GraphClient.Objects.GetObjectsByObjectIds(new GetObjectsParameters { Ids = objectIds }).AADObject;
-            result.AddRange(aadObjectList.Select(o => o.ToPSADObject()));
+            var adObjects = GraphClient.Objects.GetObjectsByObjectIds(new GetObjectsParameters { Ids = objectIds }).AADObject;
+            result.AddRange(adObjects.Select(o => o.ToPSADObject()));
             return result;
         }
 

src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClientExtensions.cs

@@ -73,7 +73,8 @@ public static PSADObject ToPSADObject(this AADObject obj)
                 {
                     DisplayName = obj.DisplayName,
                     Id = new Guid(obj.ObjectId),
-                    Type = obj.ObjectType
+                    Type = obj.ObjectType,
+                    ServicePrincipalName = obj.ServicePrincipalNames.FirstOrDefault()
                 };
             }
             else
@@ -103,7 +104,8 @@ public static PSADUser ToPSADUser(this User user)
                 DisplayName = user.DisplayName,
                 Id = new Guid(user.ObjectId),
                 UserPrincipalName = user.UserPrincipalName,
-                Mail = user.SignInName
+                Mail = user.SignInName,
+                SignInName = user.SignInName
             };
         }
 

src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs

@@ -211,7 +211,8 @@ public List<PSRoleAssignment> FilterRoleAssignments(FilterRoleAssignmentsOptions
                     var userObject = adObject as PSADUser;
                     classicAdministratorsAssignments = classicAdministratorsAssignments.Where(c =>
                            c.DisplayName.Equals(userObject.UserPrincipalName, StringComparison.OrdinalIgnoreCase) ||
-                           c.DisplayName.Equals(userObject.Mail, StringComparison.OrdinalIgnoreCase)).ToList();
+                           c.DisplayName.Equals(userObject.Mail, StringComparison.OrdinalIgnoreCase) ||
+                           c.DisplayName.Equals(userObject.SignInName, StringComparison.OrdinalIgnoreCase)).ToList();
                 }
 
                 result.AddRange(classicAdministratorsAssignments);