Merge pull request #1056 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-AddUserDefaults.ps1

@@ -73,13 +73,13 @@ function Invoke-AddUserDefaults {
 
         # Contact fields
         $MobilePhone = $Request.Body.mobilePhone
-        $BusinessPhones = if ($null -ne $Request.Body.businessPhones) {
-            if ($Request.Body.businessPhones -is [array]) { $Request.Body.businessPhones[0] } else { $Request.Body.businessPhones }
-        } elseif ($null -ne $Request.Body.'businessPhones[0]') {
-            $Request.Body.'businessPhones[0]'
-        } else {
-            $null
-        }
+        $BusinessPhones = @(
+            if ($null -ne $Request.Body.businessPhones) {
+                $Request.Body.businessPhones | Where-Object { -not [string]::IsNullOrWhiteSpace($_) }
+            } elseif ($null -ne $Request.Body.'businessPhones[0]') {
+                $Request.Body.'businessPhones[0]' | Where-Object { -not [string]::IsNullOrWhiteSpace($_) }
+            }
+        )
         $OtherMails = $Request.Body.otherMails
 
         # User relations

Modules/CIPPHTTP/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-EditUser.ps1

@@ -187,12 +187,13 @@ function Invoke-EditUser {
         $AddToGroups | ForEach-Object {
 
             $GroupType = $_.addedFields.groupType
+            $CalculatedGroupType = $_.addedFields.calculatedGroupType ?? $null
             $GroupID = $_.value
             $GroupName = $_.label
             Write-Host "About to add $($UserObj.userPrincipalName) to $GroupName. Group ID is: $GroupID and type is: $GroupType"
 
             try {
-                if ($GroupType -eq 'distributionList' -or $GroupType -eq 'security') {
+                if ($GroupType -eq 'distributionList' -or $GroupType -eq 'security' -and ($calculatedGroupType -ne 'generic' )) {
                     Write-Host 'Adding to group via Add-DistributionGroupMember'
                     $Params = @{ Identity = $GroupID; Member = $UserObj.id; BypassSecurityGroupManagerCheck = $true }
                     $null = New-ExoRequest -tenantid $UserObj.tenantFilter -cmdlet 'Add-DistributionGroupMember' -cmdParams $params -UseSystemMailbox $true
@@ -219,12 +220,13 @@ function Invoke-EditUser {
         $RemoveFromGroups | ForEach-Object {
 
             $GroupType = $_.addedFields.groupType
+            $CalculatedGroupType = $_.addedFields.calculatedGroupType ?? $null
             $GroupID = $_.value
             $GroupName = $_.label
             Write-Host "About to remove $($UserObj.userPrincipalName) from $GroupName. Group ID is: $GroupID and type is: $GroupType"
 
             try {
-                if ($GroupType -eq 'distributionList' -or $GroupType -eq 'security') {
+                if ($GroupType -eq 'distributionList' -or $GroupType -eq 'security' -and ($calculatedGroupType -ne 'generic' )) {
                     Write-Host 'Removing From group via Remove-DistributionGroupMember'
                     $Params = @{ Identity = $GroupID; Member = $UserObj.id; BypassSecurityGroupManagerCheck = $true }
                     $null = New-ExoRequest -tenantid $UserObj.tenantFilter -cmdlet 'Remove-DistributionGroupMember' -cmdParams $params -UseSystemMailbox $true