Skip to content

Commit 6fb34a6

Browse files
committed
remove deprecated parameter from functions
1 parent f651e1f commit 6fb34a6

File tree

5 files changed

+18
-30
lines changed

5 files changed

+18
-30
lines changed

src/Commands/AzureAD/AddAzureADGroupMember.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ public class AddAzureADGroupMember : PnPGraphCmdlet
2020
[Parameter(Mandatory = true)]
2121
public string[] Users;
2222

23-
[Parameter(Mandatory = false)]
24-
public SwitchParameter RemoveExisting;
25-
2623
protected override void ExecuteCmdlet()
2724
{
2825
Group group = null;
@@ -39,14 +36,14 @@ protected override void ExecuteCmdlet()
3936

4037
if (userArray.Length > 0)
4138
{
42-
Microsoft365GroupsUtility.AddMembers(GraphRequestHelper, new Guid(group.Id), userArray, RemoveExisting.ToBool());
39+
Microsoft365GroupsUtility.AddMembers(GraphRequestHelper, new Guid(group.Id), userArray);
4340
}
4441

4542
var secGroups = Users.Where(x => Guid.TryParse(x, out emptyGuid)).Select(x => emptyGuid).ToArray();
4643

4744
if (secGroups.Length > 0)
4845
{
49-
Microsoft365GroupsUtility.AddDirectoryMembers(GraphRequestHelper, new Guid(group.Id), secGroups, RemoveExisting.ToBool());
46+
Microsoft365GroupsUtility.AddDirectoryMembers(GraphRequestHelper, new Guid(group.Id), secGroups);
5047
}
5148
}
5249
}

src/Commands/AzureAD/AddAzureADGroupOwner.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ public class AddAzureAdGroupOwner : PnPGraphCmdlet
2020
[Parameter(Mandatory = true)]
2121
public string[] Users;
2222

23-
[Parameter(Mandatory = false)]
24-
public SwitchParameter RemoveExisting;
25-
2623
protected override void ExecuteCmdlet()
2724
{
2825
Group group = null;
@@ -41,14 +38,14 @@ protected override void ExecuteCmdlet()
4138

4239
if (userArray.Length > 0)
4340
{
44-
Microsoft365GroupsUtility.AddOwners(GraphRequestHelper, new System.Guid(group.Id), userArray, RemoveExisting.ToBool());
41+
Microsoft365GroupsUtility.AddOwners(GraphRequestHelper, new System.Guid(group.Id), userArray);
4542
}
4643

4744
var secGroups = Users.Where(x => Guid.TryParse(x, out emptyGuid)).Select(x => emptyGuid).ToArray();
4845

4946
if (secGroups.Length > 0)
5047
{
51-
Microsoft365GroupsUtility.AddDirectoryOwners(GraphRequestHelper, new System.Guid(group.Id), secGroups, RemoveExisting.ToBool());
48+
Microsoft365GroupsUtility.AddDirectoryOwners(GraphRequestHelper, new System.Guid(group.Id), secGroups);
5249
}
5350
}
5451
}

src/Commands/Microsoft365Groups/AddMicrosoft365GroupMember.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@ public class AddMicrosoft365GroupMember : PnPGraphCmdlet
1616
[Parameter(Mandatory = true)]
1717
public string[] Users;
1818

19-
[Parameter(Mandatory = false)]
20-
public SwitchParameter RemoveExisting;
21-
2219
protected override void ExecuteCmdlet()
2320
{
24-
Microsoft365GroupsUtility.AddMembers(GraphRequestHelper, Identity.GetGroupId(GraphRequestHelper), Users, RemoveExisting);
21+
Microsoft365GroupsUtility.AddMembers(GraphRequestHelper, Identity.GetGroupId(GraphRequestHelper), Users);
2522
}
2623
}
2724
}

src/Commands/Microsoft365Groups/AddMicrosoft365GroupOwner.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,9 @@ public class AddMicrosoft365GroupOwner : PnPGraphCmdlet
1616
[Parameter(Mandatory = true)]
1717
public string[] Users;
1818

