Merge pull request #250 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

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

@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-ExecAddAlert {
+function Invoke-ExecAddAlert {
     <#
     .FUNCTIONALITY
         Entrypoint,AnyTenant
@@ -16,17 +16,17 @@ Function Invoke-ExecAddAlert {
 
     $Severity = 'Alert'
 
-    $Result = if ($Request.Body.sendEmailNow -or $Request.Body.sendWebhookNow -eq $true -or $Request.Body.writeLog -eq $true) {
+    $Result = if ($Request.Body.sendEmailNow -or $Request.Body.sendWebhookNow -eq $true -or $Request.Body.writeLog -eq $true -or $Request.Body.sendPsaNow -eq $true) {
         $Title = 'CIPP Notification Test'
-        if ($Request.Body.sendEmailNow) {
+        if ($Request.Body.sendEmailNow -eq $true) {
             $CIPPAlert = @{
                 Type        = 'email'
                 Title       = $Title
                 HTMLContent = $Request.Body.text
             }
             Send-CIPPAlert @CIPPAlert
         }
-        if ($Request.Body.sendWebhookNow) {
+        if ($Request.Body.sendWebhookNow -eq $true) {
             $JSONContent = @{
                 Title = $Title
                 Text  = $Request.Body.text
@@ -38,7 +38,16 @@ Function Invoke-ExecAddAlert {
             }
             Send-CIPPAlert @CIPPAlert
         }
-        if ($Request.Body.writeLog) {
+        if ($Request.Body.sendPsaNow -eq $true) {
+            $CIPPAlert = @{
+                Type        = 'psa'
+                Title       = $Title
+                HTMLContent = $Request.Body.text
+            }
+            Send-CIPPAlert @CIPPAlert
+        }
+
+        if ($Request.Body.writeLog -eq $true) {
             Write-LogMessage -headers $Headers -API 'Alerts' -message $Request.Body.text -Sev $Severity
             'Successfully generated alert.'
         }

Modules/CIPPCore/Public/Send-CIPPAlert.ps1

@@ -106,9 +106,9 @@ function Send-CIPPAlert {
             Write-LogMessage -API 'Webhook Alerts' -message "Could not send alerts to webhook: $($ErrorMessage.NormalizedError)" -tenant $TenantFilter -sev error -LogData $ErrorMessage
         }
     }
-    Write-Information 'Trying to send to PSA'
 
     if ($Type -eq 'psa') {
+        Write-Information 'Trying to send to PSA'
         if ($config.sendtoIntegration) {
             if ($PSCmdlet.ShouldProcess('PSA', 'Sending alert')) {
                 try {
@@ -119,7 +119,6 @@ function Send-CIPPAlert {
                     }
                     New-CippExtAlert -Alert $Alert
                     Write-LogMessage -API 'Webhook Alerts' -tenant $TenantFilter -message "Sent PSA alert $title" -sev info
-
                 } catch {
                     $ErrorMessage = Get-CippException -Exception $_
                     Write-Information "Could not send alerts to ticketing system: $($ErrorMessage.NormalizedError)"

Modules/CippExtensions/Public/Halo/New-HaloPSATicket.ps1

@@ -32,9 +32,9 @@ function New-HaloPSATicket {
                 try {
                     if ($PSCmdlet.ShouldProcess('Add note to HaloPSA ticket', 'Add note')) {
                         $Action = Invoke-RestMethod -Uri "$($Configuration.ResourceURL)/actions" -ContentType 'application/json; charset=utf-8' -Method Post -Body $body -Headers @{Authorization = "Bearer $($token.access_token)" }
-                        Write-Information "Note added to ticket in HaloPSA: $($Action.id)"
+                        Write-Information "Note added to ticket in HaloPSA: $($ExistingTicket.TicketID)"
                     }
-                    return
+                    return "Note added to ticket in HaloPSA: $($ExistingTicket.TicketID)"
                 } catch {
                     $Message = if ($_.ErrorDetails.Message) {
                         Get-NormalizedError -Message $_.ErrorDetails.Message
@@ -44,7 +44,7 @@ function New-HaloPSATicket {
                     Write-LogMessage -message "Failed to add note to HaloPSA ticket: $Message" -API 'HaloPSATicket' -sev Error -LogData (Get-CippException -Exception $_)
                     Write-Information "Failed to add note to HaloPSA ticket: $Message"
                     Write-Information "Body we tried to ship: $body"
-                    return
+                    return "Failed to add note to HaloPSA ticket: $Message"
                 }
             }
         }
@@ -66,6 +66,7 @@ function New-HaloPSATicket {
         details_html               = $description
         donotapplytemplateintheapi = $true
         attachments                = @()
+        _novalidate                = $true
     }
 
     if ($Configuration.TicketType) {
@@ -93,6 +94,7 @@ function New-HaloPSATicket {
                 Add-CIPPAzDataTableEntity @TicketTable -Entity $TicketObject -Force
                 Write-Information 'Ticket added to consolidation table'
             }
+            return "Ticket created in HaloPSA: $($Ticket.id)"
         }
     } catch {
         $Message = if ($_.ErrorDetails.Message) {
@@ -103,5 +105,6 @@ function New-HaloPSATicket {
         Write-LogMessage -message "Failed to send ticket to HaloPSA: $Message" -API 'HaloPSATicket' -sev Error -LogData (Get-CippException -Exception $_)
         Write-Information "Failed to send ticket to HaloPSA: $Message"
         Write-Information "Body we tried to ship: $body"
+        return "Failed to send ticket to HaloPSA: $Message"
     }
 }