fix mfa report

Author: KelvinTegelaar

Modules/CIPPCore/Public/Get-CIPPMFAState.ps1

@@ -6,14 +6,15 @@ function Get-CIPPMFAState {
         $APIName = 'Get MFA Status',
         $Headers
     )
-    $PerUserMFAState = Get-CIPPPerUserMFA -TenantFilter $TenantFilter -AllUsers $true
-    $users = foreach ($user in (New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/users?$top=999&$select=id,UserPrincipalName,DisplayName,accountEnabled,assignedLicenses' -tenantid $TenantFilter)) {
+    #$PerUserMFAState = Get-CIPPPerUserMFA -TenantFilter $TenantFilter -AllUsers $true
+    $users = foreach ($user in (New-GraphGetRequest -uri 'https://graph.microsoft.com/v1.0/users?$top=999&$select=id,UserPrincipalName,DisplayName,accountEnabled,assignedLicenses,perUserMfaState' -tenantid $TenantFilter)) {
         [PSCustomObject]@{
             UserPrincipalName = $user.UserPrincipalName
             isLicensed        = [boolean]$user.assignedLicenses.skuid
             accountEnabled    = $user.accountEnabled
             DisplayName       = $user.DisplayName
             ObjectId          = $user.id
+            perUserMfaState   = $user.perUserMfaState
         }
     }
 

Modules/CIPPCore/Public/Get-CIPPPerUserMFA.ps1

@@ -11,7 +11,7 @@ function Get-CIPPPerUserMFA {
             $AllUsers = New-graphGetRequest -Uri "https://graph.microsoft.com/v1.0/users?`$top=999&`$select=UserPrincipalName,Id,perUserMfaState" -tenantid $tenantfilter
             return $AllUsers
         } else {
-            $MFAState = New-graphGetRequest -Uri "https://graph.microsoft.com/beta/users/$($userId)?`$select=UserPrincipalName,Id,perUserMfaState" -tenantid $tenantfilter
+            $MFAState = New-graphGetRequest -Uri "https://graph.microsoft.com/v1.0/users/$($userId)?`$select=UserPrincipalName,Id,perUserMfaState" -tenantid $tenantfilter
             return [PSCustomObject]@{
                 PerUserMFAState   = $MFAState.perUserMfaState
                 UserPrincipalName = $userId