Skip to content

Commit 7b2d292

Browse files
committed
Fix casing of tenantFilter in Invoke-ExecRestoreDeleted function and enhance logging messages for restored items
1 parent 360dadc commit 7b2d292

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,26 @@ Function Invoke-ExecRestoreDeleted {
1515
Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
1616

1717
# Interact with query parameters or the body of the request.
18-
$TenantFilter = $Request.Query.TenantFilter ?? $Request.Body.TenantFilter
18+
$TenantFilter = $Request.Query.tenantFilter ?? $Request.Body.tenantFilter
1919
$RequestID = $Request.Query.ID ?? $Request.Body.ID
20+
$UserPrincipalName = $Request.Body.userPrincipalName
21+
$DisplayName = $Request.Body.displayName
2022

2123
try {
2224
$null = New-GraphPostRequest -uri "https://graph.microsoft.com/v1.0/directory/deletedItems/$($RequestID)/restore" -tenantid $TenantFilter -type POST -body '{}' -Verbose
23-
$Result = "Successfully restored deleted item with ID: $($RequestID)"
24-
Write-LogMessage -headers $Request.Headers -tenant $TenantFilter -API $APIName -message $Result -Sev 'Info'
25+
$Result = "Successfully restored deleted item with ID: '$($RequestID)'"
26+
if ($UserPrincipalName) { $Result += " User Principal Name: '$($UserPrincipalName)'" }
27+
if ($DisplayName) { $Result += " Display Name: '$($DisplayName)'" }
28+
29+
Write-LogMessage -headers $Headers -tenant $TenantFilter -API $APIName -message $Result -Sev 'Info'
2530
$StatusCode = [HttpStatusCode]::OK
2631
} catch {
2732
$ErrorMessage = Get-CippException -Exception $_
28-
$Result = "Failed to restore deleted item with ID: $($RequestID). Error: $($ErrorMessage.NormalizedError)"
29-
Write-LogMessage -headers $Request.Headers -tenant $TenantFilter -API $APIName -message $Result -Sev 'Error' -LogData $ErrorMessage
33+
$Result = "Failed to restore deleted item with ID: '$($RequestID)'. Error: $($ErrorMessage.NormalizedError)"
34+
if ($UserPrincipalName) { $Result += " User Principal Name: '$($UserPrincipalName)'" }
35+
if ($DisplayName) { $Result += " Display Name: '$($DisplayName)'" }
36+
37+
Write-LogMessage -headers $Headers -tenant $TenantFilter -API $APIName -message $Result -Sev 'Error' -LogData $ErrorMessage
3038
$StatusCode = [HttpStatusCode]::InternalServerError
3139
}
3240

0 commit comments

Comments
 (0)