fix group issues

Author: JohnDuprey

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Groups/Invoke-AddGroup.ps1

@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-AddGroup {
+function Invoke-AddGroup {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -38,11 +38,11 @@ Function Invoke-AddGroup {
                 if ($GroupObject.groupType -eq 'm365') {
                     $BodyParams | Add-Member -NotePropertyName 'groupTypes' -NotePropertyValue @('Unified')
                 }
-                if ($GroupObject.owners -AND $GroupObject.groupType -in 'generic', 'azurerole', 'security') {
+                if ($GroupObject.owners) {
                     $BodyParams | Add-Member -NotePropertyName '[email protected]' -NotePropertyValue (($GroupObject.owners) | ForEach-Object { "https://graph.microsoft.com/v1.0/users/$($_.value)" })
                     $BodyParams.'[email protected]' = @($BodyParams.'[email protected]')
                 }
-                if ($GroupObject.members -AND $GroupObject.groupType -in 'generic', 'azurerole', 'security') {
+                if ($GroupObject.members) {
                     $BodyParams | Add-Member -NotePropertyName '[email protected]' -NotePropertyValue (($GroupObject.members) | ForEach-Object { "https://graph.microsoft.com/v1.0/users/$($_.value)" })
                     $BodyParams.'[email protected]' = @($BodyParams.'[email protected]')
                 }

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Groups/Invoke-ListGroups.ps1

@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-ListGroups {
+function Invoke-ListGroups {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -95,18 +95,16 @@ Function Invoke-ListGroups {
         } else {
             $GraphRequest = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/groups/$($GroupID)/$($members)?`$top=999&select=$selectstring" -tenantid $TenantFilter | Select-Object *, @{ Name = 'primDomain'; Expression = { $_.mail -split '@' | Select-Object -Last 1 } },
             @{Name = 'membersCsv'; Expression = { $_.members.userPrincipalName -join ',' } },
-            @{Name = 'teamsEnabled'; Expression = { if ($_.resourceProvisioningOptions -Like '*Team*') { $true }else { $false } } },
+            @{Name = 'teamsEnabled'; Expression = { if ($_.resourceProvisioningOptions -like '*Team*') { $true }else { $false } } },
             @{Name = 'calculatedGroupType'; Expression = {
-
-                    if ($_.mailEnabled -and $_.securityEnabled) {
+                    if ($_.groupTypes -contains 'Unified') {
+                        'Microsoft 365'
+                    } elseif ($_.mailEnabled -and $_.securityEnabled) {
                         'Mail-Enabled Security'
                     }
                     if (!$_.mailEnabled -and $_.securityEnabled) {
                         'Security'
                     }
-                    if ($_.groupTypes -contains 'Unified') {
-                        'Microsoft 365'
-                    }
                     if (([string]::isNullOrEmpty($_.groupTypes)) -and ($_.mailEnabled) -and (!$_.securityEnabled)) {
                         'Distribution List'
                     }