feat: tenant group support in standards

Author: JohnDuprey

Modules/CIPPCore/Public/Functions/Get-TenantGroups.ps1

@@ -18,9 +18,9 @@ function Get-TenantGroups {
     $GroupTable = Get-CippTable -tablename 'TenantGroups'
     $MembersTable = Get-CippTable -tablename 'TenantGroupMembers'
 
-    if ($TenantFilter) {
+    if ($TenantFilter -and $TenantFilter -ne 'allTenants') {
         $TenantParams = @{
-            TenantFilter = $TenantFilter
+            TenantFilter  = $TenantFilter
             IncludeErrors = $true
         }
     } else {
@@ -42,7 +42,7 @@ function Get-TenantGroups {
         return @()
     }
 
-    if ($TenantFilter) {
+    if ($TenantFilter -and $TenantFilter -ne 'allTenants') {
         $Memberships = $AllMembers | Where-Object { $_.customerId -eq $Tenants.customerId }
         foreach ($Group in $Memberships) {
             $Group = $Groups | Where-Object { $_.RowKey -eq $Group.GroupId }

Modules/CIPPCore/Public/Standards/Get-CIPPStandards.ps1

@@ -13,6 +13,9 @@ function Get-CIPPStandards {
         $runManually = $false
     )
 
+    # Get tenant groups
+    $TenantGroups = Get-TenantGroups
+
     # 1. Get all JSON-based templates from the "templates" table
     $Table = Get-CippTable -tablename 'templates'
     $Filter = "PartitionKey eq 'StandardsTemplateV2'"
@@ -116,11 +119,21 @@ function Get-CIPPStandards {
         # 4. For each tenant, figure out which templates apply, merge them, and output.
         foreach ($Tenant in $AllTenantsList) {
             $TenantName = $Tenant.defaultDomainName
-
             # Determine which templates apply to this tenant
             $ApplicableTemplates = $Templates | ForEach-Object {
                 $template = $_
-                $tenantFilterValues = $template.tenantFilter | ForEach-Object { $_.value }
+                $tenantFilterValues = $template.tenantFilter | ForEach-Object {
+                    $FilterValue = $_.value
+                    # Group lookup
+                    if ($_.type -eq 'Group') {
+                        ($TenantGroups | Where-Object {
+                            $_.Id -eq $FilterValue
+                        }).Members.defaultDomainName
+                    } else {
+                        $FilterValue
+                    }
+                }
+
                 $excludedTenantValues = @()
 
                 if ($template.excludedTenants) {