Merge pull request #951 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/GraphHelper/New-GraphGetRequest.ps1

@@ -107,7 +107,7 @@ function New-GraphGetRequest {
                     } else {
                         if ($Data.PSObject.Properties.Name -contains 'value') { $data.value } else { $Data }
                         if ($noPagination -eq $true) {
-                            if ($Caller -eq 'Get-GraphRequestList') {
+                            if ($Caller -eq 'Get-GraphRequestList' -and $data.'@odata.nextLink') {
                                 @{ 'nextLink' = $data.'@odata.nextLink' }
                             }
                             $nextURL = $null

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

@@ -159,9 +159,13 @@ function Invoke-ListGraphRequest {
             if ($NextLink -and $Request.Query.TenantFilter -ne 'AllTenants') {
                 Write-Host "NextLink: $NextLink"
                 $Metadata['nextLink'] = $NextLink
+            } else {
+                $Metadata.Remove('nextLink')
             }
-            # Remove nextLink trailing object only if it’s the last item
+            # Remove nextLink trailing object only if it's the last item
             $Results = $Results | Where-Object { $_.PSObject.Properties.Name -notcontains 'nextLink' }
+        } else {
+            $Metadata.Remove('nextLink')
         }
         if ($Request.Query.ListProperties) {
             $Columns = ($Results | Select-Object -First 1).PSObject.Properties.Name

host.json

@@ -16,7 +16,7 @@
         "distributedTracingEnabled": false,
         "version": "None"
       },
-      "defaultVersion": "10.3.1",
+      "defaultVersion": "10.4.1",
       "versionMatchStrategy": "Strict",
       "versionFailureStrategy": "Fail"
     }

version_latest.txt

@@ -1 +1 @@
-10.4.0
+10.4.1