Merge pull request #411 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListGraphRequest.ps1

@@ -120,13 +120,15 @@ function Invoke-ListGraphRequest {
 
     try {
         $Results = Get-GraphRequestList @GraphRequestParams
-        if ($Results.nextLink) {
-            Write-Host "NextLink: $($Results.nextLink | Select-Object -Last 1)"
+        if ($Results | Where-Object { $_.nextLink }) {
+            Write-Host "NextLink: $($Results.nextLink | Where-Object { $_ } | Select-Object -Last 1)"
             if ($Request.Query.TenantFilter -ne 'AllTenants') {
-                $Metadata['nextLink'] = $Results.nextLink | Select-Object -Last 1
+                $Metadata['nextLink'] = $Results.nextLink | Where-Object { $_ } | Select-Object -Last 1
+            }
+            # Remove nextLink trailing object only if it’s the last item
+            if ($Results[-1].PSObject.Properties.Name -contains 'nextLink') {
+                $Results = $Results | Select-Object -First ($Results.Count - 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