Merge pull request #600 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1

@@ -341,4 +341,5 @@ function Push-ExecScheduledCommand {
         Write-LogMessage -API 'Scheduler_UserTasks' -tenant $Tenant -tenantid $TenantInfo.customerId -message "Successfully executed task: $($task.Name)" -sev Info
     }
     Remove-Variable -Name ScheduledTaskId -Scope Script -ErrorAction SilentlyContinue
+    return 'Task Completed Successfully.'
 }

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Webhooks/Push-AuditLogTenantDownload.ps1

@@ -43,15 +43,15 @@ function Push-AuditLogTenantDownload {
             Write-Information ('Audit Logs: Found {0} searches, begin downloading' -f $LogSearches.Count)
             foreach ($Search in $LogSearches) {
                 $SearchEntity = Get-CIPPAzDataTableEntity @LogSearchesTable -Filter "Tenant eq '$($TenantFilter)' and RowKey eq '$($Search.id)'"
-                $SearchEntity.CippStatus = 'Processing'
+                $SearchEntity | Add-Member -NotePropertyName CippStatus -NotePropertyValue 'Processing' -Force
                 Add-CIPPAzDataTableEntity @LogSearchesTable -Entity $SearchEntity -Force
                 try {
                     Write-Information "Audit Log search: Processing search ID: $($Search.id) for tenant: $TenantFilter"
                     $Downloads = New-CIPPAuditLogSearchResultsCache -TenantFilter $TenantFilter -searchId $Search.id
-                    $SearchEntity.CippStatus = 'Downloaded'
+                    $SearchEntity | Add-Member -NotePropertyName CippStatus -NotePropertyValue 'Downloaded' -Force
                 } catch {
                     if ($_.Exception.Message -match 'Request rate is large. More Request Units may be needed, so no changes were made. Please retry this request later.') {
-                        $SearchEntity.CippStatus = 'Pending'
+                        $SearchEntity | Add-Member -NotePropertyName CippStatus -NotePropertyValue 'Pending' -Force
                         Write-Information "Audit Log search: Rate limit hit for $($SearchEntity.RowKey)."
                         if ($SearchEntity.PSObject.Properties.Name -contains 'RetryCount') {
                             $SearchEntity.RetryCount++
@@ -60,8 +60,8 @@ function Push-AuditLogTenantDownload {
                         }
                     } else {
                         $Exception = [string](ConvertTo-Json -Compress -InputObject (Get-CippException -Exception $_))
-                        $SearchEntity | Add-Member -MemberType NoteProperty -Name Error -Value $Exception
-                        $SearchEntity.CippStatus = 'Failed'
+                        $SearchEntity | Add-Member -MemberType NoteProperty -Name Error -Value $Exception -Force
+                        $SearchEntity | Add-Member -NotePropertyName CippStatus -NotePropertyValue 'Failed' -Force
                         Write-Information "Error processing audit log rules: $($_.Exception.Message)"
                     }
 

Modules/CIPPCore/Public/Entrypoints/Orchestrator Functions/Start-ExtensionOrchestrator.ps1

@@ -10,7 +10,7 @@ function Start-ExtensionOrchestrator {
 
     $Table = Get-CIPPTable -TableName Extensionsconfig
     $ExtensionConfig = (Get-AzDataTableEntity @Table).config
-    if (Test-Json -Json $ExtensionConfig) {
+    if ($ExtensionConfig -and (Test-Json -Json $ExtensionConfig)) {
         $Configuration = ($ExtensionConfig | ConvertFrom-Json)
     } else {
         $Configuration = @{}