Feat: Add AssignmentFilterName and AssignmentFilterType parameters to Invoke-ExecAssignPolicy function

Fix: Modernize function

Author: kris6673

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/MEM/Invoke-ExecAssignPolicy.ps1

@@ -21,6 +21,8 @@ function Invoke-ExecAssignPolicy {
     $GroupIdsRaw = $Request.Body.GroupIds
     $GroupNamesRaw = $Request.Body.GroupNames
     $AssignmentMode = $Request.Body.assignmentMode
+    $AssignmentFilterName = $Request.Body.AssignmentFilterName
+    $AssignmentFilterType = $Request.Body.AssignmentFilterType
 
     # Standardize GroupIds input (can be array or comma-separated string)
     function Get-StandardizedList {
@@ -74,6 +76,14 @@ function Invoke-ExecAssignPolicy {
                 $params.ExcludeGroup = $ExcludeGroup
             }
 
+            if (-not [string]::IsNullOrWhiteSpace($AssignmentFilterName)) {
+                $params.AssignmentFilterName = $AssignmentFilterName
+            }
+
+            if (-not [string]::IsNullOrWhiteSpace($AssignmentFilterType)) {
+                $params.AssignmentFilterType = $AssignmentFilterType
+            }
+
             Set-CIPPAssignedPolicy @params
             $StatusCode = [HttpStatusCode]::OK
         } else {

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/MEM/Invoke-ListAssignmentFilters.ps1

@@ -11,15 +11,14 @@ function Invoke-ListAssignmentFilters {
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
 
-    Write-LogMessage -headers $Request.Headers -API $APINAME -message 'Accessed this API' -Sev Debug
-
     # Get the tenant filter
-    $TenantFilter = $Request.Query.TenantFilter
+    $TenantFilter = $Request.Query.tenantFilter
+    $FilterId = $Request.Query.filterId
 
     try {
-        if ($Request.Query.filterId) {
+        if ($FilterId) {
             # Get specific filter
-            $AssignmentFilters = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/deviceManagement/assignmentFilters/$($Request.Query.filterId)" -tenantid $TenantFilter
+            $AssignmentFilters = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/deviceManagement/assignmentFilters/$($FilterId)" -tenantid $TenantFilter
         } else {
             # Get all filters
             $AssignmentFilters = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/deviceManagement/assignmentFilters' -tenantid $TenantFilter
@@ -28,12 +27,11 @@ function Invoke-ListAssignmentFilters {
         $StatusCode = [HttpStatusCode]::OK
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
-        Write-LogMessage -headers $Request.Headers -API $APINAME -message "Failed to retrieve assignment filters: $($ErrorMessage.NormalizedError)" -Sev Error -LogData $ErrorMessage
+        Write-LogMessage -headers $Headers -API $APIName -message "Failed to retrieve assignment filters: $($ErrorMessage.NormalizedError)" -Sev Error -LogData $ErrorMessage
         $AssignmentFilters = @()
         $StatusCode = [HttpStatusCode]::InternalServerError
     }
 
-    # Associate values to output bindings by calling 'Push-OutputBinding'.
     return ([HttpResponseContext]@{
             StatusCode = $StatusCode
             Body       = @($AssignmentFilters)