Enhance user deletion logging in Invoke-RemoveUser function

Author: kris6673

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-RemoveUser.ps1

@@ -17,17 +17,20 @@ Function Invoke-RemoveUser {
     # Interact with query parameters or the body of the request.
     $TenantFilter = $Request.Query.tenantFilter ?? $Request.Body.tenantFilter
     $UserID = $Request.Query.ID ?? $Request.Body.ID
+    $UserPrincipalName = $Request.Query.userPrincipalName ?? $Request.Body.userPrincipalName
 
     if (!$UserID) { exit }
     try {
         $null = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/users/$($UserID)" -type DELETE -tenant $TenantFilter
-        $Result = "Successfully deleted $UserID."
+        $Result = "Successfully deleted user with ID: '$UserID'"
+        if ($UserPrincipalName) { $Result += " and User Principal Name: '$UserPrincipalName'" }
         Write-LogMessage -Headers $Headers -API $APIName -message $Result -Sev 'Info' -tenant $TenantFilter
         $StatusCode = [HttpStatusCode]::OK
 
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
-        $Result = "Could not delete user $($UserID). $($ErrorMessage.NormalizedError)"
+        $Result = "Failed to delete user $($UserID). $($ErrorMessage.NormalizedError)"
+        if ($UserPrincipalName) { $Result += " User Principal Name: '$($UserPrincipalName)'" }
         Write-LogMessage -Headers $Headers -API $APIName -message $Result -Sev 'Error' -tenant $TenantFilter -LogData $ErrorMessage
         $StatusCode = [HttpStatusCode]::InternalServerError
     }