Merge pull request #116 from KelvinTegelaar/dev

pull[bot] · web-flow · commit 89a7c65498cc · 2025-03-06T00:41:05.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Graph Requests/Push-ListGraphRequestQueue.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Graph Requests/Push-ListGraphRequestQueue.ps1
@@ -39,7 +39,8 @@ function Push-ListGraphRequestQueue {
         }
 
         $RawGraphRequest = try {
-            Get-GraphRequestList @GraphRequestParams
+            $Results = Get-GraphRequestList @GraphRequestParams
+            $Results | Select-Object -First ($Results.Count - 1)
         } catch {
             $CippException = Get-CippException -Exception $_.Exception
             [PSCustomObject]@{
@@ -57,6 +58,7 @@ function Push-ListGraphRequestQueue {
             Data         = [string]$Json
         }
         Add-CIPPAzDataTableEntity @Table -Entity $GraphResults -Force | Out-Null
+        return $true
     } catch {
         Write-Warning "Queue Error: $($_.Exception.Message)"
         #Write-Information ($GraphResults | ConvertTo-Json -Depth 10 -Compress)
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-ListScheduledItems.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Scheduler/Invoke-ListScheduledItems.ps1
@@ -44,7 +44,6 @@ Function Invoke-ListScheduledItems {
     }
     $Tasks = Get-CIPPAzDataTableEntity @Table -Filter $Filter | Where-Object { $_.Hidden -ne $HiddenTasks }
     if ($Type) {
-        $Tasks.Command
         $Tasks = $Tasks | Where-Object { $_.command -eq $Type }
     }
 
@@ -61,13 +60,16 @@ Function Invoke-ListScheduledItems {
         } else {
             $Task | Add-Member -NotePropertyName Parameters -NotePropertyValue @{}
         }
+        if ($Task.Recurrence -eq 0 -or [string]::IsNullOrEmpty($Task.Recurrence)) {
+            $Task.Recurrence = 'Once'
+        }
         $Task
     }
 
     # Associate values to output bindings by calling 'Push-OutputBinding'.
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK
-            Body       = @($ScheduledTasks)
+            Body       = @($ScheduledTasks | Sort-Object -Property ExecutedTime -Descending)
         })
 
 }
