#1021 - New-PnPTeamsTeam , ability to add multiple owners and members

CHANGELOG.md

@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Removed `Add-PnPClientSidePage` as that was marked deprecated. Use `Add-PnPPage` instead.
 - Added optional `-ScheduledPublishDate` parameter to `Add-PnPPage` and `Set-PnPPage` to allow for scheduling a page to be published.
 - Added `-RemoveScheduledPublish` to `Set-PnPPage` to allow for a page publish schedule to be removed.
+- Added support to add multiple owners and members in `New-PnPTeamsTeam` cmdlet.
 - Improved `Get-PnPFile` cmdlet to handle large file downloads.
 - Added support for off peak SharePoint Syntex content classification and extraction for lists and folders via new `-OffPeak` and `-Folder` parameters for `Request-PnPSyntexClassifyAndExtract`.
 - Fix `Set-PnPListItem` not working when using `Label` and `Values` parameters together.

documentation/New-PnPTeamsTeam.md

@@ -29,7 +29,7 @@ New-PnPTeamsTeam -GroupId <String> [-Owner <String>] [-AllowAddRemoveApps <Boole
  [-AllowOwnerDeleteMessages <Boolean>] [-AllowStickersAndMemes <Boolean>] [-AllowTeamMentions <Boolean>]
  [-AllowUserDeleteMessages <Boolean>] [-AllowUserEditMessages <Boolean>]
  [-GiphyContentRating <TeamGiphyContentRating>] [-ShowInTeamsSearchAndSuggestions <Boolean>]
- [-Classification <String>]  [<CommonParameters>]
+ [-Classification <String>] [-Owners <String[]>] [-Members <String[]>]  [<CommonParameters>]
 ```
 
 ### For a new group
@@ -43,6 +43,7 @@ New-PnPTeamsTeam -DisplayName <String> [-MailNickName <String>] [-Description <S
  [-AllowUserDeleteMessages <Boolean>] [-AllowUserEditMessages <Boolean>]
  [-GiphyContentRating <TeamGiphyContentRating>] [-Visibility <TeamVisibility>]
  [-ShowInTeamsSearchAndSuggestions <Boolean>] [-Classification <String>] 
+ [-Owners <String[]>] [-Members <String[]>]
  [<CommonParameters>]
 ```
 
@@ -403,6 +404,34 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -Owners
+The UPN(s) of the user(s) to be added to the Microsoft 365 group as a owners.
+
+```yaml
+Type: String[]
+Parameter Sets: (All)
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -Members
+The UPN(s) of the user(s) to be added to the Microsoft 365 group as a members.
+
+```yaml
+Type: String[]
+Parameter Sets: (All)
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ## RELATED LINKS
 
 [Microsoft 365 Patterns and Practices](https://aka.ms/m365pnp)

src/Commands/Teams/NewTeamsTeam.cs

@@ -95,7 +95,13 @@ public class NewTeamsTeam : PnPGraphCmdlet
         public TeamsTemplateType Template = TeamsTemplateType.None;
 
         [Parameter(Mandatory = false, ParameterSetName = ParameterAttribute.AllParameterSets)]
-        public bool? AllowCreatePrivateChannels;        
+        public bool? AllowCreatePrivateChannels;
+
+        [Parameter(Mandatory = false, ParameterSetName = ParameterAttribute.AllParameterSets)]
+        public string[] Owners;
+
+        [Parameter(Mandatory = false, ParameterSetName = ParameterAttribute.AllParameterSets)]
+        public string[] Members;
 
         protected override void ExecuteCmdlet()
         {
@@ -125,7 +131,7 @@ protected override void ExecuteCmdlet()
                 Visibility = (GroupVisibility)Enum.Parse(typeof(GroupVisibility), Visibility.ToString()),
                 AllowCreatePrivateChannels = AllowCreatePrivateChannels,
             };
-            WriteObject(TeamsUtility.NewTeamAsync(AccessToken, HttpClient, GroupId, DisplayName, Description, Classification, MailNickName, Owner, (GroupVisibility)Enum.Parse(typeof(GroupVisibility), Visibility.ToString()), teamCI, Template).GetAwaiter().GetResult());
+            WriteObject(TeamsUtility.NewTeamAsync(AccessToken, HttpClient, GroupId, DisplayName, Description, Classification, MailNickName, Owner, (GroupVisibility)Enum.Parse(typeof(GroupVisibility), Visibility.ToString()), teamCI, Owners, Members, Template).GetAwaiter().GetResult());
         }
     }
 }

src/Commands/Utilities/TeamsUtility.cs

@@ -59,7 +59,7 @@ public static async Task<Team> GetTeamAsync(string accessToken, HttpClient httpC
             {
                 team.DisplayName = group.DisplayName;
                 team.MailNickname = group.MailNickname;
-                team.Visibility = group.Visibility;                
+                team.Visibility = group.Visibility;
                 return team;
             }
             else
@@ -104,14 +104,14 @@ private static async Task<Team> ParseTeamJsonAsync(string accessToken, HttpClien
             }
         }
 
