Merge pull request #422 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ExecDriftClone.ps1

@@ -0,0 +1,47 @@
+using namespace System.Net
+
+function Invoke-ExecDriftClone {
+    <#
+    .FUNCTIONALITY
+        Entrypoint,AnyTenant
+    .ROLE
+        Tenant.Standards.ReadWrite
+    #>
+    [CmdletBinding()]
+    param($Request, $TriggerMetadata)
+
+    try {
+        $TemplateId = $Request.Body.id
+
+        if (-not $TemplateId) {
+            $Results = [pscustomobject]@{
+                'Results' = 'Template ID is required'
+                'Success' = $false
+            }
+            Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+                    StatusCode = [HttpStatusCode]::BadRequest
+                    Body       = $Results
+                })
+            return
+        }
+        $CloneResult = New-CippStandardsDriftClone -TemplateId $TemplateId -UpgradeToDrift -Headers $Request.Headers
+        $Results = [pscustomobject]@{
+            'Results' = $CloneResult
+            'Success' = $true
+        }
+
+        Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+                StatusCode = [HttpStatusCode]::OK
+                Body       = $Results
+            })
+    } catch {
+        $Results = [pscustomobject]@{
+            'Results' = "Failed to create drift clone: $($_.Exception.Message)"
+            'Success' = $false
+        }
+        Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+                StatusCode = [HttpStatusCode]::InternalServerError
+                Body       = $Results
+            })
+    }
+}

Modules/CIPPCore/Public/New-CippStandardsDriftClone.ps1

@@ -0,0 +1,40 @@
+function New-CippStandardsDriftClone {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)][string]$TemplateId,
+        [Parameter(Mandatory)][switch]$UpgradeToDrift,
+        $Headers
+    )
+
+    $Table = Get-CippTable -tablename 'templates'
+    $Filter = "PartitionKey eq 'StandardsTemplateV2' and RowKey eq '$TemplateId'"
+    $Entity = Get-CIPPAzDataTableEntity @Table -Filter $Filter
+    $data = $Entity.JSON | ConvertFrom-Json
+    $data.excludedTenants = @() #blank excluded Tenants
+    $data.tenantFilter = @(@{ value = 'Copied Standard'; label = 'Copied Standard' })
+    $data.GUID = [guid]::NewGuid().ToString()
+    $data.templateName = "$($data.templateName) (Drift Clone)"
+    if ($UpgradeToDrift) {
+        try {
+            $data | Add-Member -MemberType NoteProperty -Name 'type' -Value 'drift' -Force
+            if ($null -ne $data.standards) {
+                foreach ($prop in $data.standards.PSObject.Properties) {
+                    $actions = $prop.Value.action
+                    if ($actions -and $actions.Count -gt 0) {
+                        if ($actions | Where-Object { $_.value -eq 'remediate' }) {
+                            $prop.Value | Add-Member -MemberType NoteProperty -Name 'autoRemediate' -Value $true -Force
+                        }
+                        $prop.Value.action = @(@{ 'label' = 'Report'; 'value' = 'Report' })
+                    }
+                }
+            }
+            $Entity.JSON = "$(ConvertTo-Json -InputObject $data -Compress -Depth 100)"
+            $Entity.RowKey = "$($data.GUID)"
+            $Entity.GUID = $data.GUID
+            $update = Add-CIPPAzDataTableEntity @Table -Entity $Entity -Force
+            return 'Clone Completed successfully'
+        } catch {
+            return "Failed to Clone template to Drift Template: $_"
+        }
+    }
+}

Modules/CIPPCore/Public/Send-CIPPAlert.ps1

@@ -22,8 +22,9 @@ function Send-CIPPAlert {
         Write-Information 'Trying to send email'
         try {
             if ($Config.email -like '*@*' -or $altEmail -like '*@*') {
-                $Recipients = if ($AltEmail) { $AltEmail }
-                else {
+                $Recipients = if ($AltEmail) {
+                    [pscustomobject]@{EmailAddress = @{Address = $AltEmail } }
+                } else {
                     $Config.email.split($(if ($Config.email -like '*,*') { ',' } else { ';' })).trim() | ForEach-Object { if ($_ -like '*@*') { [pscustomobject]@{EmailAddress = @{Address = $_ } } } }
                 }
                 $PowerShellBody = [PSCustomObject]@{