Merge pull request KelvinTegelaar#1731 from Zacgoose/copilot/update-user-defaults-logic

Return AllTenants user templates along with specific tenant user templates

Author: KelvinTegelaar

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ListNewUserDefaults.ps1

@@ -13,6 +13,14 @@ function Invoke-ListNewUserDefaults {
     # Get the TenantFilter from query parameters
     $TenantFilter = $Request.Query.TenantFilter
     Write-Host "TenantFilter from request: $TenantFilter"
+    
+    # Get the includeAllTenants flag from query or body parameters (defaults to true)
+    $IncludeAllTenants = if ($Request.Query.includeAllTenants -eq 'false' -or $Request.Body.includeAllTenants -eq 'false') {
+        $false
+    } else {
+        $true
+    }
+    Write-Host "IncludeAllTenants: $IncludeAllTenants"
 
     # Get the templates table
     $Table = Get-CippTable -tablename 'templates'
@@ -36,7 +44,19 @@ function Invoke-ListNewUserDefaults {
 
     # Filter by tenant if TenantFilter is provided
     if ($TenantFilter) {
-        $Templates = $Templates | Where-Object -Property tenantFilter -EQ $TenantFilter
+        if ($TenantFilter -eq 'AllTenants') {
+            # When requesting AllTenants, return only templates stored under AllTenants
+            $Templates = $Templates | Where-Object -Property tenantFilter -eq 'AllTenants'
+        } else {
+            # When requesting a specific tenant
+            if ($IncludeAllTenants) {
+                # Include both tenant-specific and AllTenants templates
+                $Templates = $Templates | Where-Object { $_.tenantFilter -eq $TenantFilter -or $_.tenantFilter -eq 'AllTenants' }
+            } else {
+                # Return only tenant-specific templates (exclude AllTenants)
+                $Templates = $Templates | Where-Object -Property tenantFilter -eq $TenantFilter
+            }
+        }
         Write-Host "Templates after filtering: $($Templates.Count)"
     }
 
@@ -45,7 +65,7 @@ function Invoke-ListNewUserDefaults {
 
     # If a specific ID is requested, filter to that template
     if ($Request.query.ID) {
-        $Templates = $Templates | Where-Object -Property GUID -EQ $Request.query.ID
+        $Templates = $Templates | Where-Object -Property GUID -eq $Request.query.ID
     }
 
     $Templates = ConvertTo-Json -InputObject @($Templates) -Depth 100