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

KelvinTegelaar · KelvinTegelaar · commit 8ffae09a60f0 · 2025-03-03T19:26:36.000+01:00
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
@@ -49,8 +49,11 @@ Function Invoke-ListScheduledItems {
     }
 
     $AllowedTenants = Test-CIPPAccess -Request $Request -TenantList
+
     if ($AllowedTenants -notcontains 'AllTenants') {
-        $Tasks = $Tasks | Where-Object -Property TenantId -In $AllowedTenants
+        $TenantList = Get-Tenants -IncludeErrors | Select-Object customerId, defaultDomainName
+        $AllowedTenantDomains = $TenantList | Where-Object -Property customerId -In $AllowedTenants | Select-Object -ExpandProperty defaultDomainName
+        $Tasks = $Tasks | Where-Object -Property Tenant -In $AllowedTenantDomains
     }
     $ScheduledTasks = foreach ($Task in $tasks) {
         if ($Task.Parameters) {

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,11 @@ Function Invoke-ListScheduledItems {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`$AllowedTenants = Test-CIPPAccess -Request $Request -TenantList`
	`52`	`+`
`52`	`53`	`if ($AllowedTenants -notcontains 'AllTenants') {`
`53`		`- $Tasks = $Tasks \| Where-Object -Property TenantId -In $AllowedTenants`
	`54`	`+ $TenantList = Get-Tenants -IncludeErrors \| Select-Object customerId, defaultDomainName`
	`55`	`+ $AllowedTenantDomains = $TenantList \| Where-Object -Property customerId -In $AllowedTenants \| Select-Object -ExpandProperty defaultDomainName`
	`56`	`+ $Tasks = $Tasks \| Where-Object -Property Tenant -In $AllowedTenantDomains`
`54`	`57`	`}`
`55`	`58`	`$ScheduledTasks = foreach ($Task in $tasks) {`
`56`	`59`	`if ($Task.Parameters) {`