feat(named-locations): support removing multiple IPs and locations

- Updated Set-CIPPNamedLocation to handle multiple IPs and locations for removal.
- Enhanced Invoke-ExecNamedLocation to correctly process input values.

Author: kris6673

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-ExecNamedLocation.ps1

@@ -11,28 +11,25 @@ function Invoke-ExecNamedLocation {
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
 
-
-
     # Interact with query parameters or the body of the request.
     $TenantFilter = $Request.Body.tenantFilter ?? $Request.Query.tenantFilter
     $NamedLocationId = $Request.Body.namedLocationId ?? $Request.Query.namedLocationId
     $Change = $Request.Body.change ?? $Request.Query.change
-    $Content = $Request.Body.input ?? $Request.Query.input
-    if ($content.value) { $content = $content.value }
+    $Content = $Request.Body.input.value ?? $Request.Query.input.value
 
     try {
-        $results = Set-CIPPNamedLocation -NamedLocationId $NamedLocationId -TenantFilter $TenantFilter -Change $Change -Content $Content -Headers $Headers
+        $Results = Set-CIPPNamedLocation -NamedLocationId $NamedLocationId -TenantFilter $TenantFilter -Change $Change -Content $Content -Headers $Headers
         $StatusCode = [HttpStatusCode]::OK
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
         Write-LogMessage -headers $Headers -API $APIName -message "Failed to edit named location: $($ErrorMessage.NormalizedError)" -Sev 'Error' -tenant $TenantFilter -LogData $ErrorMessage
-        $results = "Failed to edit named location. Error: $($ErrorMessage.NormalizedError)"
+        $Results = "Failed to edit named location. Error: $($ErrorMessage.NormalizedError)"
         $StatusCode = [HttpStatusCode]::InternalServerError
     }
 
     return ([HttpResponseContext]@{
             StatusCode = $StatusCode
-            Body       = @{'Results' = @($results) }
+            Body       = @{'Results' = @($Results) }
         })
 
 }

Modules/CIPPCore/Public/Set-CIPPNamedLocation.ps1

@@ -24,12 +24,14 @@ function Set-CIPPNamedLocation {
                 $ActionDescription = "Adding location $Content to named location"
             }
             'removeIp' {
-                $NamedLocations.ipRanges = @($NamedLocations.ipRanges | Where-Object -Property cidrAddress -NE $Content)
-                $ActionDescription = "Removing IP $Content from named location"
+                $IpsToRemove = @($Content)
+                $NamedLocations.ipRanges = @($NamedLocations.ipRanges | Where-Object { $_.cidrAddress -notin $IpsToRemove })
+                $ActionDescription = "Removing IP(s) $($IpsToRemove -join ', ') from named location"
             }
             'removeLocation' {
-                $NamedLocations.countriesAndRegions = @($NamedLocations.countriesAndRegions | Where-Object { $_ -NE $Content })
-                $ActionDescription = "Removing location $Content from named location"
+                $LocationsToRemove = @($Content)
+                $NamedLocations.countriesAndRegions = @($NamedLocations.countriesAndRegions | Where-Object { $_ -notin $LocationsToRemove })
+                $ActionDescription = "Removing location(s) $($LocationsToRemove -join ', ') from named location"
             }
             'rename' {
                 $NamedLocations.displayName = $Content