Merge pull request #668 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ListTenantGroups.ps1

@@ -11,7 +11,7 @@ function Invoke-ListTenantGroups {
     param($Request, $TriggerMetadata)
 
     $groupFilter = $Request.Query.groupId ?? $Request.Body.groupId
-    $TenantGroups = (Get-TenantGroups -GroupId $groupFilter) ?? @()
+    $TenantGroups = (Get-TenantGroups -GroupId $groupFilter -SkipCache) ?? @()
     $Body = @{ Results = @($TenantGroups) }
 
     return ([HttpResponseContext]@{

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

@@ -30,11 +30,14 @@ function Get-TenantGroups {
     param(
         [string]$GroupId,
         [string]$TenantFilter,
-        [switch]$Dynamic
+        [switch]$Dynamic,
+        [switch]$SkipCache
     )
     $CacheKey = "$GroupId|$TenantFilter|$($Dynamic.IsPresent)"
 
-    if ($script:TenantGroupsResultCache.ContainsKey($CacheKey)) {
+    if ($SkipCache) {
+        Write-Verbose "Skipping cache for: $CacheKey"
+    } elseif ($script:TenantGroupsResultCache.ContainsKey($CacheKey)) {
         Write-Verbose "Returning cached result for: $CacheKey"
         return $script:TenantGroupsResultCache[$CacheKey]
     }
@@ -47,7 +50,7 @@ function Get-TenantGroups {
     }
 
     # Load table data into cache if not already loaded
-    if (-not $script:TenantGroupsCache.Groups -or -not $script:TenantGroupsCache.Members) {
+    if (-not $script:TenantGroupsCache.Groups -or -not $script:TenantGroupsCache.Members -or $SkipCache) {
         Write-Verbose 'Loading TenantGroups and TenantGroupMembers tables into cache'
 
         $GroupTable = Get-CippTable -tablename 'TenantGroups'

Modules/CIPPCore/Public/TenantGroups/Update-CIPPDynamicTenantGroups.ps1

@@ -96,12 +96,34 @@ function Update-CIPPDynamicTenantGroups {
                             }
                         }
                         'tenantGroupMember' {
-                            # Get members of the referenced tenant group
-                            $ReferencedGroupId = $Value.value
-                            if ($Operator -eq 'in') {
-                                "`$_.customerId -in `$script:TenantGroupMembersCache['$ReferencedGroupId']"
+                            # Get members of the referenced tenant group(s)
+                            if ($Operator -in @('in', 'notin')) {
+                                # Handle array of group IDs
+                                $ReferencedGroupIds = @($Value.value)
+
+                                # Collect all unique member customerIds from all referenced groups
+                                $AllMembers = [System.Collections.Generic.HashSet[string]]::new()
+                                foreach ($GroupId in $ReferencedGroupIds) {
+                                    if ($script:TenantGroupMembersCache.ContainsKey($GroupId)) {
+                                        foreach ($MemberId in $script:TenantGroupMembersCache[$GroupId]) {
+                                            [void]$AllMembers.Add($MemberId)
+                                        }
+                                    }
+                                }
+
+                                # Convert to array string for condition
+                                $MemberArray = $AllMembers | ForEach-Object { "'$_'" }
+                                $MemberArrayString = $MemberArray -join ', '
+
+                                if ($Operator -eq 'in') {
+                                    "`$_.customerId -in @($MemberArrayString)"
+                                } else {
+                                    "`$_.customerId -notin @($MemberArrayString)"
+                                }
                             } else {
-                                "`$_.customerId -notin `$script:TenantGroupMembersCache['$ReferencedGroupId']"
+                                # Single value with other operators
+                                $ReferencedGroupId = $Value.value
+                                "`$_.customerId -$Operator `$script:TenantGroupMembersCache['$ReferencedGroupId']"
                             }
                         }
                         'customVariable' {