invisible paging.

KelvinTegelaar · Sep 5, 2024 · 01685e0 · 01685e0
1 parent 7be9a29
commit 01685e0
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/Modules/CIPPCore/Public/Entrypoints/Invoke-ListGraphRequest.ps1 b/Modules/CIPPCore/Public/Entrypoints/Invoke-ListGraphRequest.ps1
@@ -41,6 +41,7 @@ function Invoke-ListGraphRequest {
         $Parameters.'$count' = ([string]([System.Boolean]$Request.Query.'$count')).ToLower()
     }
 
+
     if ($Request.Query.'$orderby') {
         $Parameters.'$orderby' = $Request.Query.'$orderby'
     }
@@ -75,6 +76,14 @@ function Invoke-ListGraphRequest {
         $GraphRequestParams.NoPagination = [System.Boolean]$Request.Query.NoPagination
     }
 
+    if ($Request.Query.manualPagination) {
+        $GraphRequestParams.NoPagination = [System.Boolean]$Request.Query.manualPagination
+    }
+
+    if ($Request.Query.nextLink) {
+        $GraphRequestParams.nextLink = $Request.Query.nextLink
+    }
+
     if ($Request.Query.CountOnly) {
         $GraphRequestParams.CountOnly = [System.Boolean]$Request.Query.CountOnly
     }

diff --git a/Modules/CIPPCore/Public/GraphHelper/New-GraphGetRequest.ps1 b/Modules/CIPPCore/Public/GraphHelper/New-GraphGetRequest.ps1
@@ -11,6 +11,7 @@ function New-GraphGetRequest {
         $noPagination,
         $NoAuthCheck,
         $skipTokenCache,
+        $Caller,
         [switch]$ComplexFilter,
         [switch]$CountOnly,
         [switch]$IncludeResponseHeaders
@@ -58,8 +59,11 @@ function New-GraphGetRequest {
                     $Data.'@odata.count'
                     $NextURL = $null
                 } else {
-                    if ($Data.PSObject.Properties.Name -contains 'value') { $data.value } else { ($Data) }
+                    if ($Data.PSObject.Properties.Name -contains 'value') { $data.value } else { $Data }
                     if ($noPagination) {
+                        if ($Caller -eq 'Get-GraphRequestList') {
+                            @{ 'nextLink' = $data.'@odata.nextLink' }
+                        }
                         $nextURL = $null
                     } else {
                         $NextPageUriFound = $false

diff --git a/Modules/CIPPCore/Public/GraphRequests/Get-GraphRequestList.ps1 b/Modules/CIPPCore/Public/GraphRequests/Get-GraphRequestList.ps1
@@ -51,6 +51,7 @@ function Get-GraphRequestList {
         [string]$TenantFilter = $env:TenantID,
         [Parameter(Mandatory = $true)]
         [string]$Endpoint,
+        [string]$nextLink,
         [hashtable]$Parameters = @{},
         [string]$QueueId,
         [string]$CippLink,
@@ -285,7 +286,17 @@ function Get-GraphRequestList {
                     }
 
                     if (!$QueueThresholdExceeded) {
-                        $GraphRequestResults = New-GraphGetRequest @GraphRequest -ErrorAction Stop | Select-Object *, @{l = 'Tenant'; e = { $TenantFilter } }, @{l = 'CippStatus'; e = { 'Good' } }
+                        #nextLink should ONLY be used in direct calls with manual pagination. It should not be used in queueing
+                        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) {
                             $ReverseLookupRequests = $GraphRequestResults.$ReverseTenantLookupProperty | Sort-Object -Unique | ForEach-Object {
                                 @{