fix pagination for AllTenants queries

KelvinTegelaar · Jan 27, 2025 · b8d13a2 · b8d13a2
1 parent 079df36
commit b8d13a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
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
@@ -122,7 +122,9 @@ function Invoke-ListGraphRequest {
         $Results = Get-GraphRequestList @GraphRequestParams
         if ($Results.nextLink) {
             Write-Host "NextLink: $($Results.nextLink | Select-Object -Last 1)"
-            $Metadata['nextLink'] = $Results.nextLink | Select-Object -Last 1
+            if ($Request.Query.TenantFilter -ne 'AllTenants') {
+                $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)
         }

diff --git a/Modules/CIPPCore/Public/GraphRequests/Get-GraphRequestList.ps1 b/Modules/CIPPCore/Public/GraphRequests/Get-GraphRequestList.ps1
@@ -190,7 +190,7 @@ function Get-GraphRequestList {
                             TenantFilter                = $_.defaultDomainName
                             Endpoint                    = $using:Endpoint
                             Parameters                  = $using:Parameters
-                            NoPagination                = $using:NoPagination.IsPresent
+                            NoPagination                = $false
                             ReverseTenantLookupProperty = $using:ReverseTenantLookupProperty
                             ReverseTenantLookup         = $using:ReverseTenantLookup.IsPresent
                             NoAuthCheck                 = $using:NoAuthCheck.IsPresent