handles individual and multiple values correctly

Author: Zacgoose

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

@@ -17,13 +17,19 @@ Function Invoke-AddTenantAllowBlockList {
     $BlockListObject = $Request.Body
     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() })
+    }
     foreach ($Tenant in $Tenants) {
         try {
             $ExoRequest = @{
                 tenantid  = $Tenant
                 cmdlet    = 'New-TenantAllowBlockListItems'
                 cmdParams = @{
-                    Entries                     = [string[]]$BlockListObject.entries
+                    Entries                     = $Entries
                     ListType                    = [string]$BlockListObject.listType
                     Notes                       = [string]$BlockListObject.notes
                     $BlockListObject.listMethod = [bool]$true
@@ -32,6 +38,8 @@ Function Invoke-AddTenantAllowBlockList {
 
             if ($BlockListObject.NoExpiration -eq $true) {
                 $ExoRequest.cmdParams.NoExpiration = $true
+            } elseif ($BlockListObject.RemoveAfter -eq $true) {
+                $ExoRequest.cmdParams.RemoveAfter = 45
             }
 
             New-ExoRequest @ExoRequest