Merge pull request #528 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecEditTemplate.ps1

@@ -11,16 +11,21 @@ function Invoke-ExecEditTemplate {
     $APIName = $Request.Params.CIPPEndpoint
     try {
         $Table = Get-CippTable -tablename 'templates'
-        $guid = $request.body.id ? $request.body.id : $request.body.GUID
-        $JSON = ConvertTo-Json -Compress -Depth 100 -InputObject ($request.body | Select-Object * -ExcludeProperty GUID)
-        $Type = $request.query.Type
+        $guid = $request.Body.id ? $request.Body.id : $request.Body.GUID
+        $JSON = ConvertTo-Json -Compress -Depth 100 -InputObject ($request.Body | Select-Object * -ExcludeProperty GUID)
+        $Type = $request.Query.Type ?? $Request.Body.Type
 
         if ($Type -eq 'IntuneTemplate') {
             Write-Host 'Intune Template'
             $OriginalTemplate = Get-CIPPAzDataTableEntity @Table -Filter "PartitionKey eq 'IntuneTemplate' and RowKey eq '$GUID'"
-            $OriginalTemplate = ($OriginalTemplate.JSON | ConvertFrom-Json -Depth 100)
-            $RawJSON = ConvertTo-Json -Compress -Depth 100 -InputObject $Request.body.parsedRAWJson
-            Set-CIPPIntuneTemplate -RawJSON $RawJSON -GUID $GUID -DisplayName $Request.body.displayName -Description $Request.body.description -templateType $OriginalTemplate.Type -Headers $Request.Headers
+            $OriginalJSON = $OriginalTemplate.JSON
+            $OriginalTemplate = ($OriginalJSON | ConvertFrom-Json -Depth 100)
+            if ($Request.Body.parsedRAWJson) {
+                $RawJSON = ConvertTo-Json -Compress -Depth 100 -InputObject $Request.Body.parsedRAWJson
+            } else {
+                $RawJSON = $OriginalJSON
+            }
+            Set-CIPPIntuneTemplate -RawJSON $RawJSON -GUID $GUID -DisplayName $Request.Body.displayName -Description $Request.Body.description -templateType $OriginalTemplate.Type -Headers $Request.Headers
         } else {
             $Table.Force = $true
             Add-CIPPAzDataTableEntity @Table -Entity @{
@@ -29,7 +34,7 @@ function Invoke-ExecEditTemplate {
                 PartitionKey = "$Type"
                 GUID         = "$GUID"
             }
-            Write-LogMessage -headers $Request.Headers -API $APINAME -message "Edited template $($Request.body.name) with GUID $GUID" -Sev 'Debug'
+            Write-LogMessage -headers $Request.Headers -API $APINAME -message "Edited template $($Request.Body.name) with GUID $GUID" -Sev 'Debug'
         }
         $body = [pscustomobject]@{ 'Results' = 'Successfully saved the template' }
 

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecSetPackageTag.ps1

@@ -32,13 +32,17 @@ function Invoke-ExecSetPackageTag {
         foreach ($GUID in $GUIDS) {
             $Filter = "RowKey eq '$GUID'"
             $Template = Get-CIPPAzDataTableEntity @Table -Filter $Filter
-            Add-CIPPAzDataTableEntity @Table -Entity @{
+            $Entity = @{
                 JSON         = $Template.JSON
                 RowKey       = "$GUID"
                 PartitionKey = $Template.PartitionKey
                 GUID         = "$GUID"
                 Package      = $PackageValue
-            } -Force
+                SHA          = $Template.SHA ?? $null
+            }
+
+
+            Add-CIPPAzDataTableEntity @Table -Entity $Entity -Force
 
             if ($Remove -eq $true) {
                 Write-LogMessage -headers $Headers -API $APIName -message "$LogMessage $GUID" -Sev 'Info'

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Endpoint/MEM/Invoke-RemoveIntuneTemplate.ps1

@@ -1,4 +1,4 @@
-Function Invoke-RemoveIntuneTemplate {
+function Invoke-RemoveIntuneTemplate {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -15,13 +15,15 @@ Function Invoke-RemoveIntuneTemplate {
     $ID = $request.Query.ID ?? $Request.Body.ID
     try {
         $Table = Get-CippTable -tablename 'templates'
-        Write-Host $ID
 
         $Filter = "PartitionKey eq 'IntuneTemplate' and RowKey eq '$ID'"
-        Write-Host $Filter
         $ClearRow = Get-CIPPAzDataTableEntity @Table -Filter $Filter -Property PartitionKey, RowKey
-        Remove-AzDataTableEntity -Force @Table -Entity $clearRow
-        $Result = "Removed Intune Template with ID $ID"
+        if ($ClearRow) {
+            Remove-AzDataTableEntity @Table -Entity $clearRow -Force
+            $Result = "Removed Intune Template with ID $ID."
+        } else {
+            $Result = "The template with ID $ID has already been deleted."
+        }
         Write-LogMessage -Headers $Headers -API $APINAME -message $Result -Sev 'Info'
         $StatusCode = [HttpStatusCode]::OK
     } catch {