-        public static async Task<Team> NewTeamAsync(string accessToken, HttpClient httpClient, string groupId, string displayName, string description, string classification, string mailNickname, string owner, GroupVisibility visibility, TeamCreationInformation teamCI, TeamsTemplateType templateType = TeamsTemplateType.None)
+        public static async Task<Team> NewTeamAsync(string accessToken, HttpClient httpClient, string groupId, string displayName, string description, string classification, string mailNickname, string owner, GroupVisibility visibility, TeamCreationInformation teamCI, string[] owners, string[] members, TeamsTemplateType templateType = TeamsTemplateType.None)
         {
             Group group = null;
             Team returnTeam = null;
             // Create group
             if (string.IsNullOrEmpty(groupId))
             {
-                group = await CreateGroupAsync(accessToken, httpClient, displayName, description, classification, mailNickname, owner, visibility, templateType);
+                group = await CreateGroupAsync(accessToken, httpClient, displayName, description, classification, mailNickname, owner, visibility, owners, templateType);
                 bool wait = true;
                 int iterations = 0;
                 while (wait)
@@ -151,6 +151,16 @@ public static async Task<Team> NewTeamAsync(string accessToken, HttpClient httpC
             }
             if (group != null)
             {
+                if (owners != null && owners.Length > 0)
+                {
+                    Framework.Graph.GroupsUtility.AddGroupOwners(group.Id, owners, accessToken, false);
+                }
+
+                if (members != null && members.Length > 0)
+                {
+                    Framework.Graph.GroupsUtility.AddGroupMembers(group.Id, members, accessToken, false);
+                }
+
                 Team team = teamCI.ToTeam(group.Visibility);
                 var retry = true;
                 var iteration = 0;
@@ -161,7 +171,7 @@ public static async Task<Team> NewTeamAsync(string accessToken, HttpClient httpC
                         var teamSettings = await GraphHelper.PutAsync(httpClient, $"v1.0/groups/{group.Id}/team", team, accessToken);
                         if (teamSettings != null)
                         {
-                            returnTeam = await TeamsUtility.GetTeamAsync(accessToken, httpClient, group.Id);
+                            returnTeam = await GetTeamAsync(accessToken, httpClient, group.Id);
                         }
                         retry = false;
                     }
@@ -181,15 +191,23 @@ public static async Task<Team> NewTeamAsync(string accessToken, HttpClient httpC
             return returnTeam;
         }
 
-        private static async Task<Group> CreateGroupAsync(string accessToken, HttpClient httpClient, string displayName, string description, string classification, string mailNickname, string owner, GroupVisibility visibility, TeamsTemplateType templateType = TeamsTemplateType.None)
+        private static async Task<Group> CreateGroupAsync(string accessToken, HttpClient httpClient, string displayName, string description, string classification, string mailNickname, string owner, GroupVisibility visibility, string[] owners, TeamsTemplateType templateType = TeamsTemplateType.None)
         {
             Group group = new Group();
             // get the owner if no owner was specified
             var ownerId = string.Empty;
             if (string.IsNullOrEmpty(owner))
             {
-                var user = await GraphHelper.GetAsync<User>(httpClient, "v1.0/me?$select=Id", accessToken);
-                ownerId = user.Id;
+                if (owners != null && owners.Length > 0)
+                {
+                    var user = await GraphHelper.GetAsync<User>(httpClient, $"v1.0/users/{owners[0]}?$select=Id", accessToken);
+                    ownerId = user.Id;
+                }
+                else
+                {
+                    var user = await GraphHelper.GetAsync<User>(httpClient, "v1.0/me?$select=Id", accessToken);
+                    ownerId = user.Id;
+                }
             }
             else
             {
@@ -246,12 +264,15 @@ private static async Task<Group> CreateGroupAsync(string accessToken, HttpClient
             try
             {
                 return await GraphHelper.PostAsync<Group>(httpClient, "v1.0/groups", group, accessToken);
-            } catch (GraphException ex)
+            }
+            catch (GraphException ex)
             {
-                if(ex.Error.Message.Contains("extension_fe2174665583431c953114ff7268b7b3_Education_ObjectType"))
+                if (ex.Error.Message.Contains("extension_fe2174665583431c953114ff7268b7b3_Education_ObjectType"))
                 {
                     throw new PSInvalidOperationException("Invalid EDU license type");
-                } else {
+                }
+                else
+                {
                     throw;
                 }
             }
@@ -396,7 +417,7 @@ public static async Task<IEnumerable<User>> GetUsersAsync(HttpClient httpClient,
             {
                 users.AddRange(collection.Select(m => new User() { DisplayName = m.DisplayName, Id = m.UserId, UserPrincipalName = m.email, UserType = m.Roles.Count > 0 ? m.Roles[0].ToLower() : "" }));
             }
-           
+
             if (selectedRole != null)
             {
                 return users.Where(u => u.UserType == selectedRole);