functionize text replacement

Author: JohnDuprey

Modules/CIPPCore/Public/Get-CIPPTextReplacement.ps1

@@ -0,0 +1,37 @@
+function Get-CIPPTextReplacement {
+    <#
+    .SYNOPSIS
+        Replaces text with tenant specific values
+    .DESCRIPTION
+        Helper function to replace text with tenant specific values
+    .PARAMETER TenantFilter
+        The tenant filter to use
+    .PARAMETER Text
+        The text to replace
+    .EXAMPLE
+        Get-CIPPTextReplacement -TenantFilter 'contoso.com' -Text 'Hello %tenantname%'
+    #>
+    param (
+        [string]$TenantFilter,
+        [string]$Text
+    )
+    $Tenant = Get-Tenants -TenantFilter $TenantFilter
+    $CustomerId = $Tenant.customerId
+
+    #connect to table, get replacement map. This is for future usage. The replacement map will allow users to create custom vars that get replaced by the actual values per tenant. Example:
+    # %WallPaperPath% gets replaced by RowKey WallPaperPath which is set to C:\Wallpapers for tenant 1, and D:\Wallpapers for tenant 2
+    $ReplaceTable = Get-CIPPTable -tablename 'CippReplacemap'
+    $ReplaceMap = Get-CIPPAzDataTableEntity @ReplaceTable -Filter "PartitionKey eq '$CustomerId'"
+    if ($ReplaceMap) {
+        foreach ($Replace in $ReplaceMap) {
+            $String = '%{0}%' -f $Replace.RowKey
+            $Text = $Text -replace $String, $Replace.Value
+        }
+    }
+    #default replacements for all tenants: %tenantid% becomes $tenant.customerId, %tenantfilter% becomes $tenant.defaultDomainName, %tenantname% becomes $tenant.displayName
+    $Text = $Text -replace '%tenantid%', $Tenant.customerId
+    $Text = $Text -replace '%tenantfilter%', $Tenant.defaultDomainName
+    $Text = $Text -replace '%tenantname%', $Tenant.displayName
+
+    return $Text
+}

Modules/CIPPCore/Public/Set-CIPPIntunePolicy.ps1

@@ -12,22 +12,8 @@ function Set-CIPPIntunePolicy {
         $tenantFilter
     )
     $APINAME = 'Set-CIPPIntunePolicy'
-    #connect to table, get replacement map. This is for future usage. The replacement map will allow users to create custom vars that get replaced by the actual values per tenant. Example:
-    # %WallPaperPath% gets replaced by RowKey WallPaperPath which is set to C:\Wallpapers for tenant 1, and D:\Wallpapers for tenant 2
-    $ReplaceTable = Get-CIPPTable -tablename 'CippReplacemap'
-    $ReplaceMap = Get-CIPPAzDataTableEntity @ReplaceTable -Filter "PartitionKey eq '$tenantFilter'"
-    if ($ReplaceMap) {
-        foreach ($Replace in $ReplaceMap) {
-            $String = '%{0}%' -f $Replace.RowKey
-            $RawJSON = $RawJSON -replace $String, $Replace.Value
-        }
-    }
-    #default replacements for all tenants: %tenantid% becomes $tenant.customerId, %tenantfilter% becomes $tenant.defaultDomainName, %tenantname% becomes $tenant.displayName
-    $Tenant = Get-Tenants -TenantFilter $tenantFilter
-    $RawJSON = $RawJSON -replace '%tenantid%', $Tenant.customerId
-    $RawJSON = $RawJSON -replace '%tenantfilter%', $Tenant.defaultDomainName
-    $RawJSON = $RawJSON -replace '%tenantname%', $Tenant.displayName
-
+   
+    $RawJSON = Get-CIPPTextReplacement -TenantFilter $tenantFilter -Text $RawJSON
 
     try {
         switch ($TemplateType) {