Skip to content

Commit d7ef4c4

Browse files
committed
add logging instead of error object
1 parent 280556a commit d7ef4c4

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

Modules/CIPPCore/Public/Get-CIPPMFAState.ps1

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ function Get-CIPPMFAState {
3131
} catch {
3232
$CAState.Add('Not Licensed for Conditional Access') | Out-Null
3333
$MFARegistration = $null
34-
$Errors.Add(@{Step = 'MFARegistration'; Message = $_.Exception.Message })
34+
if ($_.Exception.Message -ne "Tenant is not a B2C tenant and doesn't have premium licenses") {
35+
$Errors.Add(@{Step = 'MFARegistration'; Message = $_.Exception.Message })
36+
}
3537
Write-Host "User registration details not available: $($_.Exception.Message)"
3638
}
3739

@@ -114,11 +116,18 @@ function Get-CIPPMFAState {
114116
CoveredByCA = $CoveredByCA
115117
CAPolicies = $UserCAState
116118
CoveredBySD = $SecureDefaultsState
117-
Errors = $Errors
118119
RowKey = [string]($_.UserPrincipalName).replace('#', '')
119120
PartitionKey = 'users'
120121
}
121-
122+
}
123+
$ErrorCount = ($Errors | Measure-Object).Count
124+
if ($ErrorCount -gt 0) {
125+
if ($ErrorCount -gt 1) {
126+
$Text = 'errors'
127+
} else {
128+
$Text = 'an error'
129+
}
130+
Write-LogMessage -headers $Headers -API $APIName -Tenant $TenantFilter -message "The MFA report encountered $Text, see log data for details." -Sev 'Error' -LogData @($Errors.Message)
122131
}
123132
return $GraphRequest
124133
}

0 commit comments

Comments
 (0)