update users in groups when parameter "-RemoveExisting" is used

svenboll · svenboll · commit f116588919df · 2025-11-01T19:23:27.000+01:00
while adding owners and members
diff --git a/src/Commands/AzureAD/AddAzureADGroupMember.cs b/src/Commands/AzureAD/AddAzureADGroupMember.cs
@@ -31,22 +31,29 @@ protected override void ExecuteCmdlet()
             {
                 group = Identity.GetGroup(GraphRequestHelper);
             }
+
             if (group != null)
             {
+
+                if (RemoveExisting.ToBool())
+                {
+                    Microsoft365GroupsUtility.ClearMembers(GraphRequestHelper, new System.Guid(group.Id));
+                }
+                
                 Guid emptyGuid = Guid.Empty;
 
                 var userArray = Users.Where(x => !Guid.TryParse(x, out emptyGuid)).ToArray();
 
                 if (userArray.Length > 0)
                 {
-                    Microsoft365GroupsUtility.AddMembers(GraphRequestHelper, new Guid(group.Id), userArray, RemoveExisting.ToBool());
+                    Microsoft365GroupsUtility.AddMembers(GraphRequestHelper, new Guid(group.Id), userArray);
                 }
 
                 var secGroups = Users.Where(x => Guid.TryParse(x, out emptyGuid)).Select(x => emptyGuid).ToArray();
 
                 if (secGroups.Length > 0)
                 {
-                    Microsoft365GroupsUtility.AddDirectoryMembers(GraphRequestHelper, new Guid(group.Id), secGroups, RemoveExisting.ToBool());
+                    Microsoft365GroupsUtility.AddDirectoryMembers(GraphRequestHelper, new Guid(group.Id), secGroups);
                 }
             }
         }
diff --git a/src/Commands/AzureAD/AddAzureADGroupOwner.cs b/src/Commands/AzureAD/AddAzureADGroupOwner.cs
@@ -34,21 +34,26 @@ protected override void ExecuteCmdlet()
 
             if (group != null)
             {
-
+                
+                if (RemoveExisting.ToBool())
+                {
+                    Microsoft365GroupsUtility.ClearOwnersAsync(GraphRequestHelper, new System.Guid(group.Id));
+                }
+                
                 Guid emptyGuid = Guid.Empty;
 
                 var userArray = Users.Where(x => !Guid.TryParse(x, out emptyGuid)).ToArray();
 
                 if (userArray.Length > 0)
                 {
-                    Microsoft365GroupsUtility.AddOwners(GraphRequestHelper, new System.Guid(group.Id), userArray, RemoveExisting.ToBool());
+                    Microsoft365GroupsUtility.AddOwners(GraphRequestHelper, new System.Guid(group.Id), userArray);
                 }
 
                 var secGroups = Users.Where(x => Guid.TryParse(x, out emptyGuid)).Select(x => emptyGuid).ToArray();
 
                 if (secGroups.Length > 0)
                 {
-                    Microsoft365GroupsUtility.AddDirectoryOwners(GraphRequestHelper, new System.Guid(group.Id), secGroups, RemoveExisting.ToBool());
+                    Microsoft365GroupsUtility.AddDirectoryOwners(GraphRequestHelper, new System.Guid(group.Id), secGroups);
                 }
             }
         }
diff --git a/src/Commands/Microsoft365Groups/AddMicrosoft365GroupMember.cs b/src/Commands/Microsoft365Groups/AddMicrosoft365GroupMember.cs
@@ -21,7 +21,16 @@ public class AddMicrosoft365GroupMember : PnPGraphCmdlet
 
         protected override void ExecuteCmdlet()
         {
-            Microsoft365GroupsUtility.AddMembers(GraphRequestHelper, Identity.GetGroupId(GraphRequestHelper), Users, RemoveExisting);
+            System.Guid groupId = Identity.GetGroupId(GraphRequestHelper);
+
+            if (RemoveExisting.ToBool())
+            {
+                Microsoft365GroupsUtility.UpdateMembersAsync(GraphRequestHelper, groupId, Users);
+            }
+            else
+            {
+                Microsoft365GroupsUtility.AddMembers(GraphRequestHelper, groupId, Users);            
+            }
         }
     }
 }
diff --git a/src/Commands/Microsoft365Groups/AddMicrosoft365GroupOwner.cs b/src/Commands/Microsoft365Groups/AddMicrosoft365GroupOwner.cs
@@ -21,7 +21,16 @@ public class AddMicrosoft365GroupOwner : PnPGraphCmdlet
 
         protected override void ExecuteCmdlet()
         {
-            Microsoft365GroupsUtility.AddOwners(GraphRequestHelper, Identity.GetGroupId(GraphRequestHelper), Users, RemoveExisting);
+            System.Guid groupId = Identity.GetGroupId(GraphRequestHelper);
+
+            if (RemoveExisting.ToBool())
+            {
+                Microsoft365GroupsUtility.UpdateOwners(GraphRequestHelper, groupId, Users);
+            }
+            else
+            {
+                Microsoft365GroupsUtility.AddOwners(GraphRequestHelper, groupId, Users);
+            }
         }
     }
 }
