Merge pull request #1123 from JohnDuprey/dev

Fix user mailbox offboarding
KelvinTegelaar · Sep 26, 2024 · 3dc6551 · 3dc6551
2 parents 5d29d92 + be034c9
commit 3dc6551
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/AddAlertSubscription_Queue/function.json b/AddAlertSubscription_Queue/function.json
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Security/Invoke-ExecAlertsList.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Security/Invoke-ExecAlertsList.ps1
@@ -61,7 +61,7 @@ Function Invoke-ExecAlertsList {
             $Rows = Get-CIPPAzDataTableEntity @Table -filter $Filter | Where-Object -Property Timestamp -GT (Get-Date).AddMinutes(-10)
             if (!$Rows) {
                 $TenantList = Get-Tenants -IncludeErrors
-                $Queue = New-CippQueueEntry -Name 'Alerts List' -TotalTasks ($TenantList | Measure-Object).Count
+                $Queue = New-CippQueueEntry -Name 'Alerts List - All Tenants' -TotalTasks ($TenantList | Measure-Object).Count
                 $InputObject = [PSCustomObject]@{
                     OrchestratorName = 'AlertsList'
                     QueueFunction    = [PSCustomObject]@{

diff --git a/Modules/CIPPCore/Public/Invoke-CIPPOffboardingJob.ps1 b/Modules/CIPPCore/Public/Invoke-CIPPOffboardingJob.ps1
@@ -81,13 +81,15 @@ function Invoke-CIPPOffboardingJob {
                 Remove-CIPPMailboxPermissions -PermissionsLevel @('FullAccess', 'SendAs', 'SendOnBehalf') -userid 'AllUsers' -AccessUser $UserName -TenantFilter $TenantFilter -APIName $APINAME -ExecutingUser $ExecutingUser
 
             } else {
+                $Queue = New-CippQueueEntry -Name "Offboarding - Mailbox Permissions: $Username" -TotalTasks 1
                 $InputObject = [PSCustomObject]@{
                     Batch            = @(
                         [PSCustomObject]@{
-                            'FunctionName'  = 'OffboardingMailboxPermissions'
+                            'FunctionName'  = 'ExecOffboardingMailboxPermissions'
                             'TenantFilter'  = $TenantFilter
                             'User'          = $Username
                             'executingUser' = $ExecutingUser
+                            'QueueId'       = $Queue.RowKey
                         }
                     )
                     OrchestratorName = "OffboardingMailboxPermissions_$Username"