Merge pull request #978 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Config/CIPPTimers.json

@@ -17,14 +17,6 @@
     "RunOnProcessor": true,
     "PreferredProcessor": "usertasks"
   },
-  {
-    "Id": "168decf3-7ddd-471e-ab46-8b40be0f18ae",
-    "Command": "Start-CIPPProcessorQueue",
-    "Description": "Timer to handle user initiated tasks",
-    "Cron": "0 */15 * * * *",
-    "Priority": 1,
-    "RunOnProcessor": true
-  },
   {
     "Id": "44a40668-ed71-403c-8c26-b32e320086ad",
     "Command": "Start-AuditLogOrchestrator",

Modules/CIPPCore/Public/Entrypoints/Timer Functions/Start-CIPPProcessorQueue.ps1

@@ -79,7 +79,7 @@ function Invoke-CippWebhookProcessing {
                 "Completed BEC Remediate for $Username"
                 Write-LogMessage -API 'BECRemediate' -tenant $tenantfilter -message "Executed Remediation for $Username" -sev 'Info'
             }
-            'cippcommand' {
+            <#'cippcommand' {
                 $CommandSplat = @{}
                 $action.parameters.psobject.properties | ForEach-Object { $CommandSplat.Add($_.name, $_.value) }
                 if ($CommandSplat['userid']) { $CommandSplat['userid'] = $Data.UserId }
@@ -88,6 +88,9 @@ function Invoke-CippWebhookProcessing {
                 if ($CommandSplat['user']) { $CommandSplat['user'] = $Data.UserId }
                 if ($CommandSplat['username']) { $CommandSplat['username'] = $Data.UserId }
                 & $action.command.value @CommandSplat
+            }#>
+            default {
+                Write-Host "Unknown action: $action"
             }
         }
     }
@@ -146,12 +149,12 @@ function Invoke-CippWebhookProcessing {
             }
             'generateWebhook' {
                 $CippAlert = @{
-                    Type         = 'webhook'
-                    Title        = $GenerateJSON.Title
-                    JSONContent  = $JsonContent
-                    TenantFilter = $TenantFilter
-                    APIName      = 'Audit Log Alerts'
-                    SchemaSource = 'Audit Log Alert'
+                    Type            = 'webhook'
+                    Title           = $GenerateJSON.Title
+                    JSONContent     = $JsonContent
+                    TenantFilter    = $TenantFilter
+                    APIName         = 'Audit Log Alerts'
+                    SchemaSource    = 'Audit Log Alert'
                     InvokingCommand = 'Start-AuditLogProcessingOrchestrator'
                 }
                 Write-Host 'Sending Webhook Content'