Improve error handling in report endpoints

Added try/catch blocks to Invoke-ListmailboxPermissions and Invoke-ListMFAUsers to return proper HTTP 500 responses and error messages on failure. Updated Get-CIPPMFAStateReport and Get-CIPPMailboxPermissionReport to exclude count rows from database query results.

Author: JohnDuprey

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ListmailboxPermissions.ps1

@@ -24,9 +24,13 @@ function Invoke-ListmailboxPermissions {
             if ($ByUser -eq 'true') {
                 $ReportParams.ByUser = $true
             }
-
-            $GraphRequest = Get-CIPPMailboxPermissionReport @ReportParams
-            $StatusCode = [HttpStatusCode]::OK
+            try {
+                $GraphRequest = Get-CIPPMailboxPermissionReport @ReportParams
+                $StatusCode = [HttpStatusCode]::OK
+            } catch {
+                $StatusCode = [HttpStatusCode]::InternalServerError
+                $GraphRequest = $_.Exception.Message
+            }
 
             return ([HttpResponseContext]@{
                     StatusCode = $StatusCode

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Reports/Invoke-ListMFAUsers.ps1

@@ -14,8 +14,14 @@ function Invoke-ListMFAUsers {
     try {
         # If UseReportDB is specified, retrieve from report database
         if ($UseReportDB -eq 'true') {
-            $GraphRequest = Get-CIPPMFAStateReport -TenantFilter $TenantFilter
-            $StatusCode = [HttpStatusCode]::OK
+            try {
+                $GraphRequest = Get-CIPPMFAStateReport -TenantFilter $TenantFilter -ErrorAction Stop
+                $StatusCode = [HttpStatusCode]::OK
+            } catch {
+                Write-Host "Error retrieving MFA state from report database: $($_.Exception.Message)"
+                $StatusCode = [HttpStatusCode]::InternalServerError
+                $GraphRequest = $_.Exception.Message
+            }
 
             return ([HttpResponseContext]@{
                     StatusCode = $StatusCode

Modules/CIPPCore/Public/Get-CIPPMFAStateReport.ps1

@@ -47,7 +47,7 @@ function Get-CIPPMFAStateReport {
         }
 
         # Get MFA state from reporting DB
-        $MFAItems = Get-CIPPDbItem -TenantFilter $TenantFilter -Type 'MFAState'
+        $MFAItems = Get-CIPPDbItem -TenantFilter $TenantFilter -Type 'MFAState' | Where-Object { $_.RowKey -ne 'MFAState-Count' }
         if (-not $MFAItems) {
             throw 'No MFA state data found in reporting database. Sync the report data first.'
         }

Modules/CIPPCore/Public/Get-CIPPMailboxPermissionReport.ps1

@@ -59,7 +59,7 @@ function Get-CIPPMailboxPermissionReport {
         }
 
         # Get mailboxes from reporting DB
-        $MailboxItems = Get-CIPPDbItem -TenantFilter $TenantFilter -Type 'Mailboxes'
+        $MailboxItems = Get-CIPPDbItem -TenantFilter $TenantFilter -Type 'Mailboxes' | Where-Object { $_.RowKey -ne 'Mailboxes-Count' }
         if (-not $MailboxItems) {
             throw 'No mailbox data found in reporting database. Sync the mailbox permissions first. '
         }