Skip to content

Commit 78f7154

Browse files
per user mfa changes per MS's requests
1 parent 37c7799 commit 78f7154

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

Modules/CIPPCore/Public/Get-CIPPPerUserMFA.ps1

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,10 @@ function Get-CIPPPerUserMFA {
88
)
99
try {
1010
if ($AllUsers -eq $true) {
11-
$AllUsers = New-graphGetRequest -Uri "https://graph.microsoft.com/beta/users?`$top=999&`$select=UserPrincipalName,Id" -tenantid $tenantfilter
12-
$Requests = foreach ($id in $AllUsers.userPrincipalName) {
13-
@{
14-
id = $int++
15-
method = 'GET'
16-
url = "users/$id/authentication/requirements"
17-
}
18-
}
19-
$Requests = New-GraphBulkRequest -tenantid $tenantfilter -scope 'https://graph.microsoft.com/.default' -Requests @($Requests) -asapp $true
20-
if ($Requests.body) {
21-
$UsersWithoutMFA = $Requests.body | Select-Object peruserMFAState, @{Name = 'UserPrincipalName'; Expression = { [System.Web.HttpUtility]::UrlDecode($_.'@odata.context'.split("'")[1]) } }
22-
return $UsersWithoutMFA
23-
}
11+
$AllUsers = New-graphGetRequest -Uri "https://graph.microsoft.com/v1.0/users?`$top=999&`$select=UserPrincipalName,Id,perUserMfaState" -tenantid $tenantfilter
12+
return $AllUsers
2413
} else {
25-
$MFAState = New-graphGetRequest -Uri "https://graph.microsoft.com/beta/users/$($userId)/authentication/requirements" -tenantid $tenantfilter
14+
$MFAState = New-graphGetRequest -Uri "https://graph.microsoft.com/beta/users/$($userId)?`$select=UserPrincipalName,Id,perUserMfaState" -tenantid $tenantfilter
2615
return [PSCustomObject]@{
2716
PerUserMFAState = $MFAState.perUserMfaState
2817
UserPrincipalName = $userId

0 commit comments

Comments
 (0)