cleanup generic graph request

Author: JohnDuprey

Modules/CIPPCore/Public/Entrypoints/Invoke-ListGraphRequest.ps1

@@ -116,13 +116,15 @@ function Invoke-ListGraphRequest {
         $GraphRequestParams.AsApp = $true
     }
 
-    Write-Host ($GraphRequestParams | ConvertTo-Json)
-
     $Metadata = $GraphRequestParams
 
     try {
         $Results = Get-GraphRequestList @GraphRequestParams
-
+        if ($Results.nextLink -and $Request.Query.NoPagination) {
+            $Metadata['nextLink'] = $Results.nextLink | Select-Object -Last 1
+            #Results is an array of objects, so we need to remove the last object before returning
+            $Results = $Results | Select-Object -First ($Results.Count - 1)
+        }
         if ($Request.Query.ListProperties) {
             $Columns = ($Results | Select-Object -First 1).PSObject.Properties.Name
             $Results = $Columns | Where-Object { @('Tenant', 'CippStatus') -notcontains $_ }

Modules/CIPPCore/Public/GraphRequests/Get-GraphRequestList.ps1

@@ -295,11 +295,6 @@ function Get-GraphRequestList {
                         if ($nextLink) { $GraphRequest.uri = $nextLink }
 
                         $GraphRequestResults = New-GraphGetRequest @GraphRequest -Caller 'Get-GraphRequestList' -ErrorAction Stop
-                        if ($GraphRequestResults.nextLink) {
-                            #$Metadata['nextLink'] = $GraphRequestResults.nextLink | Select-Object -Last 1
-                            #GraphRequestResults is an array of objects, so we need to remove the last object before returning
-                            $GraphRequestResults = $GraphRequestResults | Select-Object -First ($GraphRequestResults.Count - 1)
-                        }
                         $GraphRequestResults = $GraphRequestResults | Select-Object *, @{n = 'Tenant'; e = { $TenantFilter } }, @{n = 'CippStatus'; e = { 'Good' } }
 
                         if ($ReverseTenantLookup -and $GraphRequestResults) {