update cpv to support directTenant

Author: JohnDuprey

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

@@ -16,7 +16,9 @@ function Push-UpdatePermissionsQueue {
         $Table = Get-CIPPTable -TableName cpvtenants
         $CPVRows = Get-CIPPAzDataTableEntity @Table | Where-Object -Property Tenant -EQ $Item.customerId
 
-        if (!$CPVRows -or $env:ApplicationID -notin $CPVRows.applicationId) {
+        $Tenant = Get-Tenants -TenantFilter $Item.customerId -IncludeErrors
+
+        if ((!$CPVRows -or $env:ApplicationID -notin $CPVRows.applicationId) -and $Tenant.delegatedPrivilegeStatus -ne 'directTenant') {
             Write-LogMessage -tenant $Item.defaultDomainName -tenantId $Item.customerId -message 'A New tenant has been added, or a new CIPP-SAM Application is in use' -Sev 'Warn' -API 'NewTenant'
             Write-Information 'Adding CPV permissions'
             Set-CIPPCPVConsent -Tenantfilter $Item.customerId

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

@@ -15,7 +15,7 @@ function Start-UpdatePermissionsOrchestrator {
             'displayName'       = '*Partner Tenant'
         }
 
-        $TenantList = Get-Tenants -IncludeAll | Where-Object { $_.Excluded -eq $false -and $_.delegatedPrivilegeStatus -eq 'directTenant' }
+        $TenantList = Get-Tenants -IncludeAll | Where-Object { $_.Excluded -eq $false }
 
         $Tenants = [System.Collections.Generic.List[object]]::new()
         foreach ($Tenant in $TenantList) {