19-
[Parameter(Mandatory = false)]
20-
public SwitchParameter RemoveExisting;
21-
2219
protected override void ExecuteCmdlet()
2320
{
24-
Microsoft365GroupsUtility.AddOwners(GraphRequestHelper, Identity.GetGroupId(GraphRequestHelper), Users, RemoveExisting);
21+
Microsoft365GroupsUtility.AddOwners(GraphRequestHelper, Identity.GetGroupId(GraphRequestHelper), Users);
2522
}
2623
}
2724
}

src/Commands/Utilities/Microsoft365GroupsUtility.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -289,24 +289,24 @@ internal static void PermanentlyDeleteDeletedGroup(ApiRequestHelper requestHelpe
289289
requestHelper.Delete($"v1.0/directory/deleteditems/microsoft.graph.group/{groupId}");
290290
}
291291

292-
internal static void AddOwners(ApiRequestHelper requestHelper, Guid groupId, string[] users, bool removeExisting)
292+
internal static void AddOwners(ApiRequestHelper requestHelper, Guid groupId, string[] users)
293293
{
294-
AddUsersToGroup(requestHelper, "owners", groupId, users, removeExisting);
294+
AddUsersToGroup(requestHelper, "owners", groupId, users);
295295
}
296296

297-
internal static void AddDirectoryOwners(ApiRequestHelper requestHelper, Guid groupId, Guid[] users, bool removeExisting)
297+
internal static void AddDirectoryOwners(ApiRequestHelper requestHelper, Guid groupId, Guid[] users)
298298
{
299-
AddDirectoryObjectsToGroup(requestHelper, "owners", groupId, users, removeExisting);
299+
AddDirectoryObjectsToGroup(requestHelper, "owners", groupId, users);
300300
}
301301

302-
internal static void AddMembers(ApiRequestHelper requestHelper, Guid groupId, string[] users, bool removeExisting)
302+
internal static void AddMembers(ApiRequestHelper requestHelper, Guid groupId, string[] users)
303303
{
304-
AddUsersToGroup(requestHelper, "members", groupId, users, removeExisting);
304+
AddUsersToGroup(requestHelper, "members", groupId, users);
305305
}
306306

307-
internal static void AddDirectoryMembers(ApiRequestHelper requestHelper, Guid groupId, Guid[] users, bool removeExisting)
307+
internal static void AddDirectoryMembers(ApiRequestHelper requestHelper, Guid groupId, Guid[] users)
308308
{
309-
AddDirectoryObjectsToGroup(requestHelper, "members", groupId, users, removeExisting);
309+
AddDirectoryObjectsToGroup(requestHelper, "members", groupId, users);
310310
}
311311

312312
internal static string GetUserGraphUrlForUPN(string upn)
@@ -318,7 +318,7 @@ internal static string GetUserGraphUrlForUPN(string upn)
318318
return $"users/{escapedUpn}";
319319
}
320320

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)
322322
{
323323
foreach (var user in users)
324324
{
@@ -338,7 +338,7 @@ private static void AddUsersToGroup(ApiRequestHelper requestHelper, string group
338338
}
339339
}
340340

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)
342342
{
343343
foreach (var dirObject in directoryObjects)
344344
{
@@ -440,7 +440,7 @@ internal static void UpdateOwners(ApiRequestHelper requestHelper, Guid groupId,
440440
{
441441
if (existingOwners.FirstOrDefault(o => o.UserPrincipalName == owner) == null)
442442
{
443-
AddOwners(requestHelper, groupId, new string[] { owner }, false);
443+
AddOwners(requestHelper, groupId, new string[] { owner });
444444
}
445445
}
446446
foreach (var existingOwner in existingOwners)
@@ -459,7 +459,7 @@ internal static void UpdateMembersAsync(ApiRequestHelper requestHelper, Guid gro
459459
{
460460
if (existingMembers.FirstOrDefault(o => o.UserPrincipalName == member) == null)
461461
{
462-
AddMembers(requestHelper, groupId, new string[] { member }, false);
462+
AddMembers(requestHelper, groupId, new string[] { member });
463463
}
464464
}
465465
foreach (var existingMember in existingMembers)

0 commit comments

Comments
 (0)