fixes removal of tenantallowlists

KelvinTegelaar · Feb 7, 2025 · 3e8d41f · 3e8d41f
1 parent 1026a49
commit 3e8d41f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/...PPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-AddStandardsTemplate.ps1 b/...PPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-AddStandardsTemplate.ps1
@@ -20,7 +20,7 @@ Function Invoke-AddStandardsTemplate {
     $request.body | Add-Member -NotePropertyName 'createdAt' -NotePropertyValue ($Request.body.createdAt ? $Request.body.createdAt : (Get-Date).ToUniversalTime()) -Force
     $Request.body | Add-Member -NotePropertyName 'updatedBy' -NotePropertyValue ([System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($request.headers.'x-ms-client-principal')) | ConvertFrom-Json).userDetails -Force
     $Request.body | Add-Member -NotePropertyName 'updatedAt' -NotePropertyValue (Get-Date).ToUniversalTime() -Force
-    $JSON = (ConvertTo-Json -Depth 100 -InputObject ($Request.body))
+    $JSON = (ConvertTo-Json -Compress -Depth 100 -InputObject ($Request.body))
     $Table = Get-CippTable -tablename 'templates'
     $Table.Force = $true
     Add-CIPPAzDataTableEntity @Table -Entity @{

diff --git a/Modules/CIPPCore/Public/Entrypoints/Invoke-RemoveTenantAllowBlockList.ps1 b/Modules/CIPPCore/Public/Entrypoints/Invoke-RemoveTenantAllowBlockList.ps1
@@ -16,31 +16,39 @@ Function Invoke-RemoveTenantAllowBlockList {
     # Write to the Azure Functions log stream.
     Write-Host 'PowerShell HTTP trigger function processed a request.'
     try {
+
+        $listType = switch -Wildcard ($request.body.entries) {
+            '*@*' { 'Sender'; break }
+            '*.*' { 'Url'; break }
+            default { 'FileHash' }
+        }
+        Write-Host "List type is $listType"
         $ExoRequest = @{
-            tenantid  = $Request.query.tenantfilter
+            tenantid  = $Request.body.tenantfilter
             cmdlet    = 'Remove-TenantAllowBlockListItems'
             cmdParams = @{
-                Entries     = [string[]]$Request.query.entries
-                ListType    = [string]$Request.query.listType
+                Entries  = @($Request.body.entries)
+                ListType = $ListType
             }
         }
 
-        New-ExoRequest @ExoRequest
+        $Results = New-ExoRequest @ExoRequest
+        Write-Host $Results
 
-        $result = "Successfully removed $($Request.query.entries) from Block/Allow list"
+        $result = "Successfully removed $($Request.body.entries) from Block/Allow list"
         Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APIName -tenant $Request.query.tenantfilter -message $result -Sev 'Info'
     } catch {
         $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-        $result = "Failed to remove $($Request.query.entries). Error: $ErrorMessage"
+        $result = "Failed to remove $($Request.body.entries). Error: $ErrorMessage"
         Write-LogMessage -user $request.headers.'x-ms-client-principal' -API $APIName -tenant $Request.query.tenantfilter -message $result -Sev 'Error'
     }
 
     # Associate values to output bindings by calling 'Push-OutputBinding'.
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
-        StatusCode = [HttpStatusCode]::OK
-        Body       = @{
-            'Results' = $result
-            'Request' = $ExoRequest
-        }
-    })
+            StatusCode = [HttpStatusCode]::OK
+            Body       = @{
+                'Results' = $result
+                'Request' = $ExoRequest
+            }
+        })
 }