Add system-scoped webhook routing for offboarding and drift notifications

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-CIPPOffboardingComplete.ps1

@@ -106,7 +106,7 @@ function Push-CIPPOffboardingComplete {
 
             # Send post-execution alerts if configured
             if ($TaskInfo.PostExecution -and $ProcessedResults) {
-                Send-CIPPScheduledTaskAlert -Results $ProcessedResults -TaskInfo $TaskInfo -TenantFilter $TenantFilter
+                Send-CIPPScheduledTaskAlert -Results $ProcessedResults -TaskInfo $TaskInfo -TenantFilter $TenantFilter -TaskType 'Offboarding'
             }
         }
 

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPDriftManagement.ps1

@@ -14,7 +14,9 @@ function Push-CippDriftManagement {
         if ($Drift.newDeviationsCount -gt 0) {
             $Settings = $Drift.driftSettings
             $email = $Settings.driftAlertEmail
-            $webhook = $Settings.driftAlertWebhook
+            $NotificationConfigTable = Get-CippTable -tablename SchedulerConfig
+            $NotificationConfig = Get-CIPPAzDataTableEntity @NotificationConfigTable -Filter "PartitionKey eq 'CippNotifications' and RowKey eq 'CippNotifications'"
+            $webhook = if ($NotificationConfig.driftWebhook) { $NotificationConfig.driftWebhook } else { $Settings.driftAlertWebhook }
             $CippConfigTable = Get-CippTable -tablename Config
             $CippConfig = Get-CIPPAzDataTableEntity @CippConfigTable -Filter "PartitionKey eq 'InstanceProperties' and RowKey eq 'CIPPURL'"
             $CIPPURL = 'https://{0}' -f $CippConfig.Value

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecNotificationConfig.ps1

@@ -11,6 +11,8 @@ Function Invoke-ExecNotificationConfig {
     $config = @{
         email             = $Request.body.email
         webhook           = $Request.body.webhook
+        offboardingWebhook = $Request.body.offboardingWebhook
+        driftWebhook      = $Request.body.driftWebhook
         onepertenant      = $Request.body.onePerTenant
         logsToInclude     = $Request.body.logsToInclude
         sendtoIntegration = $Request.body.sendtoIntegration

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

@@ -16,7 +16,7 @@ Function Invoke-ListNotificationConfig {
         $Config = @{}
     }
     #$config | Add-Member -NotePropertyValue @() -NotePropertyName 'logsToInclude' -Force
-    $config.logsToInclude = @(([pscustomobject]$config | Select-Object * -ExcludeProperty schedule, type, tenantid, onepertenant, sendtoIntegration, partitionkey, rowkey, tenant, ETag, email, logsToInclude, Severity, Alert, Info, Error, timestamp, webhook, includeTenantId).psobject.properties.name)
+    $config.logsToInclude = @(([pscustomobject]$config | Select-Object * -ExcludeProperty schedule, type, tenantid, onepertenant, sendtoIntegration, partitionkey, rowkey, tenant, ETag, email, logsToInclude, Severity, Alert, Info, Error, timestamp, webhook, offboardingWebhook, driftWebhook, includeTenantId).psobject.properties.name)
     if (!$config.logsToInclude) {
         $config.logsToInclude = @('None')
     }

Modules/CIPPCore/Public/Send-CIPPScheduledTaskAlert.ps1

@@ -80,14 +80,20 @@ function Send-CIPPScheduledTaskAlert {
                 Send-CIPPAlert -Type 'email' -Title $title -HTMLContent $HTML -TenantFilter $TenantFilter
             }
             '*webhook*' {
+                $altWebhook = $TaskInfo.PostExecution.WebhookPath
+                if (-not $altWebhook -and $TaskType -eq 'Offboarding') {
+                    $NotificationConfigTable = Get-CippTable -tablename SchedulerConfig
+                    $NotificationConfig = Get-CIPPAzDataTableEntity @NotificationConfigTable -Filter "PartitionKey eq 'CippNotifications' and RowKey eq 'CippNotifications'"
+                    $altWebhook = $NotificationConfig.offboardingWebhook
+                }
                 $Webhook = [PSCustomObject]@{
                     'tenantId'     = $TenantInfo.customerId
                     'Tenant'       = $TenantFilter
                     'TaskInfo'     = $TaskInfo
                     'Results'      = $Results
                     'AlertComment' = $TaskInfo.AlertComment
                 }
-                Send-CIPPAlert -Type 'webhook' -Title $title -TenantFilter $TenantFilter -JSONContent $($Webhook | ConvertTo-Json -Depth 20)
+                Send-CIPPAlert -Type 'webhook' -Title $title -TenantFilter $TenantFilter -JSONContent $($Webhook | ConvertTo-Json -Depth 20) -altWebhook $altWebhook
             }
         }
 

Modules/CIPPCore/Public/Set-CIPPNotificationConfig.ps1

@@ -3,6 +3,8 @@ function Set-CIPPNotificationConfig {
     param (
         $email,
         $webhook,
+        $offboardingWebhook,
+        $driftWebhook,
         $onepertenant,
         $logsToInclude,
         $sendtoIntegration,
@@ -20,6 +22,8 @@ function Set-CIPPNotificationConfig {
             'Severity'          = [string]$sev
             'email'             = "$($email)"
             'webhook'           = "$($webhook)"
+            'offboardingWebhook' = "$($offboardingWebhook)"
+            'driftWebhook'      = "$($driftWebhook)"
             'onePerTenant'      = [boolean]$onePerTenant
             'sendtoIntegration' = [boolean]$sendtoIntegration
             'includeTenantId'   = $true

openapi.json

@@ -5791,6 +5791,22 @@
             "name": "Webhook",
             "in": "body"
           },
+          {
+            "required": false,
+            "schema": {
+              "type": "string"
+            },
+            "name": "offboardingWebhook",
+            "in": "body"
+          },
+          {
+            "required": false,
+            "schema": {
+              "type": "string"
+            },
+            "name": "driftWebhook",
+            "in": "body"
+          },
           {
             "required": true,
             "schema": {