fix casing and improve logging error handling

Author: kris6673

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Spamfilter/Invoke-AddTenantAllowBlockList.ps1

@@ -1,4 +1,4 @@
-Function Invoke-AddTenantAllowBlockList {
+function Invoke-AddTenantAllowBlockList {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -9,14 +9,16 @@ Function Invoke-AddTenantAllowBlockList {
     param($Request, $TriggerMetadata)
 
     $APIName = $Request.Params.CIPPEndpoint
+    $Headers = $Request.Headers
+
     $BlockListObject = $Request.Body
-    if ($Request.Body.tenantId -eq 'AllTenants') { $Tenants = (Get-Tenants).defaultDomainName } else { $Tenants = @($Request.body.tenantId) }
+    if ($Request.Body.tenantID -eq 'AllTenants') { $Tenants = (Get-Tenants).defaultDomainName } else { $Tenants = @($Request.body.tenantID) }
     $Results = [System.Collections.Generic.List[string]]::new()
     $Entries = @()
     if ($BlockListObject.entries -is [array]) {
         $Entries = $BlockListObject.entries
     } else {
-        $Entries = @($BlockListObject.entries -split "[,;]" | Where-Object { $_ -ne "" } | ForEach-Object { $_.Trim() })
+        $Entries = @($BlockListObject.entries -split '[,;]' | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | ForEach-Object { $_.Trim() })
     }
     foreach ($Tenant in $Tenants) {
         try {
@@ -38,19 +40,20 @@ Function Invoke-AddTenantAllowBlockList {
             }
 
             New-ExoRequest @ExoRequest
-
-            $results.add("Successfully added $($BlockListObject.Entries) as type $($BlockListObject.ListType) to the $($BlockListObject.listMethod) list for $tenant")
-            Write-LogMessage -headers $Request.Headers -API $APIName -tenant $Tenant -message $result -Sev 'Info'
+            $Result = "Successfully added $($BlockListObject.Entries) as type $($BlockListObject.ListType) to the $($BlockListObject.listMethod) list for $tenant"
+            $Results.Add($Result)
+            Write-LogMessage -headers $Headers -API $APIName -tenant $Tenant -message $Result -Sev 'Info'
         } catch {
-            $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-            $results.add("Failed to create blocklist. Error: $ErrorMessage")
-            Write-LogMessage -headers $Request.Headers -API $APIName -tenant $Tenant -message $result -Sev 'Error'
+            $ErrorMessage = Get-CippException -Exception $_
+            $Result = "Failed to create blocklist. Error: $($ErrorMessage.NormalizedError)"
+            $Results.Add($Result)
+            Write-LogMessage -headers $Headers -API $APIName -tenant $Tenant -message $Result -Sev 'Error' -LogData $ErrorMessage
         }
     }
     return ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK
             Body       = @{
-                'Results' = $results
+                'Results' = $Results
                 'Request' = $ExoRequest
             }
         })

Modules/CIPPCore/Public/Entrypoints/Invoke-ListTenantAllowBlockList.ps1

@@ -1,4 +1,4 @@
-Function Invoke-ListTenantAllowBlockList {
+function Invoke-ListTenantAllowBlockList {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -25,7 +25,7 @@ Function Invoke-ListTenantAllowBlockList {
         $Results = $ErrorMessage
     }
     return [HttpResponseContext]@{
-            StatusCode = $StatusCode
-            Body       = @($Results)
-        }
+        StatusCode = $StatusCode
+        Body       = @($Results)
+    }
 }