Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev

JohnDuprey · JohnDuprey · commit 5db3bd71268b · 2025-12-09T15:34:09.000-05:00
diff --git a/Modules/CippEntrypoints/CippEntrypoints.psm1 b/Modules/CippEntrypoints/CippEntrypoints.psm1
@@ -433,18 +433,19 @@ function Receive-CIPPTimerTrigger {
             if ($Parameters.Count -gt 0) {
                 $metadata['ParameterCount'] = $Parameters.Count
                 # Add specific known parameters
+                Write-Host "CIPP TIMER PARAMETERS: $($Parameters | ConvertTo-Json -Depth 10 -Compress)"
                 if ($Parameters.Tenant) {
                     $metadata['Tenant'] = $Parameters.Tenant
                 }
-                if ($Parameters.Tenant.value) {
-                    $metadata['Tenant'] = $Parameters.Tenant.value
-                }
                 if ($Parameters.TenantFilter) {
                     $metadata['Tenant'] = $Parameters.TenantFilter
                 }
                 if ($Parameters.TenantFilter.value) {
                     $metadata['Tenant'] = $Parameters.TenantFilter.value
                 }
+                if ($Parameters.Tenant.value) {
+                    $metadata['Tenant'] = $Parameters.Tenant.value
+                }
             }
 
             # Wrap the timer function execution with telemetry

Original file line number	Diff line number	Diff line change
`@@ -433,18 +433,19 @@ function Receive-CIPPTimerTrigger {`
`433`	`433`	`if ($Parameters.Count -gt 0) {`
`434`	`434`	`$metadata['ParameterCount'] = $Parameters.Count`
`435`	`435`	`# Add specific known parameters`
	`436`	`+ Write-Host "CIPP TIMER PARAMETERS: $($Parameters \| ConvertTo-Json -Depth 10 -Compress)"`
`436`	`437`	`if ($Parameters.Tenant) {`
`437`	`438`	`$metadata['Tenant'] = $Parameters.Tenant`
`438`	`439`	`}`
`439`		`- if ($Parameters.Tenant.value) {`
`440`		`- $metadata['Tenant'] = $Parameters.Tenant.value`
`441`		`- }`
`442`	`440`	`if ($Parameters.TenantFilter) {`
`443`	`441`	`$metadata['Tenant'] = $Parameters.TenantFilter`
`444`	`442`	`}`
`445`	`443`	`if ($Parameters.TenantFilter.value) {`
`446`	`444`	`$metadata['Tenant'] = $Parameters.TenantFilter.value`
`447`	`445`	`}`
	`446`	`+ if ($Parameters.Tenant.value) {`
	`447`	`+ $metadata['Tenant'] = $Parameters.Tenant.value`
	`448`	`+ }`
`448`	`449`	`}`
`449`	`450`
`450`	`451`	`# Wrap the timer function execution with telemetry`