Merge pull request #134 from KelvinTegelaar/dev

pull[bot] · web-flow · commit 3e223fb543e5 · 2025-03-14T00:41:05.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListGraphRequest.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListGraphRequest.ps1
@@ -18,11 +18,11 @@ function Invoke-ListGraphRequest {
 
     $Parameters = @{}
     if ($Request.Query.'$filter') {
-        $Parameters.'$filter' = $Request.Query.'$filter' -replace '%tenantid%', $env:TenantID
+        $Parameters.'$filter' = $Request.Query.'$filter'
     }
 
     if (!$Request.Query.'$filter' -and $Request.Query.graphFilter) {
-        $Parameters.'$filter' = $Request.Query.graphFilter -replace '%tenantid%', $env:TenantID
+        $Parameters.'$filter' = $Request.Query.graphFilter
     }
 
     if ($Request.Query.'$select') {
diff --git a/Modules/CIPPCore/Public/Functions/Get-TenantGroups.ps1 b/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 }
diff --git a/Modules/CIPPCore/Public/Get-CIPPTextReplacement.ps1 b/Modules/CIPPCore/Public/Get-CIPPTextReplacement.ps1
@@ -13,8 +13,12 @@ function Get-CIPPTextReplacement {
     #>
     param (
         [string]$TenantFilter,
-        [string]$Text
+        $Text
     )
+    if ($Text -isnot [string]) {
+        return $Text
+    }
+
     $Tenant = Get-Tenants -TenantFilter $TenantFilter
     $CustomerId = $Tenant.customerId
 
@@ -47,5 +51,8 @@ function Get-CIPPTextReplacement {
     $Text = $Text -replace '%tenantfilter%', $Tenant.defaultDomainName
     $Text = $Text -replace '%tenantname%', $Tenant.displayName
 
+    # Partner specific replacements
+    $Text = $Text -replace '%partnertenantid%', $ENV:TenantID
+    $Text = $Text -replace '%samappid%', $ENV:ApplicationID
     return $Text
 }
diff --git a/Modules/CIPPCore/Public/GraphRequests/Get-GraphRequestList.ps1 b/Modules/CIPPCore/Public/GraphRequests/Get-GraphRequestList.ps1
@@ -95,7 +95,6 @@ function Get-GraphRequestList {
     $GraphQuery.Query = $ParamCollection.ToString()
     $PartitionKey = Get-StringHash -String (@($Endpoint, $ParamCollection.ToString()) -join '-')
     Write-Information "PK: $PartitionKey"
-    Write-Information ( 'GET [ {0} ]' -f $GraphQuery.ToString())
 
     # Perform $count check before caching
     $Count = 0
@@ -117,12 +116,27 @@ function Get-GraphRequestList {
         if ($AsApp) {
             $GraphRequest.asApp = $AsApp
         }
+
+        if ($Endpoint -match '%' -or $Parameters.Values -match '%') {
+            $TenantId = (Get-Tenants -IncludeErrors | Where-Object { $_.defaultDomainName -eq $TenantFilter -or $_.customerId -eq $TenantFilter }).customerId
+            $Endpoint = Get-CIPPTextReplacement -TenantFilter $TenantFilter -Text $Endpoint
+            $GraphQuery = [System.UriBuilder]('https://graph.microsoft.com/{0}/{1}' -f $Version, $Endpoint)
+            $ParamCollection = [System.Web.HttpUtility]::ParseQueryString([String]::Empty)
+            foreach ($Item in ($Parameters.GetEnumerator() | Sort-Object -CaseSensitive -Property Key)) {
+                $Value = Get-CIPPTextReplacement -TenantFilter $TenantFilter -Text $Item.Value
+                $ParamCollection.Add($Item.Key, $Value)
+            }
+            $GraphQuery.Query = $ParamCollection.ToString()
+            $GraphRequest.uri = $GraphQuery.ToString()
+        }
+
         if ($Parameters.'$count' -and !$SkipCache.IsPresent -and !$NoPagination.IsPresent) {
             $Count = New-GraphGetRequest @GraphRequest -CountOnly -ErrorAction Stop
             if ($CountOnly.IsPresent) { return $Count }
             Write-Information "Total results (`$count): $Count"
         }
     }
+    Write-Information ( 'GET [ {0} ]' -f $GraphQuery.ToString())
 
     try {
         if ($QueueId) {
@@ -153,31 +167,6 @@ function Get-GraphRequestList {
         Write-Information $_.InvocationInfo.PositionMessage
     }
 
-    if ($TenantFilter -ne 'AllTenants' -and $Endpoint -match '%tenantid%') {
-        Write-Information "Replacing TenantId in endpoint with $TenantFilter"
-        $TenantId = (Get-Tenants -IncludeErrors | Where-Object { $_.defaultDomainName -eq $TenantFilter -or $_.customerId -eq $TenantFilter }).customerId
-        $Endpoint = $Endpoint -replace '%tenantid%', $TenantId
-        $GraphQuery = [System.UriBuilder]('https://graph.microsoft.com/{0}/{1}' -f $Version, $Endpoint)
-        $ParamCollection = [System.Web.HttpUtility]::ParseQueryString([String]::Empty)
-        foreach ($Item in ($Parameters.GetEnumerator() | Sort-Object -CaseSensitive -Property Key)) {
-            $ParamCollection.Add($Item.Key, $Item.Value -replace '%tenantid%', $TenantId)
-        }
-        $GraphQuery.Query = $ParamCollection.ToString()
-        $GraphRequest.uri = $GraphQuery.ToString()
-    }
-
-    if ($TenantFilter -ne 'AllTenants' -and $Endpoint -match '%appid%') {
-        Write-Information "Replacing AppId in endpoint with $env:ApplicationID"
-        $Endpoint = $Endpoint -replace '%appid%', $env:ApplicationID
-        $GraphQuery = [System.UriBuilder]('https://graph.microsoft.com/{0}/{1}' -f $Version, $Endpoint)
-        $ParamCollection = [System.Web.HttpUtility]::ParseQueryString([String]::Empty)
-        foreach ($Item in ($Parameters.GetEnumerator() | Sort-Object -CaseSensitive -Property Key)) {
-            $ParamCollection.Add($Item.Key, $Item.Value -replace '%appid%', $env:ApplicationID)
-        }
-        $GraphQuery.Query = $ParamCollection.ToString()
-        $GraphRequest.uri = $GraphQuery.ToString()
-    }
-
     if (!$Rows) {
         switch ($TenantFilter) {
             'AllTenants' {
diff --git a/Modules/CIPPCore/Public/Standards/Get-CIPPStandards.ps1 b/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) {
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneTemplate.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneTemplate.ps1
@@ -49,17 +49,7 @@ function Invoke-CIPPStandardIntuneTemplate {
         $RawJSON = $Request.body.RawJSON
         $ExistingPolicy = Get-CIPPIntunePolicy -tenantFilter $Tenant -DisplayName $displayname -TemplateType $Request.body.Type
         if ($ExistingPolicy) {
-            $ReplaceTable = Get-CIPPTable -tablename 'CippReplacemap'
-            $ReplaceMap = Get-CIPPAzDataTableEntity @ReplaceTable -Filter "PartitionKey eq '$tenant'"
-            if ($ReplaceMap) {
-                foreach ($Replace in $ReplaceMap) {
-                    $String = '%{0}%' -f $Replace.RowKey
-                    $RawJSON = $RawJSON -replace $String, $Replace.Value
-                }
-            }
-            $RawJSON = $RawJSON -replace '%tenantid%', $TenantList.customerId
-            $RawJSON = $RawJSON -replace '%tenantfilter%', $TenantLists.defaultDomainName
-            $RawJSON = $RawJSON -replace '%tenantname%', $TenantList.displayName
+            $RawJSON = Get-CIPPTextReplacement -Text $RawJSON -TenantFilter $Tenant
 
             $JSONExistingPolicy = $ExistingPolicy.cippconfiguration | ConvertFrom-Json
             $JSONTemplate = $RawJSON | ConvertFrom-Json

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@ function Invoke-ListGraphRequest {`
`18`	`18`
`19`	`19`	`$Parameters = @{}`
`20`	`20`	`if ($Request.Query.'$filter') {`
`21`		`- $Parameters.'$filter' = $Request.Query.'$filter' -replace '%tenantid%', $env:TenantID`
	`21`	`+ $Parameters.'$filter' = $Request.Query.'$filter'`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`if (!$Request.Query.'$filter' -and $Request.Query.graphFilter) {`
`25`		`- $Parameters.'$filter' = $Request.Query.graphFilter -replace '%tenantid%', $env:TenantID`
	`25`	`+ $Parameters.'$filter' = $Request.Query.graphFilter`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`if ($Request.Query.'$select') {`