Merge pull request #93 from KelvinTegelaar/dev

pull[bot] · web-flow · commit bd6496807d2d · 2025-02-26T00:41:05.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPCore/Public/Add-CIPPScheduledTask.ps1 b/Modules/CIPPCore/Public/Add-CIPPScheduledTask.ps1
@@ -23,6 +23,10 @@ function Add-CIPPScheduledTask {
     $Parameters = [System.Collections.Hashtable]@{}
     foreach ($Key in $task.Parameters.PSObject.Properties.Name) {
         $Param = $task.Parameters.$Key
+
+        if ($null -eq $Param -or $Param -eq '' -or ($Param | Measure-Object).Count -eq 0) {
+            continue
+        }
         if ($Param -is [System.Collections.IDictionary] -or $Param.Key) {
             $ht = @{}
             foreach ($p in $Param.GetEnumerator()) {
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1
@@ -40,7 +40,7 @@ function Push-ExecScheduledCommand {
         Write-Host "Failed to remove parameters: $($_.Exception.Message)"
     }
 
-    $tenant = $Item.Parameters.TenantFilter
+    $tenant = $Item.Parameters.TenantFilter ?? $Item.Tenant
     Write-Host "Started Task: $($Item.Command) for tenant: $tenant"
     try {
 
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/GDAP/Invoke-ExecGDAPInvite.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/GDAP/Invoke-ExecGDAPInvite.ps1
@@ -82,7 +82,14 @@ Function Invoke-ExecGDAPInvite {
     } catch {
         $Message = 'Error creating GDAP relationship, failed at step: ' + $Step
         Write-Host "GDAP ERROR: $($_.InvocationInfo.PositionMessage)"
-        Write-LogMessage -headers $Request.Headers -API $APINAME -tenant $env:TenantID -message "$($Message): $($_.Exception.Message)" -Sev 'Error' -LogData (Get-CippException -Exception $_)
+
+        if ($Step -eq 'Creating GDAP relationship' -and $_.Exception.Message -match 'The user (principal) does not have the required permissions to perform the specified action on the resource.') {
+            $Message = 'Error creating GDAP relationship, ensure that all users have MFA enabled and enforced without exception. Please see the Microsoft Partner Security Requirements documentation for more information. https://learn.microsoft.com/en-us/partner-center/security/partner-security-requirements'
+        } else {
+            $Message = "$($Message): $($_.Exception.Message)"
+        }
+
+        Write-LogMessage -headers $Request.Headers -API $APINAME -tenant $env:TenantID -message $Message -Sev 'Error' -LogData (Get-CippException -Exception $_)
     }
 
     $body = @{
diff --git a/Modules/CIPPCore/Public/Invoke-CIPPStandardsRun.ps1 b/Modules/CIPPCore/Public/Invoke-CIPPStandardsRun.ps1
@@ -34,6 +34,7 @@ function Invoke-CIPPStandardsRun {
                 runManually  = $runManually
             }
         }
+        SkipLog          = $true
     }
     if ($TemplateID) {
         $InputObject.QueueFunction.StandardParams['TemplateId'] = $TemplateID
diff --git a/Modules/CIPPCore/Public/Webhooks/Invoke-CIPPGraphWebhookRenewal.ps1 b/Modules/CIPPCore/Public/Webhooks/Invoke-CIPPGraphWebhookRenewal.ps1
@@ -1,45 +1,47 @@
 function Invoke-CippGraphWebhookRenewal {
-    $RenewalDate = (Get-Date).AddDays(1).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
+    $RenewalDate = (Get-Date).AddDays(1).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ss.fffZ')
     $body = @{
-        "expirationDateTime" = "$RenewalDate"
+        'expirationDateTime' = "$RenewalDate"
     } | ConvertTo-Json
 
-
     $WebhookTable = Get-CIPPTable -TableName webhookTable
-    $WebhookData = Get-AzDataTableEntity @WebhookTable | Where-Object { $null -ne $_.SubscriptionID -and $_.SubscriptionID -ne '' -and ((Get-Date($_.Expiration)) -le ((Get-Date).AddHours(2))) }
+    try {
+        $WebhookData = Get-AzDataTableEntity @WebhookTable | Where-Object { $null -ne $_.SubscriptionID -and $_.SubscriptionID -ne '' -and ((Get-Date($_.Expiration)) -le ((Get-Date).AddHours(2))) }
+    } catch {
+        $WebhookData = @()
+    }
 
-    foreach ($UpdateSub in $WebhookData) {
-        try {
-            $TenantFilter = $UpdateSub.PartitionKey
+    if (($WebhookData | Measure-Object).Count -gt 0) {
+        foreach ($UpdateSub in $WebhookData) {
             try {
-                $null = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/subscriptions/$($UpdateSub.SubscriptionID)" -tenantid $TenantFilter -type PATCH -body $body -Verbose
-                $UpdateSub.Expiration = $RenewalDate
-                $null = Add-AzDataTableEntity @WebhookTable -Entity $UpdateSub -Force
-                Write-LogMessage -Headers'CIPP' -API 'Renew_Graph_Subscriptions' -message "Renewed Subscription:$($UpdateSub.SubscriptionID)" -Sev "Info" -tenant $TenantFilter
-
-            } catch {
-                # Rebuild creation parameters
-                $BaseURL = "$(([uri]($UpdateSub.WebhookNotificationUrl)).Host)"
-                if ($UpdateSub.TypeofSubscription) {
-                    $TypeofSubscription = "$($UpdateSub.TypeofSubscription)"
-                } else {
-                    $TypeofSubscription = 'updated'
+                $TenantFilter = $UpdateSub.PartitionKey
+                try {
+                    $null = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/subscriptions/$($UpdateSub.SubscriptionID)" -tenantid $TenantFilter -type PATCH -body $body -Verbose
+                    $UpdateSub.Expiration = $RenewalDate
+                    $null = Add-AzDataTableEntity @WebhookTable -Entity $UpdateSub -Force
+                    Write-LogMessage -API 'Renew_Graph_Subscriptions' -message "Renewed Subscription:$($UpdateSub.SubscriptionID)" -Sev 'Info' -tenant $TenantFilter
+
+                } catch {
+                    # Rebuild creation parameters
+                    $BaseURL = "$(([uri]($UpdateSub.WebhookNotificationUrl)).Host)"
+                    if ($UpdateSub.TypeofSubscription) {
+                        $TypeofSubscription = "$($UpdateSub.TypeofSubscription)"
+                    } else {
+                        $TypeofSubscription = 'updated'
+                    }
+                    $Resource = "$($UpdateSub.Resource)"
+                    $EventType = "$($UpdateSub.EventType)"
+
+                    Write-LogMessage -API 'Renew_Graph_Subscriptions' -message "Recreating: $($UpdateSub.SubscriptionID) as renewal failed." -Sev 'Info' -tenant $TenantFilter
+                    $CreateResult = New-CIPPGraphSubscription -TenantFilter $TenantFilter -TypeofSubscription $TypeofSubscription -BaseURL $BaseURL -Resource $Resource -EventType $EventType -Headers 'GraphSubscriptionRenewal' -Recreate
+
+                    if ($CreateResult -match 'Created Webhook subscription for') {
+                        Remove-AzDataTableEntity -Force @WebhookTable -Entity $UpdateSub
+                    }
                 }
-                $Resource = "$($UpdateSub.Resource)"
-                $EventType = "$($UpdateSub.EventType)"
-
-                Write-LogMessage -Headers'CIPP' -API 'Renew_Graph_Subscriptions' -message "Recreating: $($UpdateSub.SubscriptionID) as renewal failed." -Sev "Info" -tenant $TenantFilter
-                $CreateResult = New-CIPPGraphSubscription -TenantFilter $TenantFilter -TypeofSubscription $TypeofSubscription -BaseURL $BaseURL -Resource $Resource -EventType $EventType -Headers 'GraphSubscriptionRenewal' -Recreate
-
-                if ($CreateResult -match 'Created Webhook subscription for') {
-                    Remove-AzDataTableEntity -Force @WebhookTable -Entity $UpdateSub
-                }
-
+            } catch {
+                Write-LogMessage -API 'Renew_Graph_Subscriptions' -message "Failed to renew Webhook Subscription: $($UpdateSub.SubscriptionID). Linenumber: $($_.InvocationInfo.ScriptLineNumber) Error: $($_.Exception.message)" -Sev 'Error' -tenant $TenantFilter
             }
-
-
-        } catch {
-            Write-LogMessage -Headers'CIPP' -API 'Renew_Graph_Subscriptions' -message "Failed to renew Webhook Subscription: $($UpdateSub.SubscriptionID). Linenumber: $($_.InvocationInfo.ScriptLineNumber) Error: $($_.Exception.message)" -Sev "Error" -tenant $TenantFilter
         }
     }
 }
diff --git a/Modules/CippExtensions/Public/Halo/New-HaloPSATicket.ps1 b/Modules/CippExtensions/Public/Halo/New-HaloPSATicket.ps1
@@ -8,8 +8,46 @@ function New-HaloPSATicket {
     #Get Halo PSA Token based on the config we have.
     $Table = Get-CIPPTable -TableName Extensionsconfig
     $Configuration = ((Get-CIPPAzDataTableEntity @Table).config | ConvertFrom-Json).HaloPSA
-
+    $TicketTable = Get-CIPPTable -TableName 'PSATickets'
     $token = Get-HaloToken -configuration $Configuration
+
+    if ($Configuration.ConsolidateTickets) {
+        $ExistingTicket = Get-CIPPAzDataTableEntity @TicketTable -Filter "PartitionKey eq 'HaloPSA' and RowKey eq '$($client)-$($title)'"
+        if ($ExistingTicket) {
+            Write-Information "Ticket already exists in HaloPSA: $($ExistingTicket.TicketID)"
+
+            $Ticket = Invoke-RestMethod -Uri "$($Configuration.ResourceURL)/Tickets/$($ExistingTicket.TicketID)?includedetails=true&includelastaction=false&nocache=undefined&includeusersassets=false&isdetailscreen=true" -ContentType 'application/json; charset=utf-8' -Method Get -Headers @{Authorization = "Bearer $($token.access_token)" }
+            if (!$Ticket.hasbeenclosed) {
+                Write-Information 'Ticket is still open, adding new note'
+                $Object = [PSCustomObject]@{
+                    ticket_id      = $ExistingTicket.TicketID
+                    outcome        = 'Private Note'
+                    outcome_id     = 7
+                    hiddenfromuser = $true
+                    note_html      = $description
+                }
+                $body = ConvertTo-Json -Compress -Depth 10 -InputObject @($Object)
+                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)"
+                    }
+                    return
+                } catch {
+                    $Message = if ($_.ErrorDetails.Message) {
+                        Get-NormalizedError -Message $_.ErrorDetails.Message
+                    } else {
+                        $_.Exception.message
+                    }
+                    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
+                }
+            }
+        }
+    }
+
     $Object = [PSCustomObject]@{
         files                      = $null
         usertype                   = 1
@@ -41,6 +79,16 @@ function New-HaloPSATicket {
         if ($PSCmdlet.ShouldProcess('Send ticket to HaloPSA', 'Create ticket')) {
             $Ticket = Invoke-RestMethod -Uri "$($Configuration.ResourceURL)/Tickets" -ContentType 'application/json; charset=utf-8' -Method Post -Body $body -Headers @{Authorization = "Bearer $($token.access_token)" }
             Write-Information "Ticket created in HaloPSA: $($Ticket.id)"
+
+            if ($Configuration.ConsolidateTickets) {
+                $TicketObject = [PSCustomObject]@{
+                    PartitionKey = 'HaloPSA'
+                    RowKey       = "$($client)-$($title)"
+                    TicketID     = $Ticket.id
+                }
+                Add-CIPPAzDataTableEntity @TicketTable -Entity $TicketObject -Force
+                Write-Information 'Ticket added to consolidation table'
+            }
         }
     } catch {
         $Message = if ($_.ErrorDetails.Message) {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ function Push-ExecScheduledCommand {`
`40`	`40`	`Write-Host "Failed to remove parameters: $($_.Exception.Message)"`
`41`	`41`	`}`
`42`	`42`
`43`		`- $tenant = $Item.Parameters.TenantFilter`
	`43`	`+ $tenant = $Item.Parameters.TenantFilter ?? $Item.Tenant`
`44`	`44`	`Write-Host "Started Task: $($Item.Command) for tenant: $tenant"`
`45`	`45`	`try {`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ function Invoke-CIPPStandardsRun {`
`34`	`34`	`runManually = $runManually`
`35`	`35`	`}`
`36`	`36`	`}`
	`37`	`+ SkipLog = $true`
`37`	`38`	`}`
`38`	`39`	`if ($TemplateID) {`
`39`	`40`	`$InputObject.QueueFunction.StandardParams['TemplateId'] = $TemplateID`