Merge pull request KelvinTegelaar#1715 from kris6673/copysent

Fix: Enhance Set-CIPPMessageCopy to support SendOnBehalf

Author: JohnDuprey

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

@@ -1,4 +1,4 @@
-Function Invoke-ExecCopyForSent {
+function Invoke-ExecCopyForSent {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -13,13 +13,21 @@ Function Invoke-ExecCopyForSent {
 
 
     # Interact with query parameters or the body of the request.
-    $TenantFilter = $Request.Query.TenantFilter ?? $Request.Body.TenantFilter
+    $TenantFilter = $Request.Query.tenantFilter ?? $Request.Body.tenantFilter
     $UserID = $Request.Query.ID ?? $Request.Body.ID
-    $MessageCopyForSentAsEnabled = $Request.Query.MessageCopyForSentAsEnabled ?? $Request.Body.MessageCopyForSentAsEnabled
-    $MessageCopyForSentAsEnabled = [System.Convert]::ToBoolean($MessageCopyForSentAsEnabled)
+    $MessageCopyState = $Request.Query.messageCopyState ?? $Request.Body.messageCopyState
+    $MessageCopyState = [System.Convert]::ToBoolean($MessageCopyState)
 
-    Try {
-        $Result = Set-CIPPMessageCopy -userid $UserID -tenantFilter $TenantFilter -APIName $APIName -Headers $Headers -MessageCopyForSentAsEnabled $MessageCopyForSentAsEnabled
+    try {
+        $params = @{
+            UserId                            = $UserID
+            TenantFilter                      = $TenantFilter
+            APIName                           = $APIName
+            Headers                           = $Headers
+            MessageCopyForSentAsEnabled       = $MessageCopyState
+            MessageCopyForSendOnBehalfEnabled = $MessageCopyState
+        }
+        $Result = Set-CIPPMessageCopy @params
         $StatusCode = [HttpStatusCode]::OK
     } catch {
         $Result = "$($_.Exception.Message)"

Modules/CIPPCore/Public/Set-CIPPMessageCopy.ps1

@@ -1,20 +1,27 @@
 function Set-CIPPMessageCopy {
     [CmdletBinding()]
     param (
-        $userid,
+        $UserId,
         [bool]$MessageCopyForSentAsEnabled,
+        [bool]$MessageCopyForSendOnBehalfEnabled,
         $TenantFilter,
-        $APIName = 'Manage OneDrive Access',
+        $APIName = 'Set message copy for sent',
         $Headers
     )
-    Try {
-        $null = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Set-Mailbox' -cmdParams @{Identity = $userid; MessageCopyForSentAsEnabled = $MessageCopyForSentAsEnabled }
-        $Result = "Successfully set MessageCopyForSentAsEnabled as $MessageCopyForSentAsEnabled on $($userid)."
+    try {
+        $cmdParams = @{
+            Identity                          = $UserId
+            MessageCopyForSentAsEnabled       = $MessageCopyForSentAsEnabled
+            MessageCopyForSendOnBehalfEnabled = $MessageCopyForSendOnBehalfEnabled
+
+        }
+        $null = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Set-Mailbox' -cmdParams $cmdParams
+        $Result = "Successfully set message copy for 'Send as' as $MessageCopyForSentAsEnabled and 'Sent on behalf' as $MessageCopyForSendOnBehalfEnabled on $($UserId)."
         Write-LogMessage -headers $Headers -API $APIName -tenant $($TenantFilter) -message $Result -Sev 'Info'
         return $Result
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
-        $Result = "Failed to set MessageCopyForSentAsEnabled to $MessageCopyForSentAsEnabled - $($ErrorMessage.NormalizedError)"
+        $Result = "Failed to set message copy for 'Send as' as $MessageCopyForSentAsEnabled and 'Sent on behalf' as $MessageCopyForSendOnBehalfEnabled - $($ErrorMessage.NormalizedError)"
         Write-LogMessage -headers $Headers -API $APIName -tenant $($TenantFilter) -message $Result -Sev 'Error' -LogData $ErrorMessage
         throw $Result
     }