Skip to content

Commit 8a6ebff

Browse files
committed
fixes
1 parent b862e05 commit 8a6ebff

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ Function Invoke-ListUserCounts {
2222
@{
2323
id = 'Users'
2424
method = 'GET'
25-
url = "/users?`$count=true&`$top=999"
25+
url = "/users/`$count"
2626
headers = @{
2727
'ConsistencyLevel' = 'eventual'
2828
}
2929
}
3030
@{
3131
id = 'LicUsers'
3232
method = 'GET'
33-
url = "/users?`$count=true&`$top=999&`$filter=assignedLicenses/`$count ne 0"
33+
url = "/users?`$count=true&`$top=1&`$filter=assignedLicenses/`$count ne 0"
3434
headers = @{
3535
'ConsistencyLevel' = 'eventual'
3636
}
@@ -46,15 +46,15 @@ Function Invoke-ListUserCounts {
4646
@{
4747
id = 'Guests'
4848
method = 'GET'
49-
url = "/users?`$count=true&`$top=999&`$filter=userType eq 'Guest'"
49+
url = "/users?`$count=true&`$top=1&`$filter=userType eq 'Guest'"
5050
headers = @{
5151
'ConsistencyLevel' = 'eventual'
5252
}
5353
}
5454
)
5555

5656
# Execute bulk request
57-
$BulkResults = New-GraphBulkRequest -Requests @($BulkRequests) -tenantid $TenantFilter @('Users', 'LicUsers', 'GAs', 'Guests')
57+
$BulkResults = New-GraphBulkRequest -Requests @($BulkRequests) -noPaginateIds @('LicUsers') -tenantid $TenantFilter @('Users', 'LicUsers', 'GAs', 'Guests')
5858

5959
# Check if any requests failed
6060
$FailedRequests = $BulkResults | Where-Object { $_.status -ne 200 }
@@ -76,9 +76,10 @@ Function Invoke-ListUserCounts {
7676
# All requests succeeded, extract the counts
7777
$BulkResults | ForEach-Object {
7878
$Count = $_.body.'@odata.count'
79+
$UsersCount = $_.body
7980

8081
switch ($_.id) {
81-
'Users' { $Users = $Count }
82+
'Users' { $Users = $UsersCount }
8283
'LicUsers' { $LicUsers = $Count }
8384
'GAs' { $GAs = $Count }
8485
'Guests' { $Guests = $Count }

0 commit comments

Comments
 (0)