Merge pull request #478 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/New-CippCoreRequest.ps1

@@ -38,8 +38,17 @@ function New-CippCoreRequest {
                 Write-LogMessage -headers $Headers -API $Request.Params.CIPPEndpoint -message 'Accessed this API' -Sev 'Debug'
                 if ($Access) {
                     $Response = & $FunctionName @HttpTrigger
-                    if ($Response.StatusCode) {
-                        return ([HttpResponseContext]$Response)
+                    # Filter to only return HttpResponseContext objects
+                    $HttpResponse = $Response | Where-Object { $_.PSObject.TypeNames -contains 'HttpResponseContext' -or ($_.StatusCode -and $_.Body) }
+                    if ($HttpResponse) {
+                        # Return the first valid HttpResponseContext found
+                        return ([HttpResponseContext]($HttpResponse | Select-Object -First 1))
+                    } else {
+                        # If no valid response context found, create a default success response
+                        return ([HttpResponseContext]@{
+                                StatusCode = [HttpStatusCode]::OK
+                                Body       = $Response
+                            })
                     }
                 }
             } catch {
@@ -61,4 +70,4 @@ function New-CippCoreRequest {
                 Body       = 'Request not processed'
             })
     }
-}
+}

Modules/CIPPCore/Public/Set-CIPPCAExclusion.ps1

@@ -19,7 +19,7 @@ function Set-CIPPCAExclusion {
                     $ExcludeUsers.Add($User)
                 }
                 foreach ($User in $Users.value) {
-                    if ($ExcludeUsers -notcontains $User) {
+                    if ($User -and $User -ne '' -and $ExcludeUsers -notcontains $User) {
                         $ExcludeUsers.Add($User)
                     }
                 }
@@ -42,14 +42,20 @@ function Set-CIPPCAExclusion {
             }
 
             $RawJson = ConvertTo-Json -Depth 10 -InputObject $NewExclusions
-            if ($PSCmdlet.ShouldProcess($PolicyId, "Add exclusion for $UserID")) {
+
+            if ($Users) {
+                $UserIdentifier = ($Username -join ', ')
+            } else {
+                $UserIdentifier = $UserID
+            }
+            if ($PSCmdlet.ShouldProcess($PolicyId, "Add exclusion for $UserIdentifier")) {
                 $null = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies/$($CheckExisting.id)" -tenantid $tenantfilter -type PATCH -body $RawJSON -AsApp $true
             }
         }
 
         if ($ExclusionType -eq 'remove') {
             if ($Users) {
-                $UserID = $Users.value
+                $UserID = $Users.value | Where-Object { $_ -and $_ -ne '' }
                 $Username = $Users.addedFields.userPrincipalName
             } else {
                 if ($UserID -match '^[a-f0-9]{8}-([a-f0-9]{4}-){3}[a-f0-9]{12}$') {
@@ -64,7 +70,13 @@ function Set-CIPPCAExclusion {
                 }
             }
             $RawJson = ConvertTo-Json -Depth 10 -InputObject $NewExclusions
-            if ($PSCmdlet.ShouldProcess($PolicyId, "Remove exclusion for $UserID")) {
+            
+            if ($Users) {
+                $UserIdentifier = ($Username -join ', ')
+            } else {
+                $UserIdentifier = $UserID
+            }
+            if ($PSCmdlet.ShouldProcess($PolicyId, "Remove exclusion for $UserIdentifier")) {
                 $null = New-GraphPOSTRequest -uri "https://graph.microsoft.com/beta/identity/conditionalAccess/policies/$($CheckExisting.id)" -tenantid $tenantfilter -type PATCH -body $RawJSON -AsApp $true
             }
         }