diff --git a/src/Commands/Utilities/Microsoft365GroupsUtility.cs b/src/Commands/Utilities/Microsoft365GroupsUtility.cs
@@ -289,24 +289,24 @@ internal static void PermanentlyDeleteDeletedGroup(ApiRequestHelper requestHelpe
             requestHelper.Delete($"v1.0/directory/deleteditems/microsoft.graph.group/{groupId}");
         }
 
-        internal static void AddOwners(ApiRequestHelper requestHelper, Guid groupId, string[] users, bool removeExisting)
+        internal static void AddOwners(ApiRequestHelper requestHelper, Guid groupId, string[] users)
         {
-            AddUsersToGroup(requestHelper, "owners", groupId, users, removeExisting);
+            AddUsersToGroup(requestHelper, "owners", groupId, users);
         }
 
-        internal static void AddDirectoryOwners(ApiRequestHelper requestHelper, Guid groupId, Guid[] users, bool removeExisting)
+        internal static void AddDirectoryOwners(ApiRequestHelper requestHelper, Guid groupId, Guid[] users)
         {
-            AddDirectoryObjectsToGroup(requestHelper, "owners", groupId, users, removeExisting);
+            AddDirectoryObjectsToGroup(requestHelper, "owners", groupId, users);
         }
 
-        internal static void AddMembers(ApiRequestHelper requestHelper, Guid groupId, string[] users, bool removeExisting)
+        internal static void AddMembers(ApiRequestHelper requestHelper, Guid groupId, string[] users)
         {
-            AddUsersToGroup(requestHelper, "members", groupId, users, removeExisting);
+            AddUsersToGroup(requestHelper, "members", groupId, users);
         }
 
-        internal static void AddDirectoryMembers(ApiRequestHelper requestHelper, Guid groupId, Guid[] users, bool removeExisting)
+        internal static void AddDirectoryMembers(ApiRequestHelper requestHelper, Guid groupId, Guid[] users)
         {
-            AddDirectoryObjectsToGroup(requestHelper, "members", groupId, users, removeExisting);
+            AddDirectoryObjectsToGroup(requestHelper, "members", groupId, users);
         }
 
         internal static string GetUserGraphUrlForUPN(string upn)
@@ -318,7 +318,7 @@ internal static string GetUserGraphUrlForUPN(string upn)
             return $"users/{escapedUpn}";
         }
 
