Merge pull request KelvinTegelaar#1689 from ZenTopBrandon/dev

Add organization ID as a reserved variable and update text replacement function

Author: JohnDuprey

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ListCustomVariables.ps1

@@ -25,6 +25,13 @@ function Invoke-ListCustomVariables {
                 Type        = 'reserved'
                 Category    = 'tenant'
             },
+            @{
+                Name        = 'organizationid'
+                Variable    = '%organizationid%'
+                Description = 'The tenant customer ID'
+                Type        = 'reserved'
+                Category    = 'tenant'
+            },
             @{
                 Name        = 'tenantfilter'
                 Variable    = '%tenantfilter%'

Modules/CIPPCore/Public/Get-CIPPTextReplacement.ps1

@@ -40,7 +40,8 @@ function Get-CIPPTextReplacement {
         '%programdata%',
         '%cippuserschema%',
         '%cippurl%',
-        '%defaultdomain%'
+        '%defaultdomain%',
+        '%organizationid%'
     )
 
     $Tenant = Get-Tenants -TenantFilter $TenantFilter
@@ -89,6 +90,7 @@ function Get-CIPPTextReplacement {
     }
     #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 '%organizationid%', $Tenant.customerId
     $Text = $Text -replace '%tenantfilter%', $Tenant.defaultDomainName
     $Text = $Text -replace '%defaultdomain%', $Tenant.defaultDomainName
     $Text = $Text -replace '%initialdomain%', $Tenant.initialDomainName