Merge pull request #202 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-ListAlertsQueue.ps1

@@ -33,7 +33,7 @@ Function Invoke-ListAlertsQueue {
         $TaskEntry = [PSCustomObject]@{
             Tenants         = @($Tenants.label)
             Conditions      = $TranslatedConditions
-            excludedTenants = ($Task.excludedTenants | ConvertFrom-Json -Depth 10 -ErrorAction SilentlyContinue)
+            excludedTenants = @($Task.excludedTenants | ConvertFrom-Json -Depth 10 -ErrorAction SilentlyContinue)
             Actions         = $TranslatedActions
             LogType         = $Task.type
             EventType       = 'Audit log Alert'
@@ -64,10 +64,16 @@ Function Invoke-ListAlertsQueue {
     }
 
     foreach ($Task in $ScheduledTasks) {
+        if ($Task.excludedTenants) {
+            $ExcludedTenants = @($Task.excludedTenants)
+        } else {
+            $ExcludedTenants = @()
+        }
+
         $TaskEntry = [PSCustomObject]@{
             RowKey          = $Task.RowKey
             PartitionKey    = $Task.PartitionKey
-            excludedTenants = $Task.excludedTenants
+            excludedTenants = @($ExcludedTenants)
             Tenants         = @($Task.Tenant)
             Conditions      = $Task.Name
             Actions         = $Task.PostExecution

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

@@ -170,7 +170,7 @@ Function Invoke-ListConditionalAccessPolicies {
                 id                                          = $cap.id
                 displayName                                 = $cap.displayName
                 customer                                    = $cap.Customer
-                tenantID                                    = $cap.TenantID
+                tenantID                                    = $TenantFilter
                 createdDateTime                             = $(if (![string]::IsNullOrEmpty($cap.createdDateTime)) { [datetime]$cap.createdDateTime } else { '' })
                 modifiedDateTime                            = $(if (![string]::IsNullOrEmpty($cap.modifiedDateTime)) { [datetime]$cap.modifiedDateTime }else { '' })
                 state                                       = $cap.state