Merge pull request #489 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ListUserCounts.ps1

@@ -22,48 +22,48 @@ Function Invoke-ListUserCounts {
                 @{
                     id     = 'Users'
                     method = 'GET'
-                    url    = "/users?`$count=true&`$top=1"
+                    url    = "/users/`$count"
                     headers = @{
                         'ConsistencyLevel' = 'eventual'
                     }
                 }
                 @{
                     id     = 'LicUsers'
                     method = 'GET'
-                    url    = "/users?`$count=true&`$top=1&`$filter=assignedLicenses/`$count ne 0"
+                    url    = "/users/`$count?`$top=1&`$filter=assignedLicenses/`$count ne 0"
                     headers = @{
                         'ConsistencyLevel' = 'eventual'
                     }
                 }
                 @{
                     id     = 'GAs'
                     method = 'GET'
-                    url    = "/directoryRoles/roleTemplateId=62e90394-69f5-4237-9190-012177145e10/members?`$count=true"
+                    url    = "/directoryRoles/roleTemplateId=62e90394-69f5-4237-9190-012177145e10/members/`$count"
                     headers = @{
                         'ConsistencyLevel' = 'eventual'
                     }
                 }
                 @{
                     id     = 'Guests'
                     method = 'GET'
-                    url    = "/users?`$count=true&`$top=1&`$filter=userType eq 'Guest'"
+                    url    = "/users/`$count?`$top=1&`$filter=userType eq 'Guest'"
                     headers = @{
                         'ConsistencyLevel' = 'eventual'
                     }
                 }
             )
 
             # Execute bulk request
-            $BulkResults = New-GraphBulkRequest -Requests @($BulkRequests) -tenantid $TenantFilter @('Users', 'LicUsers', 'GAs', 'Guests')
+            $BulkResults = New-GraphBulkRequest -Requests @($BulkRequests) -noPaginateIds @('LicUsers') -tenantid $TenantFilter @('Users', 'LicUsers', 'GAs', 'Guests')
 
             # Check if any requests failed
             $FailedRequests = $BulkResults | Where-Object { $_.status -ne 200 }
-            
+
             if ($FailedRequests) {
                 # If any requests failed, return an error response
                 $FailedIds = ($FailedRequests | ForEach-Object { $_.id }) -join ', '
                 $ErrorMessage = "Failed to retrieve counts for: $FailedIds"
-                
+
                 return ([HttpResponseContext]@{
                     StatusCode = [HttpStatusCode]::InternalServerError
                     Body       = @{
@@ -75,13 +75,13 @@ Function Invoke-ListUserCounts {
 
             # All requests succeeded, extract the counts
             $BulkResults | ForEach-Object {
-                $Count = $_.body.'@odata.count'
+                $UsersCount = $_.body
 
                 switch ($_.id) {
-                    'Users' { $Users = $Count }
-                    'LicUsers' { $LicUsers = $Count }
-                    'GAs' { $GAs = $Count }
-                    'Guests' { $Guests = $Count }
+                    'Users' { $Users = $UsersCount }
+                    'LicUsers' { $LicUsers = $UsersCount }
+                    'GAs' { $GAs = $UsersCount }
+                    'Guests' { $Guests = $UsersCount }
                 }
             }