add json escape support for text replacements

Author: JohnDuprey

Modules/CIPPCore/Public/Get-CIPPTextReplacement.ps1

@@ -13,7 +13,8 @@ function Get-CIPPTextReplacement {
     #>
     param (
         [string]$TenantFilter,
-        $Text
+        $Text,
+        [switch]$EscapeForJson
     )
     if ($Text -isnot [string]) {
         return $Text
@@ -54,13 +55,21 @@ function Get-CIPPTextReplacement {
     $Vars = @{}
     if ($GlobalMap) {
         foreach ($Var in $GlobalMap) {
+            if ($EscapeForJson.IsPresent) {
+                # Escape quotes for JSON if not already escaped
+                $Var.Value = $Var.Value -replace '(?<!\\)"', '\"'
+            }
             $Vars[$Var.RowKey] = $Var.Value
         }
     }
     # Tenant Specific Variables
     $ReplaceMap = Get-CIPPAzDataTableEntity @ReplaceTable -Filter "PartitionKey eq '$CustomerId'"
     if ($ReplaceMap) {
         foreach ($Var in $ReplaceMap) {
+            if ($EscapeForJson.IsPresent) {
+                # Escape quotes for JSON if not already escaped
+                $Var.Value = $Var.Value -replace '(?<!\\)"', '\"'
+            }
             $Vars[$Var.RowKey] = $Var.Value
         }
     }

Modules/CIPPCore/Public/GraphHelper/New-GraphPOSTRequest.ps1

@@ -22,7 +22,7 @@ function New-GraphPOSTRequest ($uri, $tenantid, $body, $type, $scope, $AsApp, $N
             $contentType = 'application/json; charset=utf-8'
         }
         try {
-            $body = Get-CIPPTextReplacement -TenantFilter $tenantid -Text $body
+            $body = Get-CIPPTextReplacement -TenantFilter $tenantid -Text $body -EscapeForJson
             $ReturnedData = (Invoke-RestMethod -Uri $($uri) -Method $TYPE -Body $body -Headers $headers -ContentType $contentType -SkipHttpErrorCheck:$IgnoreErrors -ResponseHeadersVariable responseHeaders)
         } catch {
             $Message = if ($_.ErrorDetails.Message) {