Merge pull request #567 from KelvinTegelaar/dev

pull[bot] · web-flow · commit 836503743dd0 · 2025-11-25T00:41:27.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecScheduledCommand.ps1
@@ -7,6 +7,8 @@ function Push-ExecScheduledCommand {
     $item = $Item | ConvertTo-Json -Depth 100 | ConvertFrom-Json
     Write-Information "We are going to be running a scheduled task: $($Item.TaskInfo | ConvertTo-Json -Depth 10)"
 
+    $script:ScheduledTaskId = $Item.TaskInfo.RowKey
+
     $Table = Get-CippTable -tablename 'ScheduledTasks'
     $task = $Item.TaskInfo
     $commandParameters = $Item.Parameters | ConvertTo-Json -Depth 10 | ConvertFrom-Json -AsHashtable
@@ -21,10 +23,12 @@ function Push-ExecScheduledCommand {
     $CurrentTask = Get-AzDataTableEntity @Table -Filter "PartitionKey eq '$($task.PartitionKey)' and RowKey eq '$($task.RowKey)'"
     if (!$CurrentTask) {
         Write-Information "The task $($task.Name) for tenant $($task.Tenant) does not exist in the ScheduledTasks table. Exiting."
+        Remove-Variable -Name ScheduledTaskId -Scope Script -ErrorAction SilentlyContinue
         return
     }
     if ($CurrentTask.TaskState -eq 'Completed') {
         Write-Information "The task $($task.Name) for tenant $($task.Tenant) is already completed. Skipping execution."
+        Remove-Variable -Name ScheduledTaskId -Scope Script -ErrorAction SilentlyContinue
         return
     }
 
@@ -69,6 +73,7 @@ function Push-ExecScheduledCommand {
                     TaskState     = 'Planned'
                     ScheduledTime = [string]$nextRunUnixTime
                 }
+                Remove-Variable -Name ScheduledTaskId -Scope Script -ErrorAction SilentlyContinue
                 return
             }
         }
@@ -94,6 +99,7 @@ function Push-ExecScheduledCommand {
         }
 
         Write-LogMessage -API 'Scheduler_UserTasks' -tenant $Tenant -tenantid $TenantInfo.customerId -message "Failed to execute task $($task.Name): The command $($Item.Command) does not exist." -sev Error
+        Remove-Variable -Name ScheduledTaskId -Scope Script -ErrorAction SilentlyContinue
         return
     }
 
