Merge pull request #563 from KelvinTegelaar/dev

pull[bot] · web-flow · commit ff48a6bc9ce5 · 2025-11-22T06:41:21.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPCore/Public/Clear-CippDurables.ps1 b/Modules/CIPPCore/Public/Clear-CippDurables.ps1
@@ -1,13 +1,20 @@
 function Clear-CippDurables {
     [CmdletBinding(SupportsShouldProcess = $true)]
-    Param()
+    param()
     # Collect info
     $StorageContext = New-AzStorageContext -ConnectionString $env:AzureWebJobsStorage
     $FunctionName = $env:WEBSITE_SITE_NAME -replace '-', ''
 
     # Get orchestrators
     $InstancesTable = Get-CippTable -TableName ('{0}Instances' -f $FunctionName)
     $HistoryTable = Get-CippTable -TableName ('{0}History' -f $FunctionName)
+    $QueueTable = Get-CippTable -TableName 'CippQueue'
+    $CippQueueTasks = Get-CippTable -TableName 'CippQueueTasks'
+
+    Remove-AzDataTable @InstancesTable
+    Remove-AzDataTable @HistoryTable
+    Remove-AzDataTable @QueueTable
+    Remove-AzDataTable @CippQueueTasks
 
     $Queues = Get-AzStorageQueue -Context $StorageContext -Name ('{0}*' -f $FunctionName) | Select-Object -Property Name, ApproximateMessageCount, QueueClient
 
@@ -19,8 +26,6 @@ function Clear-CippDurables {
         }
     }
 
-    Remove-AzDataTable @InstancesTable
-    Remove-AzDataTable @HistoryTable
     $BlobContainer = '{0}-largemessages' -f $FunctionName
     if (Get-AzStorageContainer -Name $BlobContainer -Context $StorageContext -ErrorAction SilentlyContinue) {
         Write-Information "- Removing blob container: $BlobContainer"
@@ -29,32 +34,6 @@ function Clear-CippDurables {
         }
     }
 
-    $QueueTable = Get-CippTable -TableName 'CippQueue'
-    $CippQueue = Invoke-ListCippQueue
-    $QueueEntities = foreach ($Queue in $CippQueue) {
-        if ($Queue.Status -eq 'Running') {
-            $Queue.TotalTasks = $Queue.CompletedTasks
-            $Queue | Select-Object -Property PartitionKey, RowKey, TotalTasks
-        }
-    }
-    if (($QueueEntities | Measure-Object).Count -gt 0) {
-        if ($PSCmdlet.ShouldProcess('Queues', 'Mark Failed')) {
-            Update-AzDataTableEntity -Force @QueueTable -Entity $QueueEntities
-        }
-    }
-
-    $CippQueueTasks = Get-CippTable -TableName 'CippQueueTasks'
-    $RunningTasks = Get-CIPPAzDataTableEntity @CippQueueTasks -Filter "PartitionKey eq 'Task' and Status eq 'Running'" -Property RowKey, PartitionKey, Status
-    if (($RunningTasks | Measure-Object).Count -gt 0) {
-        if ($PSCmdlet.ShouldProcess('Tasks', 'Mark Failed')) {
-            $UpdatedTasks = foreach ($Task in $RunningTasks) {
-                $Task.Status = 'Failed'
-                $Task
-            }
-            Update-AzDataTableEntity -Force @CippQueueTasks -Entity $UpdatedTasks
-        }
-    }
-
     $null = Get-CippTable -TableName ('{0}History' -f $FunctionName)
     Write-Information 'Durable Orchestrators and Queues have been cleared'
     return $true
diff --git a/Modules/CIPPCore/Public/GraphHelper/New-GraphPOSTRequest.ps1 b/Modules/CIPPCore/Public/GraphHelper/New-GraphPOSTRequest.ps1
@@ -1,9 +1,25 @@
 
