feat: improve text replacements in Graph Request

Author: JohnDuprey

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') {

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
 }

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' {