-        private static void AddUsersToGroup(ApiRequestHelper requestHelper, string groupName, Guid groupId, string[] users, bool removeExisting)
+        private static void AddUsersToGroup(ApiRequestHelper requestHelper, string groupName, Guid groupId, string[] users)
         {
             foreach (var user in users)
             {
@@ -338,7 +338,7 @@ private static void AddUsersToGroup(ApiRequestHelper requestHelper, string group
             }
         }
 
-        private static void AddDirectoryObjectsToGroup(ApiRequestHelper requestHelper, string groupName, Guid groupId, Guid[] directoryObjects, bool removeExisting)
+        private static void AddDirectoryObjectsToGroup(ApiRequestHelper requestHelper, string groupName, Guid groupId, Guid[] directoryObjects)
         {
             foreach (var dirObject in directoryObjects)
             {
@@ -440,7 +440,7 @@ internal static void UpdateOwners(ApiRequestHelper requestHelper, Guid groupId,
             {
                 if (existingOwners.FirstOrDefault(o => o.UserPrincipalName == owner) == null)
                 {
-                    AddOwners(requestHelper, groupId, new string[] { owner }, false);
+                    AddOwners(requestHelper, groupId, new string[] { owner });
                 }
             }
             foreach (var existingOwner in existingOwners)
@@ -459,7 +459,7 @@ internal static void UpdateMembersAsync(ApiRequestHelper requestHelper, Guid gro
             {
                 if (existingMembers.FirstOrDefault(o => o.UserPrincipalName == member) == null)
                 {
-                    AddMembers(requestHelper, groupId, new string[] { member }, false);
+                    AddMembers(requestHelper, groupId, new string[] { member });
                 }
             }
             foreach (var existingMember in existingMembers)

Original file line number	Diff line number	Diff line change
`@@ -31,22 +31,29 @@ protected override void ExecuteCmdlet()`
`31`	`31`	`{`
`32`	`32`	`group = Identity.GetGroup(GraphRequestHelper);`
`33`	`33`	`}`
	`34`	`+`
`34`	`35`	`if (group != null)`
`35`	`36`	`{`
	`37`	`+`
	`38`	`+ if (RemoveExisting.ToBool())`
	`39`	`+ {`
	`40`	`+ Microsoft365GroupsUtility.ClearMembers(GraphRequestHelper, new System.Guid(group.Id));`
	`41`	`+ }`
	`42`	`+`
`36`	`43`	`Guid emptyGuid = Guid.Empty;`
`37`	`44`
`38`	`45`	`var userArray = Users.Where(x => !Guid.TryParse(x, out emptyGuid)).ToArray();`
`39`	`46`
`40`	`47`	`if (userArray.Length > 0)`
`41`	`48`	`{`
`42`		`- Microsoft365GroupsUtility.AddMembers(GraphRequestHelper, new Guid(group.Id), userArray, RemoveExisting.ToBool());`
	`49`	`+ Microsoft365GroupsUtility.AddMembers(GraphRequestHelper, new Guid(group.Id), userArray);`
`43`	`50`	`}`
`44`	`51`
`45`	`52`	`var secGroups = Users.Where(x => Guid.TryParse(x, out emptyGuid)).Select(x => emptyGuid).ToArray();`
`46`	`53`
`47`	`54`	`if (secGroups.Length > 0)`
`48`	`55`	`{`
`49`		`- Microsoft365GroupsUtility.AddDirectoryMembers(GraphRequestHelper, new Guid(group.Id), secGroups, RemoveExisting.ToBool());`
	`56`	`+ Microsoft365GroupsUtility.AddDirectoryMembers(GraphRequestHelper, new Guid(group.Id), secGroups);`
`50`	`57`	`}`
`51`	`58`	`}`
`52`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,21 +34,26 @@ protected override void ExecuteCmdlet()`
`34`	`34`
`35`	`35`	`if (group != null)`
`36`	`36`	`{`
`37`		`-`
	`37`	`+`
	`38`	`+ if (RemoveExisting.ToBool())`
	`39`	`+ {`
	`40`	`+ Microsoft365GroupsUtility.ClearOwnersAsync(GraphRequestHelper, new System.Guid(group.Id));`
	`41`	`+ }`
	`42`	`+`
`38`	`43`	`Guid emptyGuid = Guid.Empty;`
`39`	`44`
`40`	`45`	`var userArray = Users.Where(x => !Guid.TryParse(x, out emptyGuid)).ToArray();`
`41`	`46`
`42`	`47`	`if (userArray.Length > 0)`
`43`	`48`	`{`
`44`		`- Microsoft365GroupsUtility.AddOwners(GraphRequestHelper, new System.Guid(group.Id), userArray, RemoveExisting.ToBool());`
	`49`	`+ Microsoft365GroupsUtility.AddOwners(GraphRequestHelper, new System.Guid(group.Id), userArray);`
`45`	`50`	`}`
`46`	`51`
`47`	`52`	`var secGroups = Users.Where(x => Guid.TryParse(x, out emptyGuid)).Select(x => emptyGuid).ToArray();`
`48`	`53`
`49`	`54`	`if (secGroups.Length > 0)`
`50`	`55`	`{`
`51`		`- Microsoft365GroupsUtility.AddDirectoryOwners(GraphRequestHelper, new System.Guid(group.Id), secGroups, RemoveExisting.ToBool());`
	`56`	`+ Microsoft365GroupsUtility.AddDirectoryOwners(GraphRequestHelper, new System.Guid(group.Id), secGroups);`
`52`	`57`	`}`
`53`	`58`	`}`
`54`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,16 @@ public class AddMicrosoft365GroupMember : PnPGraphCmdlet`
`21`	`21`
`22`	`22`	`protected override void ExecuteCmdlet()`
`23`	`23`	`{`
`24`		`- Microsoft365GroupsUtility.AddMembers(GraphRequestHelper, Identity.GetGroupId(GraphRequestHelper), Users, RemoveExisting);`
	`24`	`+ System.Guid groupId = Identity.GetGroupId(GraphRequestHelper);`
	`25`	`+`
	`26`	`+ if (RemoveExisting.ToBool())`
	`27`	`+ {`
	`28`	`+ Microsoft365GroupsUtility.UpdateMembersAsync(GraphRequestHelper, groupId, Users);`
	`29`	`+ }`
	`30`	`+ else`
	`31`	`+ {`
	`32`	`+ Microsoft365GroupsUtility.AddMembers(GraphRequestHelper, groupId, Users);`
	`33`	`+ }`
`25`	`34`	`}`
`26`	`35`	`}`
`27`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -289,24 +289,24 @@ internal static void PermanentlyDeleteDeletedGroup(ApiRequestHelper requestHelpe`
`289`	`289`	`requestHelper.Delete($"v1.0/directory/deleteditems/microsoft.graph.group/{groupId}");`
`290`	`290`	`}`
`291`	`291`
`292`		`- internal static void AddOwners(ApiRequestHelper requestHelper, Guid groupId, string[] users, bool removeExisting)`
	`292`	`+ internal static void AddOwners(ApiRequestHelper requestHelper, Guid groupId, string[] users)`
`293`	`293`	`{`
`294`		`- AddUsersToGroup(requestHelper, "owners", groupId, users, removeExisting);`
	`294`	`+ AddUsersToGroup(requestHelper, "owners", groupId, users);`
`295`	`295`	`}`
`296`	`296`
`297`		`- internal static void AddDirectoryOwners(ApiRequestHelper requestHelper, Guid groupId, Guid[] users, bool removeExisting)`
	`297`	`+ internal static void AddDirectoryOwners(ApiRequestHelper requestHelper, Guid groupId, Guid[] users)`
`298`	`298`	`{`
`299`		`- AddDirectoryObjectsToGroup(requestHelper, "owners", groupId, users, removeExisting);`
	`299`	`+ AddDirectoryObjectsToGroup(requestHelper, "owners", groupId, users);`
`300`	`300`	`}`
`301`	`301`
`302`		`- internal static void AddMembers(ApiRequestHelper requestHelper, Guid groupId, string[] users, bool removeExisting)`
	`302`	`+ internal static void AddMembers(ApiRequestHelper requestHelper, Guid groupId, string[] users)`
`303`	`303`	`{`
`304`		`- AddUsersToGroup(requestHelper, "members", groupId, users, removeExisting);`
	`304`	`+ AddUsersToGroup(requestHelper, "members", groupId, users);`
`305`	`305`	`}`
`306`	`306`
`307`		`- internal static void AddDirectoryMembers(ApiRequestHelper requestHelper, Guid groupId, Guid[] users, bool removeExisting)`
	`307`	`+ internal static void AddDirectoryMembers(ApiRequestHelper requestHelper, Guid groupId, Guid[] users)`
`308`	`308`	`{`
`309`		`- AddDirectoryObjectsToGroup(requestHelper, "members", groupId, users, removeExisting);`
	`309`	`+ AddDirectoryObjectsToGroup(requestHelper, "members", groupId, users);`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`internal static string GetUserGraphUrlForUPN(string upn)`
`@@ -318,7 +318,7 @@ internal static string GetUserGraphUrlForUPN(string upn)`
`318`	`318`	`return $"users/{escapedUpn}";`
`319`	`319`	`}`
`320`	`320`
`321`		`- private static void AddUsersToGroup(ApiRequestHelper requestHelper, string groupName, Guid groupId, string[] users, bool removeExisting)`
	`321`	`+ private static void AddUsersToGroup(ApiRequestHelper requestHelper, string groupName, Guid groupId, string[] users)`
`322`	`322`	`{`
`323`	`323`	`foreach (var user in users)`
`324`	`324`	`{`
`@@ -338,7 +338,7 @@ private static void AddUsersToGroup(ApiRequestHelper requestHelper, string group`
`338`	`338`	`}`
`339`	`339`	`}`
`340`	`340`
`341`		`- private static void AddDirectoryObjectsToGroup(ApiRequestHelper requestHelper, string groupName, Guid groupId, Guid[] directoryObjects, bool removeExisting)`
	`341`	`+ private static void AddDirectoryObjectsToGroup(ApiRequestHelper requestHelper, string groupName, Guid groupId, Guid[] directoryObjects)`
`342`	`342`	`{`
`343`	`343`	`foreach (var dirObject in directoryObjects)`
`344`	`344`	`{`
`@@ -440,7 +440,7 @@ internal static void UpdateOwners(ApiRequestHelper requestHelper, Guid groupId,`
`440`	`440`	`{`
`441`	`441`	`if (existingOwners.FirstOrDefault(o => o.UserPrincipalName == owner) == null)`
`442`	`442`	`{`
`443`		`- AddOwners(requestHelper, groupId, new string[] { owner }, false);`
	`443`	`+ AddOwners(requestHelper, groupId, new string[] { owner });`
`444`	`444`	`}`
`445`	`445`	`}`
`446`	`446`	`foreach (var existingOwner in existingOwners)`
`@@ -459,7 +459,7 @@ internal static void UpdateMembersAsync(ApiRequestHelper requestHelper, Guid gro`
`459`	`459`	`{`
`460`	`460`	`if (existingMembers.FirstOrDefault(o => o.UserPrincipalName == member) == null)`
`461`	`461`	`{`
`462`		`- AddMembers(requestHelper, groupId, new string[] { member }, false);`
	`462`	`+ AddMembers(requestHelper, groupId, new string[] { member });`
`463`	`463`	`}`
`464`	`464`	`}`
`465`	`465`	`foreach (var existingMember in existingMembers)`