-function New-GraphPOSTRequest ($uri, $tenantid, $body, $type, $scope, $AsApp, $NoAuthCheck, $skipTokenCache, $AddedHeaders, $contentType, $IgnoreErrors = $false, $returnHeaders = $false) {
+function New-GraphPOSTRequest {
     <#
     .FUNCTIONALITY
     Internal
     #>
+    param(
+        $uri,
+        $tenantid,
+        $body,
+        $type = 'POST',
+        $scope,
+        $AsApp,
+        $NoAuthCheck,
+        $skipTokenCache,
+        $AddedHeaders,
+        $contentType,
+        $IgnoreErrors = $false,
+        $returnHeaders = $false,
+        $maxRetries = 1
+    )
+
     if ($NoAuthCheck -or (Get-AuthorisedRequest -Uri $uri -TenantID $tenantid)) {
         $headers = Get-GraphToken -tenantid $tenantid -scope $scope -AsApp $asapp -SkipCache $skipTokenCache
         if ($AddedHeaders) {
@@ -12,27 +28,35 @@ function New-GraphPOSTRequest ($uri, $tenantid, $body, $type, $scope, $AsApp, $N
             }
         }
 
-        if (!$type) {
-            $type = 'POST'
-        }
-
-        Write-Information "$($type.ToUpper()) [ $uri ] | tenant: $tenantid"
-
         if (!$contentType) {
             $contentType = 'application/json; charset=utf-8'
         }
-        try {
-            $body = Get-CIPPTextReplacement -TenantFilter $tenantid -Text $body -EscapeForJson
-            $ReturnedData = (Invoke-RestMethod -Uri $($uri) -Method $TYPE -Body $body -Headers $headers -ContentType $contentType -SkipHttpErrorCheck:$IgnoreErrors -ResponseHeadersVariable responseHeaders)
-        } catch {
-            $Message = if ($_.ErrorDetails.Message) {
-                Get-NormalizedError -Message $_.ErrorDetails.Message
-            } else {
-                $_.Exception.message
+
+        $body = Get-CIPPTextReplacement -TenantFilter $tenantid -Text $body -EscapeForJson
+
+        $x = 0
+        do {
+            try {
+                Write-Information "$($type.ToUpper()) [ $uri ] | tenant: $tenantid | attempt: $($x + 1) of $maxRetries"
+                $success = $false
+                $ReturnedData = (Invoke-RestMethod -Uri $($uri) -Method $TYPE -Body $body -Headers $headers -ContentType $contentType -SkipHttpErrorCheck:$IgnoreErrors -ResponseHeadersVariable responseHeaders)
+                $success = $true
+            } catch {
+
+                $Message = if ($_.ErrorDetails.Message) {
+                    Get-NormalizedError -Message $_.ErrorDetails.Message
+                } else {
+                    $_.Exception.message
+                }
+                $x++
+                Start-Sleep -Seconds (2 * $x)
             }
+        } while (($x -lt $maxRetries) -and ($success -eq $false))
 
+        if ($success -eq $false) {
             throw $Message
         }
+
         if ($returnHeaders) {
             return $responseHeaders
         } else {
diff --git a/Modules/CIPPCore/Public/Send-CIPPAlert.ps1 b/Modules/CIPPCore/Public/Send-CIPPAlert.ps1
@@ -18,6 +18,11 @@ function Send-CIPPAlert {
     $Table = Get-CIPPTable -TableName SchedulerConfig
     $Filter = "RowKey eq 'CippNotifications' and PartitionKey eq 'CippNotifications'"
     $Config = [pscustomobject](Get-CIPPAzDataTableEntity @Table -Filter $Filter)
+
+    if ($HTMLContent) {
+        $HTMLContent = Get-CIPPTextReplacement -TenantFilter $TenantFilter -Text $HTMLContent
+    }
+
     if ($Type -eq 'email') {
         Write-Information 'Trying to send email'
         try {
@@ -39,6 +44,7 @@ function Send-CIPPAlert {
                         }
                     }
                 }
+
                 $PowerShellBody = [PSCustomObject]@{
                     message         = @{
                         subject      = $Title
@@ -52,6 +58,7 @@ function Send-CIPPAlert {
                 }
 
                 $JSONBody = ConvertTo-Json -Compress -Depth 10 -InputObject $PowerShellBody
+
                 if ($PSCmdlet.ShouldProcess($($Recipients.EmailAddress.Address -join ', '), 'Sending email')) {
                     $null = New-GraphPostRequest -uri 'https://graph.microsoft.com/v1.0/me/sendMail' -tenantid $env:TenantID -NoAuthCheck $true -type POST -body ($JSONBody)
                 }
@@ -93,7 +100,7 @@ function Send-CIPPAlert {
 
     if ($Type -eq 'webhook') {
         Write-Information 'Trying to send webhook'
-
+        $JSONBody = Get-CIPPTextReplacement -TenantFilter $TenantFilter -Text $JSONContent -EscapeForJson
         try {
             if (![string]::IsNullOrWhiteSpace($Config.webhook) -or ![string]::IsNullOrWhiteSpace($AltWebhook)) {
                 if ($PSCmdlet.ShouldProcess($Config.webhook, 'Sending webhook')) {
diff --git a/Modules/CIPPCore/Public/TenantGroups/Update-CIPPDynamicTenantGroups.ps1 b/Modules/CIPPCore/Public/TenantGroups/Update-CIPPDynamicTenantGroups.ps1
@@ -173,11 +173,17 @@ function Update-CIPPDynamicTenantGroups {
                             $TenantVariables = Get-CIPPTenantVariables -TenantFilter $_.customerId -IncludeGlobal
                         } catch {
                             Write-Information "Error fetching custom variables for tenant $($_.defaultDomainName): $($_.Exception.Message)"
+                            Write-LogMessage -API 'TenantGroups' -message 'Error getting tenant variables' -Tenant $_.defaultDomainName -sev Warning -LogData (Get-CippException -Exception $_)
                         }
                     }
 
-                    $SKUId = $LicenseInfo.SKUId ?? @()
-                    $ServicePlans = (Get-CIPPTenantCapabilities -TenantFilter $_.defaultDomainName).psobject.properties.name
+                    try {
+                        $SKUId = $LicenseInfo.SKUId ?? @()
+                        $ServicePlans = (Get-CIPPTenantCapabilities -TenantFilter $_.defaultDomainName).psobject.properties.name
+                    } catch {
+                        Write-Information "Error fetching capabilities for tenant $($_.defaultDomainName): $($_.Exception.Message)"
+                        Write-LogMessage -API 'TenantGroups' -message 'Error getting tenant capabilities' -Tenant $_.defaultDomainName -sev Warning -LogData (Get-CippException -Exception $_)
+                    }
                     [pscustomobject]@{
                         customerId               = $_.customerId
                         defaultDomainName        = $_.defaultDomainName
diff --git a/host.json b/host.json
@@ -5,7 +5,7 @@
   },
   "extensionBundle": {
     "id": "Microsoft.Azure.Functions.ExtensionBundle",
-    "version": "[4.*, 5.0.0)"
+    "version": "[4.26.0, 5.0.0)"
   },
   "functionTimeout": "00:10:00",
   "extensions": {
@@ -15,7 +15,10 @@
       "tracing": {
         "distributedTracingEnabled": false,
         "version": "None"
-      }
+      },
+      "defaultVersion": "8.7.0",
+      "versionMatchStrategy": "Strict",
+      "versionFailureStrategy": "Fail"
     }
   }
 }