diff --git a/Modules/CIPPCore/Public/New-CIPPBackup.ps1 b/Modules/CIPPCore/Public/New-CIPPBackup.ps1
@@ -40,7 +40,7 @@ function New-CIPPBackup {
                 $Table = Get-CippTable -tablename 'CIPPBackup'
                 try {
                     if ($PSCmdlet.ShouldProcess('CIPP Backup', 'Create')) {
-                        $Result = Add-CIPPAzDataTableEntity @Table -Entity $entity -Force
+                        $null = Add-CIPPAzDataTableEntity @Table -Entity $entity -Force
                         Write-LogMessage -headers $Headers -API $APINAME -message 'Created CIPP Backup' -Sev 'Debug'
                     }
                 } catch {
@@ -66,21 +66,24 @@ function New-CIPPBackup {
                 RowKey       = $RowKey
                 TenantFilter = $TenantFilter
             }
-            Write-Host "Scheduled backup value psproperties: $(([pscustomobject]$ScheduledBackupValues).psobject.Properties)"
+            Write-Information "Scheduled backup value psproperties: $(([pscustomobject]$ScheduledBackupValues).psobject.Properties)"
             foreach ($ScheduledBackup in ([pscustomobject]$ScheduledBackupValues).psobject.Properties.Name) {
-                $BackupResult = New-CIPPBackupTask -Task $ScheduledBackup -TenantFilter $TenantFilter | ConvertTo-Json -Depth 100 -Compress | Out-String
-                $entity[$ScheduledBackup] = "$BackupResult"
+                try {
+                    $BackupResult = New-CIPPBackupTask -Task $ScheduledBackup -TenantFilter $TenantFilter | ConvertTo-Json -Depth 100 -Compress | Out-String
+                    $entity[$ScheduledBackup] = "$BackupResult"
+                } catch {
+                    Write-Information "Failed to create backup for $ScheduledBackup - $($_.Exception.Message)"
+                }
             }
             $Table = Get-CippTable -tablename 'ScheduledBackup'
             try {
-                $Result = Add-CIPPAzDataTableEntity @Table -entity $entity -Force
+                $null = Add-CIPPAzDataTableEntity @Table -entity $entity -Force
                 Write-LogMessage -headers $Headers -API $APINAME -message 'Created backup' -Sev 'Debug'
                 $State = 'Backup finished succesfully'
-                $Result
             } catch {
                 $State = 'Failed to write backup to table storage'
                 $ErrorMessage = Get-CippException -Exception $_
-                Write-LogMessage -headers $Headers -API $APINAME -message "Failed to create backup for Conditional Access Policies: $($ErrorMessage.NormalizedError)" -Sev 'Error' -LogData $ErrorMessage
+                Write-LogMessage -headers $Headers -API $APINAME -message "Failed to create tenant backup: $($ErrorMessage.NormalizedError)" -Sev 'Error' -LogData $ErrorMessage
                 [pscustomobject]@{'Results' = "Backup Creation failed: $($ErrorMessage.NormalizedError)" }
             }
         }
diff --git a/Modules/CIPPCore/Public/New-CIPPBackupTask.ps1 b/Modules/CIPPCore/Public/New-CIPPBackupTask.ps1
@@ -23,7 +23,7 @@ function New-CIPPBackupTask {
         }
         'ca' {
             Write-Host "Backup Conditional Access Policies for $TenantFilter"
-            $Policies = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/conditionalAccess/policies?$top=999' -tenantid $TenantFilter
+            $Policies = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/conditionalAccess/policies?$top=999' -tenantid $TenantFilter -AsApp $true
             Write-Host 'Creating templates for found Conditional Access Policies'
             foreach ($policy in $policies) {
                 try {
@@ -40,6 +40,7 @@ function New-CIPPBackupTask {
                 "https://graph.microsoft.com/beta/deviceManagement/groupPolicyConfigurations?`$expand=assignments&top=999"
                 "https://graph.microsoft.com/beta/deviceAppManagement/mobileAppConfigurations?`$expand=assignments&`$filter=microsoft.graph.androidManagedStoreAppConfiguration/appSupportsOemConfig%20eq%20true"
                 'https://graph.microsoft.com/beta/deviceManagement/configurationPolicies'
+                'https://graph.microsoft.com/beta/deviceManagement/windowsFeatureUpdateProfiles'
             )
 
             $Policies = foreach ($url in $GraphURLS) {
@@ -129,13 +130,6 @@ function New-CIPPBackupTask {
             $ScheduledTasks = Get-CIPPTable -TableName 'ScheduledTasks'
             Get-CIPPAzDataTableEntity @ScheduledTasks | Where-Object { $_.hidden -eq $true -and $_.command -like 'Get-CippAlert*' -and $TenantFilter -in $_.Tenant }
         }
-        'CippStandards' {
-            Write-Host "Backup Standards for $TenantFilter"
-            $Table = Get-CippTable -tablename 'standards'
-            $Filter = "PartitionKey eq 'standards' and RowKey eq '$($TenantFilter)'"
-            (Get-CIPPAzDataTableEntity @Table -Filter $Filter)
-        }
-
     }
     return $BackupData
 }
diff --git a/Modules/CIPPCore/Public/New-CIPPRestore.ps1 b/Modules/CIPPCore/Public/New-CIPPRestore.ps1
@@ -11,7 +11,7 @@ function New-CIPPRestore {
     Write-Host "Scheduled Restore psproperties: $(([pscustomobject]$RestoreValues).psobject.Properties)"
     Write-LogMessage -headers $Headers -API $APINAME -message 'Restored backup' -Sev 'Debug'
     $RestoreData = foreach ($ScheduledBackup in ([pscustomobject]$RestoreValues).psobject.Properties.Name | Where-Object { $_ -notin 'email', 'webhook', 'psa', 'backup', 'overwrite' }) {
-        New-CIPPRestoreTask -Task $ScheduledBackup -TenantFilter $TenantFilter -backup $RestoreValues.backup.value -overwrite $RestoreValues.overwrite -Headers $Headers -APIName $APIName
+        New-CIPPRestoreTask -Task $ScheduledBackup -TenantFilter $TenantFilter -backup $RestoreValues.backup -overwrite $RestoreValues.overwrite -Headers $Headers -APIName $APIName
     }
     return $RestoreData
 }
diff --git a/Modules/CIPPCore/Public/New-CIPPRestoreTask.ps1 b/Modules/CIPPCore/Public/New-CIPPRestoreTask.ps1
@@ -479,7 +479,6 @@ function New-CIPPRestoreTask {
                 }
             }
         }
-
         'CippWebhookAlerts' {
             Write-Host "Restore Webhook Alerts for $TenantFilter"
             $WebhookTable = Get-CIPPTable -TableName 'WebhookRules'
@@ -502,18 +501,6 @@ function New-CIPPRestoreTask {
                 "Could not restore Scripted Alerts $ErrorMessage "
             }
         }
-        'CippStandards' {
-            Write-Host "Restore Standards for $TenantFilter"
-            $Table = Get-CippTable -tablename 'standards'
-            $StandardsBackup = $BackupData.CippStandards | ConvertFrom-Json
-            try {
-                Add-CIPPAzDataTableEntity @Table -Entity $StandardsBackup -Force
-            } catch {
-                $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-                "Could not restore Standards $ErrorMessage "
-            }
-        }
-
     }
     return $RestoreData
 }
