fix: enhance result processing in mailbox permissions and orchestration triggers

Author: JohnDuprey

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Mailbox Permissions/Push-StoreMailboxPermissions.ps1

@@ -40,25 +40,28 @@ function Push-StoreMailboxPermissions {
                 $ActualResult = $BatchResult[0]
             }
 
-            if ($ActualResult -and $ActualResult -is [hashtable]) {
+            if ($ActualResult -and ($ActualResult -is [hashtable] -or $ActualResult -is [System.Collections.IDictionary])) {
                 Write-Information "Processing hashtable result with keys: $($ActualResult.Keys -join ', ')"
                 # Results are grouped by cmdlet name due to ReturnWithCommand
                 if ($ActualResult['Get-MailboxPermission']) {
-                    Write-Information "Adding $($ActualResult['Get-MailboxPermission'].Count) mailbox permissions"
-                    $AllMailboxPermissions.AddRange($ActualResult['Get-MailboxPermission'])
+                    $MailboxPerms = @($ActualResult['Get-MailboxPermission'])
+                    Write-Information "Adding $($MailboxPerms.Count) mailbox permissions"
+                    $AllMailboxPermissions.AddRange($MailboxPerms)
                 }
                 if ($ActualResult['Get-RecipientPermission']) {
-                    Write-Information "Adding $($ActualResult['Get-RecipientPermission'].Count) recipient permissions"
-                    $AllRecipientPermissions.AddRange($ActualResult['Get-RecipientPermission'])
+                    $RecipientPerms = @($ActualResult['Get-RecipientPermission'])
+                    Write-Information "Adding $($RecipientPerms.Count) recipient permissions"
+                    $AllRecipientPermissions.AddRange($RecipientPerms)
                 }
                 if ($ActualResult['Get-Mailbox']) {
                     $SendOnBehalfRows = @($ActualResult['Get-Mailbox'])
                     Write-Information "Adding $($SendOnBehalfRows.Count) send-on-behalf permissions"
                     $AllSendOnBehalfPermissions.AddRange($SendOnBehalfRows)
                 }
                 if ($ActualResult['Get-MailboxFolderPermission']) {
-                    Write-Information "Adding $($ActualResult['Get-MailboxFolderPermission'].Count) calendar permissions"
-                    $AllCalendarPermissions.AddRange($ActualResult['Get-MailboxFolderPermission'])
+                    $CalendarPerms = @($ActualResult['Get-MailboxFolderPermission'])
+                    Write-Information "Adding $($CalendarPerms.Count) calendar permissions"
+                    $AllCalendarPermissions.AddRange($CalendarPerms)
                 }
             } else {
                 Write-Information "Skipping non-hashtable result: $($ActualResult.GetType().Name)"

Modules/CippEntrypoints/CippEntrypoints.psm1

@@ -176,7 +176,7 @@ function Receive-CippQueueTrigger {
     param($QueueItem, $TriggerMetadata)
 
     Write-Information '####### Starting CIPP Queue Trigger'
-    Write-Information "QueueItem: $($QueueItem | ConvertTo-Json -Depth 10 -Compress)"
+    $QueueItem = $QueueItem | ConvertTo-Json -Depth 10 | ConvertFrom-Json
     Set-Location (Get-Item $PSScriptRoot).Parent.Parent.FullName
 
     if (Get-Command -Name $QueueItem.Cmdlet -Module CIPPCore -ErrorAction SilentlyContinue) {
@@ -264,6 +264,8 @@ function Receive-CippOrchestrationTrigger {
             $Batch = @()
         }
 
+        $Batch = @($Batch | Where-Object { $null -ne $_.FunctionName })
+
         if (($Batch | Measure-Object).Count -gt 0) {
             Write-Information "Batch Count: $($Batch.Count)"
             $Output = foreach ($Item in $Batch) {
@@ -301,6 +303,9 @@ function Receive-CippOrchestrationTrigger {
             } else {
                 $Results = $Output
             }
+        } else {
+            Write-Information 'No activities to execute in batch'
+            $Results = @()
         }
 
         if ($Results -and $OrchestratorInput.PostExecution) {