Merge pull request #766 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ListUserMailboxDetails.ps1

@@ -155,7 +155,6 @@ function Invoke-ListUserMailboxDetails {
             # First try users array
             $matchedUser = $usernames | Where-Object {
                 $_.id -eq $rawAddress -or
-                $_.displayName -eq $rawAddress -or
                 $_.mailNickname -eq $rawAddress
             }
 
@@ -166,7 +165,8 @@ function Invoke-ListUserMailboxDetails {
                 try {
                     # Escape single quotes in the filter value
                     $escapedAddress = $rawAddress -replace "'", "''"
-                    $filterQuery = "displayName eq '$escapedAddress' or mailNickname eq '$escapedAddress'"
+                    $escapedNickname = $rawAddress -replace "'", "''" -replace ' ', ''
+                    $filterQuery = "displayName eq '$escapedAddress' or mailNickname eq '$escapedNickname'"
                     $contactUri = "https://graph.microsoft.com/beta/contacts?`$filter=$filterQuery&`$select=displayName,mail,mailNickname"
 
                     $matchedContacts = New-GraphGetRequest -tenantid $TenantFilter -uri $contactUri

Modules/CIPPCore/Public/New-CIPPCAPolicy.ps1

@@ -92,7 +92,9 @@ function New-CIPPCAPolicy {
     Remove-EmptyArrays -Object $JSONobj
     #Remove context as it does not belong in the payload.
     try {
-        $JSONobj.grantControls.PSObject.Properties.Remove('[email protected]')
+        if ($JSONobj.grantControls) {
+            $JSONobj.grantControls.PSObject.Properties.Remove('[email protected]')
+        }
         $JSONobj.templateId ? $JSONobj.PSObject.Properties.Remove('templateId') : $null
         if ($JSONobj.conditions.users.excludeGuestsOrExternalUsers.externalTenants.Members) {
             $JSONobj.conditions.users.excludeGuestsOrExternalUsers.externalTenants.PSObject.Properties.Remove('@odata.context')
@@ -426,7 +428,7 @@ function New-CIPPCAPolicy {
                 # Preserve any exclusion groups named "Vacation Exclusion - <PolicyDisplayName>" from existing policy
                 try {
                     $ExistingVacationGroup = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/groups?`$filter=startsWith(displayName,'Vacation Exclusion')&`$select=id,displayName&`$top=999&`$count=true" -ComplexFilter -tenantid $TenantFilter -asApp $true |
-                    Where-Object { $CheckExisting.conditions.users.excludeGroups -contains $_.id }
+                        Where-Object { $CheckExisting.conditions.users.excludeGroups -contains $_.id }
                     if ($ExistingVacationGroup) {
                         if (-not ($JSONobj.conditions.users.PSObject.Properties.Name -contains 'excludeGroups')) {
                             $JSONobj.conditions.users | Add-Member -NotePropertyName 'excludeGroups' -NotePropertyValue @() -Force