diff --git a/Modules/CIPPCore/Public/New-CIPPTemplateRun.ps1 b/Modules/CIPPCore/Public/New-CIPPTemplateRun.ps1
@@ -90,6 +90,7 @@ function New-CIPPTemplateRun {
                         "https://graph.microsoft.com/beta/deviceManagement/groupPolicyConfigurations?`$expand=assignments&top=999"
                         "https://graph.microsoft.com/beta/deviceAppManagement/mobileAppConfigurations?`$expand=assignments&`$filter=microsoft.graph.androidManagedStoreAppConfiguration/appSupportsOemConfig%20eq%20true"
                         'https://graph.microsoft.com/beta/deviceManagement/configurationPolicies'
+                        'https://graph.microsoft.com/beta/deviceManagement/windowsFeatureUpdateProfiles'
                     )
 
                     $Policies = foreach ($url in $GraphURLS) {
diff --git a/Modules/CippEntrypoints/CippEntrypoints.psm1 b/Modules/CippEntrypoints/CippEntrypoints.psm1
@@ -187,9 +187,9 @@ function Receive-CippActivityTrigger {
         if ($Item.FunctionName) {
             $FunctionName = 'Push-{0}' -f $Item.FunctionName
             try {
-                Write-Warning "Activity starting Function: Push-$FunctionName."
+                Write-Warning "Activity starting Function: $FunctionName."
                 Invoke-Command -ScriptBlock { & $FunctionName -Item $Item }
-                Write-Warning "Activity completed Function: Push-$FunctionName."
+                Write-Warning "Activity completed Function: $FunctionName."
                 if ($TaskStatus) {
                     $QueueTask.Status = 'Completed'
                     $null = Set-CippQueueTask @QueueTask

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ Function Invoke-ListScheduledItems {`
`44`	`44`	`}`
`45`	`45`	`$Tasks = Get-CIPPAzDataTableEntity @Table -Filter $Filter \| Where-Object { $_.Hidden -ne $HiddenTasks }`
`46`	`46`	`if ($Type) {`
`47`		`- $Tasks.Command`
`48`	`47`	`$Tasks = $Tasks \| Where-Object { $_.command -eq $Type }`
`49`	`48`	`}`
`50`	`49`
`@@ -61,13 +60,16 @@ Function Invoke-ListScheduledItems {`
`61`	`60`	`} else {`
`62`	`61`	`$Task \| Add-Member -NotePropertyName Parameters -NotePropertyValue @{}`
`63`	`62`	`}`
	`63`	`+ if ($Task.Recurrence -eq 0 -or [string]::IsNullOrEmpty($Task.Recurrence)) {`
	`64`	`+ $Task.Recurrence = 'Once'`
	`65`	`+ }`
`64`	`66`	`$Task`
`65`	`67`	`}`
`66`	`68`
`67`	`69`	`# Associate values to output bindings by calling 'Push-OutputBinding'.`
`68`	`70`	`Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{`
`69`	`71`	`StatusCode = [HttpStatusCode]::OK`
`70`		`- Body = @($ScheduledTasks)`
	`72`	`+ Body = @($ScheduledTasks \| Sort-Object -Property ExecutedTime -Descending)`
`71`	`73`	`})`
`72`	`74`
`73`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ function New-CIPPBackupTask {`
`23`	`23`	`}`
`24`	`24`	`'ca' {`
`25`	`25`	`Write-Host "Backup Conditional Access Policies for $TenantFilter"`
`26`		`- $Policies = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/conditionalAccess/policies?$top=999' -tenantid $TenantFilter`
	`26`	`+ $Policies = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/conditionalAccess/policies?$top=999' -tenantid $TenantFilter -AsApp $true`
`27`	`27`	`Write-Host 'Creating templates for found Conditional Access Policies'`
`28`	`28`	`foreach ($policy in $policies) {`
`29`	`29`	`try {`
`@@ -40,6 +40,7 @@ function New-CIPPBackupTask {`
`40`	`40`	"https://graph.microsoft.com/beta/deviceManagement/groupPolicyConfigurations?`$expand=assignments&top=999"
`41`	`41`	"https://graph.microsoft.com/beta/deviceAppManagement/mobileAppConfigurations?`$expand=assignments&`$filter=microsoft.graph.androidManagedStoreAppConfiguration/appSupportsOemConfig%20eq%20true"
`42`	`42`	`'https://graph.microsoft.com/beta/deviceManagement/configurationPolicies'`
	`43`	`+ 'https://graph.microsoft.com/beta/deviceManagement/windowsFeatureUpdateProfiles'`
`43`	`44`	`)`
`44`	`45`
`45`	`46`	`$Policies = foreach ($url in $GraphURLS) {`
`@@ -129,13 +130,6 @@ function New-CIPPBackupTask {`
`129`	`130`	`$ScheduledTasks = Get-CIPPTable -TableName 'ScheduledTasks'`
`130`	`131`	`Get-CIPPAzDataTableEntity @ScheduledTasks \| Where-Object { $_.hidden -eq $true -and $_.command -like 'Get-CippAlert*' -and $TenantFilter -in $_.Tenant }`
`131`	`132`	`}`
`132`		`- 'CippStandards' {`
`133`		`- Write-Host "Backup Standards for $TenantFilter"`
`134`		`- $Table = Get-CippTable -tablename 'standards'`
`135`		`- $Filter = "PartitionKey eq 'standards' and RowKey eq '$($TenantFilter)'"`
`136`		`- (Get-CIPPAzDataTableEntity @Table -Filter $Filter)`
`137`		`- }`
`138`		`-`
`139`	`133`	`}`
`140`	`134`	`return $BackupData`
`141`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ function New-CIPPRestore {`
`11`	`11`	`Write-Host "Scheduled Restore psproperties: $(([pscustomobject]$RestoreValues).psobject.Properties)"`
`12`	`12`	`Write-LogMessage -headers $Headers -API $APINAME -message 'Restored backup' -Sev 'Debug'`
`13`	`13`	`$RestoreData = foreach ($ScheduledBackup in ([pscustomobject]$RestoreValues).psobject.Properties.Name \| Where-Object { $_ -notin 'email', 'webhook', 'psa', 'backup', 'overwrite' }) {`
`14`		`- New-CIPPRestoreTask -Task $ScheduledBackup -TenantFilter $TenantFilter -backup $RestoreValues.backup.value -overwrite $RestoreValues.overwrite -Headers $Headers -APIName $APIName`
	`14`	`+ New-CIPPRestoreTask -Task $ScheduledBackup -TenantFilter $TenantFilter -backup $RestoreValues.backup -overwrite $RestoreValues.overwrite -Headers $Headers -APIName $APIName`
`15`	`15`	`}`
`16`	`16`	`return $RestoreData`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,6 @@ function New-CIPPRestoreTask {`
`479`	`479`	`}`
`480`	`480`	`}`
`481`	`481`	`}`
`482`		`-`
`483`	`482`	`'CippWebhookAlerts' {`
`484`	`483`	`Write-Host "Restore Webhook Alerts for $TenantFilter"`
`485`	`484`	`$WebhookTable = Get-CIPPTable -TableName 'WebhookRules'`
`@@ -502,18 +501,6 @@ function New-CIPPRestoreTask {`
`502`	`501`	`"Could not restore Scripted Alerts $ErrorMessage "`
`503`	`502`	`}`
`504`	`503`	`}`
`505`		`- 'CippStandards' {`
`506`		`- Write-Host "Restore Standards for $TenantFilter"`
`507`		`- $Table = Get-CippTable -tablename 'standards'`
`508`		`- $StandardsBackup = $BackupData.CippStandards \| ConvertFrom-Json`
`509`		`- try {`
`510`		`- Add-CIPPAzDataTableEntity @Table -Entity $StandardsBackup -Force`
`511`		`- } catch {`
`512`		`- $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message`
`513`		`- "Could not restore Standards $ErrorMessage "`
`514`		`- }`
`515`		`- }`
`516`		`-`
`517`	`504`	`}`
`518`	`505`	`return $RestoreData`
`519`	`506`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ function New-CIPPTemplateRun {`
`90`	`90`	"https://graph.microsoft.com/beta/deviceManagement/groupPolicyConfigurations?`$expand=assignments&top=999"
`91`	`91`	"https://graph.microsoft.com/beta/deviceAppManagement/mobileAppConfigurations?`$expand=assignments&`$filter=microsoft.graph.androidManagedStoreAppConfiguration/appSupportsOemConfig%20eq%20true"
`92`	`92`	`'https://graph.microsoft.com/beta/deviceManagement/configurationPolicies'`
	`93`	`+ 'https://graph.microsoft.com/beta/deviceManagement/windowsFeatureUpdateProfiles'`
`93`	`94`	`)`
`94`	`95`
`95`	`96`	`$Policies = foreach ($url in $GraphURLS) {`