Merge pull request KelvinTegelaar#1406 from kris6673/fix-issue-4005

Fix: Variable casing and improve logging in Invoke-RemoveStandardTemplate function

Author: JohnDuprey

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

@@ -12,42 +12,29 @@ function Invoke-RemoveStandardTemplate {
 
     $APIName = $Request.Params.CIPPEndpoint
     $Headers = $Request.Headers
-    Write-LogMessage -Headers $Headers -API $APINAME -message 'Accessed this API' -Sev 'Debug'
+    Write-LogMessage -Headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug'
 
     # Interact with query parameters or the body of the request.
     $ID = $Request.Body.ID ?? $Request.Query.ID
     try {
         $Table = Get-CippTable -tablename 'templates'
-        $Filter = "PartitionKey eq 'StandardsTemplateV2' and RowKey eq '$id'"
+        $Filter = "PartitionKey eq 'StandardsTemplateV2' and RowKey eq '$ID'"
         $ClearRow = Get-CIPPAzDataTableEntity @Table -Filter $Filter -Property PartitionKey, RowKey, JSON
-        if (!$ClearRow) {
-            $Result = "Standards template with id $ID not found"
-            Write-LogMessage -Headers $Headers -API $APINAME -message $Result -Sev 'Error'
-            $StatusCode = [HttpStatusCode]::NotFound
-            Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
-                    StatusCode = $StatusCode
-                    Body       = @{'Results' = $Result }
-                })
-            return
-        }
-        $Template = $ClearRow.JSON | ConvertFrom-Json
-        Remove-AzDataTableEntity -Force @Table -Entity $clearRow
-        $Result = "Removed Standards Template named $($Template.templateName) ($($id))"
-        Write-LogMessage -Headers $Headers -API $APINAME -message $Result -Sev 'Info'
+        $TemplateName = (ConvertFrom-Json -InputObject $ClearRow.JSON).templateName
+        Remove-AzDataTableEntity -Force @Table -Entity $ClearRow
+        $Result = "Removed Standards Template named: '$($TemplateName)' with id: $($ID)"
+        Write-LogMessage -Headers $Headers -API $APIName -message $Result -Sev Info
         $StatusCode = [HttpStatusCode]::OK
     } catch {
         $ErrorMessage = Get-CippException -Exception $_
-        $Result = "Failed to remove Standards template $ID. $($ErrorMessage.NormalizedError)"
-        Write-LogMessage -Headers $Headers -API $APINAME -message $Result -Sev 'Error' -LogData $ErrorMessage
+        $Result = "Failed to remove Standards template: $TemplateName with id: $ID. Error: $($ErrorMessage.NormalizedError)"
+        Write-LogMessage -Headers $Headers -API $APIName -message $Result -Sev Error -LogData $ErrorMessage
         $StatusCode = [HttpStatusCode]::InternalServerError
     }
 
-
     # Associate values to output bindings by calling 'Push-OutputBinding'.
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
             StatusCode = $StatusCode
             Body       = @{'Results' = $Result }
         })
-
-
 }