Better error message

kris6673 · kris6673 · commit f4eded06710d · 2025-04-02T18:32:09.000+02:00
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecExcludeTenant.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecExcludeTenant.ps1
@@ -59,8 +59,9 @@ Function Invoke-ExecExcludeTenant {
             $body = [pscustomobject]@{'Results' = "Success. We've removed $Name from the excluded tenants." }
         }
     } catch {
-        Write-LogMessage -API $APIName -tenant $($Name) -headers $Headers -message "Exclusion API failed. $($_.Exception.Message)" -Sev 'Error'
-        $body = [pscustomobject]@{'Results' = "Failed. $($_.Exception.Message)" }
+        $ErrorMessage = Get-CippException -Exception $_
+        Write-LogMessage -API $APIName -tenant $($Name) -headers $Headers -message "Exclusion API failed. $($ErrorMessage.NormalizedError)" -Sev 'Error' -LogData $ErrorMessage
+        $body = [pscustomobject]@{'Results' = "Failed. $($ErrorMessage.NormalizedError)" }
     }
     if (!$body) { $body = @() }
 

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,9 @@ Function Invoke-ExecExcludeTenant {`
`59`	`59`	`$body = [pscustomobject]@{'Results' = "Success. We've removed $Name from the excluded tenants." }`
`60`	`60`	`}`
`61`	`61`	`} catch {`
`62`		`- Write-LogMessage -API $APIName -tenant $($Name) -headers $Headers -message "Exclusion API failed. $($_.Exception.Message)" -Sev 'Error'`
`63`		`- $body = [pscustomobject]@{'Results' = "Failed. $($_.Exception.Message)" }`
	`62`	`+ $ErrorMessage = Get-CippException -Exception $_`
	`63`	`+ Write-LogMessage -API $APIName -tenant $($Name) -headers $Headers -message "Exclusion API failed. $($ErrorMessage.NormalizedError)" -Sev 'Error' -LogData $ErrorMessage`
	`64`	`+ $body = [pscustomobject]@{'Results' = "Failed. $($ErrorMessage.NormalizedError)" }`
`64`	`65`	`}`
`65`	`66`	`if (!$body) { $body = @() }`
`66`	`67`