notification fixes

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecAddAlert.ps1

@@ -17,6 +17,21 @@ function Invoke-ExecAddAlert {
     $Severity = 'Alert'
 
     $Result = if ($Request.Body.sendEmailNow -or $Request.Body.sendWebhookNow -eq $true -or $Request.Body.writeLog -eq $true -or $Request.Body.sendPsaNow -eq $true) {
+        $sev = ([pscustomobject]$Request.body.Severity).value -join (',')
+        if ($Request.body.email -or $Request.body.webhook) {
+            Write-Host 'found config, setting'
+            $config = @{
+                email             = $Request.body.email
+                webhook           = $Request.body.webhook
+                onepertenant      = $Request.body.onePerTenant
+                logsToInclude     = $Request.body.logsToInclude
+                sendtoIntegration = $true
+                sev               = $sev
+            }
+            Write-Host "setting notification config to $($config | ConvertTo-Json)"
+            $Results = Set-cippNotificationConfig @Config
+            Write-Host $Results
+        }
         $Title = 'CIPP Notification Test'
         if ($Request.Body.sendEmailNow -eq $true) {
             $CIPPAlert = @{

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

@@ -14,36 +14,16 @@ Function Invoke-ExecNotificationConfig {
     $Headers = $Request.Headers
     Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
 
-
-
     $sev = ([pscustomobject]$Request.body.Severity).value -join (',')
-    $results = try {
-        $Table = Get-CIPPTable -TableName SchedulerConfig
-        $SchedulerConfig = @{
-            'tenant'            = 'Any'
-            'tenantid'          = 'TenantId'
-            'type'              = 'CIPPNotifications'
-            'schedule'          = 'Every 15 minutes'
-            'Severity'          = [string]$sev
-            'email'             = "$($Request.Body.email)"
-            'webhook'           = "$($Request.Body.webhook)"
-            'onePerTenant'      = [boolean]$Request.Body.onePerTenant
-            'sendtoIntegration' = [boolean]$Request.Body.sendtoIntegration
-            'includeTenantId'   = [boolean]$Request.Body.includeTenantId
-            'PartitionKey'      = 'CippNotifications'
-            'RowKey'            = 'CippNotifications'
-        }
-        foreach ($logvalue in [pscustomobject]$Request.body.logsToInclude) {
-            $SchedulerConfig[([pscustomobject]$logvalue.value)] = $true
-        }
-
-        Add-CIPPAzDataTableEntity @Table -Entity $SchedulerConfig -Force | Out-Null
-        'Successfully set the configuration'
-    } catch {
-        "Failed to set configuration: $($_.Exception.message)"
+    $config = @{
+        email             = $Request.body.email
+        webhook           = $Request.body.webhook
+        onepertenant      = $Request.body.onePerTenant
+        logsToInclude     = $Request.body.logsToInclude
+        sendtoIntegration = $Request.body.sendtoIntegration
+        sev               = $sev
     }
-
-
+    $Results = Set-cippNotificationConfig @Config
     $body = [pscustomobject]@{'Results' = $Results }
 
     # Associate values to output bindings by calling 'Push-OutputBinding'.

Modules/CIPPCore/Public/Set-CIPPNotificationConfig.ps1

@@ -0,0 +1,38 @@
+function Set-CIPPNotificationConfig {
+    [CmdletBinding()]
+    param (
+        $email,
+        $webhook,
+        $onepertenant,
+        $logsToInclude,
+        $sendtoIntegration,
+        $sev,
+        $APIName = 'Set Notification Config'
+    )
+
+    $results = try {
+        $Table = Get-CIPPTable -TableName SchedulerConfig
+        $SchedulerConfig = @{
+            'tenant'            = 'Any'
+            'tenantid'          = 'TenantId'
+            'type'              = 'CIPPNotifications'
+            'schedule'          = 'Every 15 minutes'
+            'Severity'          = [string]$sev
+            'email'             = "$($email)"
+            'webhook'           = "$($webhook)"
+            'onePerTenant'      = [boolean]$onePerTenant
+            'sendtoIntegration' = [boolean]$sendtoIntegration
+            'includeTenantId'   = $true
+            'PartitionKey'      = 'CippNotifications'
+            'RowKey'            = 'CippNotifications'
+        }
+        foreach ($logvalue in [pscustomobject]$logsToInclude) {
+            $SchedulerConfig[([pscustomobject]$logvalue.value)] = $true
+        }
+
+        Add-CIPPAzDataTableEntity @Table -Entity $SchedulerConfig -Force | Out-Null
+        return 'Successfully set the configuration'
+    } catch {
+        return "Failed to set configuration: $($_.Exception.message)"
+    }
+}