@@ -330,4 +336,5 @@ function Push-ExecScheduledCommand {
     if ($TaskType -ne 'Alert') {
         Write-LogMessage -API 'Scheduler_UserTasks' -tenant $Tenant -tenantid $TenantInfo.customerId -message "Successfully executed task: $($task.Name)" -sev Info
     }
+    Remove-Variable -Name ScheduledTaskId -Scope Script -ErrorAction SilentlyContinue
 }
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPStandard.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPStandard.ps1
@@ -56,5 +56,7 @@ function Push-CIPPStandard {
         Write-Warning "Error running standard $($Standard) for tenant $($Tenant) - $($_.Exception.Message)"
         Write-Information $_.InvocationInfo.PositionMessage
         throw $_.Exception.Message
+    } finally {
+        Remove-Variable -Name StandardInfo -Scope Script -ErrorAction SilentlyContinue
     }
 }
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ExecCopyForSent.ps1 b/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)"
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Transport/Invoke-AddEditTransportRule.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Transport/Invoke-AddEditTransportRule.ps1
diff --git a/Modules/CIPPCore/Public/Entrypoints/Invoke-ListLogs.ps1 b/Modules/CIPPCore/Public/Entrypoints/Invoke-ListLogs.ps1
@@ -86,6 +86,7 @@ function Invoke-ListLogs {
             $TenantFilter = $Request.Query.Tenant
             $ApiFilter = $Request.Query.API
             $StandardFilter = $Request.Query.StandardTemplateId
+            $ScheduledTaskFilter = $Request.Query.ScheduledTaskId
 
             $StartDate = $Request.Query.StartDate ?? $Request.Query.DateFilter
             $EndDate = $Request.Query.EndDate ?? $Request.Query.DateFilter
@@ -115,9 +116,10 @@ function Invoke-ListLogs {
         $Rows = Get-AzDataTableEntity @Table -Filter $Filter | Where-Object {
             $_.Severity -in $LogLevel -and
             $_.Username -like $username -and
-            ($TenantFilter -eq $null -or $TenantFilter -eq 'AllTenants' -or $_.Tenant -like "*$TenantFilter*" -or $_.TenantID -eq $TenantFilter) -and
-            ($ApiFilter -eq $null -or $_.API -match "$ApiFilter") -and
-            ($StandardFilter -eq $null -or $_.StandardTemplateId -eq $StandardFilter)
+            ([string]::IsNullOrEmpty($TenantFilter) -or $TenantFilter -eq 'AllTenants' -or $_.Tenant -like "*$TenantFilter*" -or $_.TenantID -eq $TenantFilter) -and
+            ([string]::IsNullOrEmpty($ApiFilter) -or $_.API -match "$ApiFilter") -and
+            ([string]::IsNullOrEmpty($StandardFilter) -or $_.StandardTemplateId -eq $StandardFilter) -and
+            ([string]::IsNullOrEmpty($ScheduledTaskFilter) -or $_.ScheduledTaskId -eq $ScheduledTaskFilter)
         }
 
         if ($AllowedTenants -notcontains 'AllTenants') {
@@ -126,7 +128,7 @@ function Invoke-ListLogs {
 
         foreach ($Row in $Rows) {
             if ($AllowedTenants -contains 'AllTenants' -or ($AllowedTenants -notcontains 'AllTenants' -and ($TenantList.defaultDomainName -contains $Row.Tenant -or $Row.Tenant -eq 'CIPP' -or $TenantList.customerId -contains $Row.TenantId)) ) {
-                if ($Row.StandardTemplateId) {
+                if ($StandardTaskFilter -and $Row.StandardTemplateId) {
                     $Standard = ($Templates | Where-Object { $_.RowKey -eq $Row.StandardTemplateId }).JSON | ConvertFrom-Json
 
                     $StandardInfo = @{
diff --git a/Modules/CIPPCore/Public/GraphHelper/Write-LogMessage.ps1 b/Modules/CIPPCore/Public/GraphHelper/Write-LogMessage.ps1
@@ -76,6 +76,9 @@ function Write-LogMessage {
             $TableRow.ConditionalAccessTemplateId = [string]$script:StandardInfo.ConditionalAccessTemplateId
         }
     }
+    if ($script:ScheduledTaskId) {
+        $TableRow.ScheduledTaskId = [string]$script:ScheduledTaskId
+    }
 
     $Table.Entity = $TableRow
     Add-CIPPAzDataTableEntity @Table | Out-Null
diff --git a/Modules/CIPPCore/Public/Set-CIPPMessageCopy.ps1 b/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
     }
diff --git a/host.json b/host.json
@@ -16,7 +16,7 @@
         "distributedTracingEnabled": false,
         "version": "None"
       },
-      "defaultVersion": "8.7.0",
+      "defaultVersion": "8.7.1",
       "versionMatchStrategy": "Strict",
       "versionFailureStrategy": "Fail"
     }
diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-8.7.0
+8.7.1

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ function Push-ExecScheduledCommand {`
`7`	`7`	`$item = $Item \| ConvertTo-Json -Depth 100 \| ConvertFrom-Json`
`8`	`8`	`Write-Information "We are going to be running a scheduled task: $($Item.TaskInfo \| ConvertTo-Json -Depth 10)"`
`9`	`9`
	`10`	`+ $script:ScheduledTaskId = $Item.TaskInfo.RowKey`
	`11`	`+`
`10`	`12`	`$Table = Get-CippTable -tablename 'ScheduledTasks'`
`11`	`13`	`$task = $Item.TaskInfo`
`12`	`14`	`$commandParameters = $Item.Parameters \| ConvertTo-Json -Depth 10 \| ConvertFrom-Json -AsHashtable`
`@@ -21,10 +23,12 @@ function Push-ExecScheduledCommand {`
`21`	`23`	`$CurrentTask = Get-AzDataTableEntity @Table -Filter "PartitionKey eq '$($task.PartitionKey)' and RowKey eq '$($task.RowKey)'"`
`22`	`24`	`if (!$CurrentTask) {`
`23`	`25`	`Write-Information "The task $($task.Name) for tenant $($task.Tenant) does not exist in the ScheduledTasks table. Exiting."`
	`26`	`+ Remove-Variable -Name ScheduledTaskId -Scope Script -ErrorAction SilentlyContinue`
`24`	`27`	`return`
`25`	`28`	`}`
`26`	`29`	`if ($CurrentTask.TaskState -eq 'Completed') {`
`27`	`30`	`Write-Information "The task $($task.Name) for tenant $($task.Tenant) is already completed. Skipping execution."`
	`31`	`+ Remove-Variable -Name ScheduledTaskId -Scope Script -ErrorAction SilentlyContinue`
`28`	`32`	`return`
`29`	`33`	`}`
`30`	`34`
`@@ -69,6 +73,7 @@ function Push-ExecScheduledCommand {`
`69`	`73`	`TaskState = 'Planned'`
`70`	`74`	`ScheduledTime = [string]$nextRunUnixTime`
`71`	`75`	`}`
	`76`	`+ Remove-Variable -Name ScheduledTaskId -Scope Script -ErrorAction SilentlyContinue`
`72`	`77`	`return`
`73`	`78`	`}`
`74`	`79`	`}`
`@@ -94,6 +99,7 @@ function Push-ExecScheduledCommand {`
`94`	`99`	`}`
`95`	`100`
`96`	`101`	`Write-LogMessage -API 'Scheduler_UserTasks' -tenant $Tenant -tenantid $TenantInfo.customerId -message "Failed to execute task $($task.Name): The command $($Item.Command) does not exist." -sev Error`
	`102`	`+ Remove-Variable -Name ScheduledTaskId -Scope Script -ErrorAction SilentlyContinue`
`97`	`103`	`return`
`98`	`104`	`}`
`99`	`105`
`@@ -330,4 +336,5 @@ function Push-ExecScheduledCommand {`
`330`	`336`	`if ($TaskType -ne 'Alert') {`
`331`	`337`	`Write-LogMessage -API 'Scheduler_UserTasks' -tenant $Tenant -tenantid $TenantInfo.customerId -message "Successfully executed task: $($task.Name)" -sev Info`
`332`	`338`	`}`
	`339`	`+ Remove-Variable -Name ScheduledTaskId -Scope Script -ErrorAction SilentlyContinue`
`333`	`340`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,5 +56,7 @@ function Push-CIPPStandard {`
`56`	`56`	`Write-Warning "Error running standard $($Standard) for tenant $($Tenant) - $($_.Exception.Message)"`
`57`	`57`	`Write-Information $_.InvocationInfo.PositionMessage`
`58`	`58`	`throw $_.Exception.Message`
	`59`	`+ } finally {`
	`60`	`+ Remove-Variable -Name StandardInfo -Scope Script -ErrorAction SilentlyContinue`
`59`	`61`	`}`
`60`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,9 @@ function Write-LogMessage {`
`76`	`76`	`$TableRow.ConditionalAccessTemplateId = [string]$script:StandardInfo.ConditionalAccessTemplateId`
`77`	`77`	`}`
`78`	`78`	`}`
	`79`	`+ if ($script:ScheduledTaskId) {`
	`80`	`+ $TableRow.ScheduledTaskId = [string]$script:ScheduledTaskId`
	`81`	`+ }`
`79`	`82`
`80`	`83`	`$Table.Entity = $TableRow`
`81`	`84`	`Add-CIPPAzDataTableEntity @Table \| Out-Null`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`"distributedTracingEnabled": false,`
`17`	`17`	`"version": "None"`
`18`	`18`	`},`
`19`		`- "defaultVersion": "8.7.0",`
	`19`	`+ "defaultVersion": "8.7.1",`
`20`	`20`	`"versionMatchStrategy": "Strict",`
`21`	`21`	`"versionFailureStrategy": "Fail"`
`22`	`22`	`}`