Merge pull request #1573 from vipulkelkar/GetGroupClassification

erwinvanhunen · web-flow · commit 437611ccc285 · 2018-07-03T07:27:43.000-07:00
Get group classification from the Get-PnPUnifiedGroup command
diff --git a/Commands/Base/PipeBinds/UnifiedGroupPipeBind.cs b/Commands/Base/PipeBinds/UnifiedGroupPipeBind.cs
@@ -42,23 +42,23 @@ public UnifiedGroupPipeBind(String input)
 
         public String GroupId => (_groupId);
 
-        public UnifiedGroupEntity GetGroup(string accessToken)
+        public UnifiedGroupEntity GetGroup(string accessToken, bool includeClassification = false)
         {
             UnifiedGroupEntity group = null;
             if (Group != null)
             {
-                group = UnifiedGroupsUtility.GetUnifiedGroup(Group.GroupId, accessToken);
+                group = UnifiedGroupsUtility.GetUnifiedGroup(Group.GroupId, accessToken, includeClassification:includeClassification);
             }
             else if (!String.IsNullOrEmpty(GroupId))
             {
-                group = UnifiedGroupsUtility.GetUnifiedGroup(GroupId, accessToken);
+                group = UnifiedGroupsUtility.GetUnifiedGroup(GroupId, accessToken, includeClassification:includeClassification);
             }
             else if (!string.IsNullOrEmpty(DisplayName))
             {
-                var groups = UnifiedGroupsUtility.ListUnifiedGroups(accessToken, DisplayName, includeSite: true);
+                var groups = UnifiedGroupsUtility.ListUnifiedGroups(accessToken, DisplayName, includeSite: true, includeClassification:includeClassification);
                 if (groups == null || groups.Count == 0)
                 {
-                    groups = UnifiedGroupsUtility.ListUnifiedGroups(accessToken, mailNickname: DisplayName, includeSite: true);
+                    groups = UnifiedGroupsUtility.ListUnifiedGroups(accessToken, mailNickname: DisplayName, includeSite: true, includeClassification:includeClassification);
                 }
                 if (groups != null && groups.Any())
                 {
diff --git a/Commands/Graph/GetUnifiedGroup.cs b/Commands/Graph/GetUnifiedGroup.cs
@@ -46,6 +46,9 @@ public class GetUnifiedGroup : PnPGraphCmdlet
         [Parameter(Mandatory = false, HelpMessage = "Exclude fetching the site URL for Office 365 Groups. This speeds up large listings.")]
         public SwitchParameter ExcludeSiteUrl;
 
+        [Parameter(Mandatory = false, HelpMessage = "Include Classification value of Office 365 Groups.")]
+        public SwitchParameter IncludeClassification;
+
         protected override void ExecuteCmdlet()
         {
             UnifiedGroupEntity group = null;
@@ -58,7 +61,7 @@ protected override void ExecuteCmdlet()
             else
             {
                 // Retrieve all the groups
-                groups = UnifiedGroupsUtility.ListUnifiedGroups(AccessToken, includeSite: !ExcludeSiteUrl.IsPresent);
+                groups = UnifiedGroupsUtility.ListUnifiedGroups(AccessToken, includeSite: !ExcludeSiteUrl.IsPresent, includeClassification:IncludeClassification.IsPresent);
             }
 
             if (group != null)

Original file line number	Diff line number	Diff line change
`@@ -42,23 +42,23 @@ public UnifiedGroupPipeBind(String input)`
`42`	`42`
`43`	`43`	`public String GroupId => (_groupId);`
`44`	`44`
`45`		`- public UnifiedGroupEntity GetGroup(string accessToken)`
	`45`	`+ public UnifiedGroupEntity GetGroup(string accessToken, bool includeClassification = false)`
`46`	`46`	`{`
`47`	`47`	`UnifiedGroupEntity group = null;`
`48`	`48`	`if (Group != null)`
`49`	`49`	`{`
`50`		`- group = UnifiedGroupsUtility.GetUnifiedGroup(Group.GroupId, accessToken);`
	`50`	`+ group = UnifiedGroupsUtility.GetUnifiedGroup(Group.GroupId, accessToken, includeClassification:includeClassification);`
`51`	`51`	`}`
`52`	`52`	`else if (!String.IsNullOrEmpty(GroupId))`
`53`	`53`	`{`
`54`		`- group = UnifiedGroupsUtility.GetUnifiedGroup(GroupId, accessToken);`
	`54`	`+ group = UnifiedGroupsUtility.GetUnifiedGroup(GroupId, accessToken, includeClassification:includeClassification);`
`55`	`55`	`}`
`56`	`56`	`else if (!string.IsNullOrEmpty(DisplayName))`
`57`	`57`	`{`
`58`		`- var groups = UnifiedGroupsUtility.ListUnifiedGroups(accessToken, DisplayName, includeSite: true);`
	`58`	`+ var groups = UnifiedGroupsUtility.ListUnifiedGroups(accessToken, DisplayName, includeSite: true, includeClassification:includeClassification);`
`59`	`59`	`if (groups == null \|\| groups.Count == 0)`
`60`	`60`	`{`
`61`		`- groups = UnifiedGroupsUtility.ListUnifiedGroups(accessToken, mailNickname: DisplayName, includeSite: true);`
	`61`	`+ groups = UnifiedGroupsUtility.ListUnifiedGroups(accessToken, mailNickname: DisplayName, includeSite: true, includeClassification:includeClassification);`
`62`	`62`	`}`
`63`	`63`	`if (groups != null && groups.Any())`
`64`	`64`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,9 @@ public class GetUnifiedGroup : PnPGraphCmdlet`
`46`	`46`	`[Parameter(Mandatory = false, HelpMessage = "Exclude fetching the site URL for Office 365 Groups. This speeds up large listings.")]`
`47`	`47`	`public SwitchParameter ExcludeSiteUrl;`
`48`	`48`
	`49`	`+ [Parameter(Mandatory = false, HelpMessage = "Include Classification value of Office 365 Groups.")]`
	`50`	`+ public SwitchParameter IncludeClassification;`
	`51`	`+`
`49`	`52`	`protected override void ExecuteCmdlet()`
`50`	`53`	`{`
`51`	`54`	`UnifiedGroupEntity group = null;`
`@@ -58,7 +61,7 @@ protected override void ExecuteCmdlet()`
`58`	`61`	`else`
`59`	`62`	`{`
`60`	`63`	`// Retrieve all the groups`
`61`		`- groups = UnifiedGroupsUtility.ListUnifiedGroups(AccessToken, includeSite: !ExcludeSiteUrl.IsPresent);`
	`64`	`+ groups = UnifiedGroupsUtility.ListUnifiedGroups(AccessToken, includeSite: !ExcludeSiteUrl.IsPresent, includeClassification:IncludeClassification.IsPresent);`
`62`	`65`	`}`
`63`	`66`
`64`	`67`	`if (group != null)`