custom data mapping

JohnDuprey · JohnDuprey · commit d585ae2b5334 · 2025-03-19T23:35:22.000-04:00
diff --git a/Modules/CIPPCore/Public/CustomData/Invoke-CustomDataSync.ps1 b/Modules/CIPPCore/Public/CustomData/Invoke-CustomDataSync.ps1
@@ -0,0 +1,15 @@
+function Invoke-CustomDataSync {
+    param(
+        $TenantFilter
+    )
+
+    $Table = Get-CIPPTable -TableName CustomDataMapping
+    $CustomData = Get-CIPPAzDataTableEntity @Table
+
+    $Mappings = $CustomData | ForEach-Object {
+        $Mapping = $_.JSON | ConvertFrom-Json
+        $Mapping
+    }
+
+    Write-Host ($Mappings | ConvertTo-Json -Depth 10)
+}
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecCustomData.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Settings/Invoke-ExecCustomData.ps1
@@ -10,6 +10,7 @@ function Invoke-ExecCustomData {
 
     $Action = $Request.Query.Action ?? $Request.Body.Action
     $CustomDataTable = Get-CippTable -TableName 'CustomData'
+    $CustomDataMappingsTable = Get-CippTable -TableName 'CustomDataMappings'
 
     Write-Information "Executing action '$Action'"
 
@@ -231,6 +232,19 @@ function Invoke-ExecCustomData {
             try {
                 $Uri = "https://graph.microsoft.com/beta/applications(appId='$($env:ApplicationId)')/extensionProperties"
                 $DirectoryExtensions = New-GraphGetRequest -uri $Uri -AsApp $true -NoAuthCheck $true -tenantid $env:TenantID
+                $Existing = Get-CIPPAzDataTableEntity @CustomDataTable -Filter "PartitionKey eq 'DirectoryExtension'"
+
+                foreach ($DirectoryExtension in $DirectoryExtensions) {
+                    if ($Existing -match $DirectoryExtension.name) {
+                        continue
+                    }
+                    $Entity = @{
+                        PartitionKey = 'DirectoryExtension'
+                        RowKey       = $DirectoryExtension.name
+                        JSON         = [string](ConvertTo-Json $DirectoryExtension -Compress -Depth 5)
+                    }
+                    Add-CIPPAzDataTableEntity @CustomDataTable -Entity $Entity -Force
+                }
 
                 $Body = @{
                     Results = @($DirectoryExtensions)
@@ -281,8 +295,9 @@ function Invoke-ExecCustomData {
                 $Entity = @{
                     PartitionKey = 'DirectoryExtension'
                     RowKey       = $Response.name
-                    JSON         = [string](ConvertFrom-Json $Response -Compress -Depth 5)
+                    JSON         = [string](ConvertTo-Json $Response -Compress -Depth 5)
                 }
+                Add-CIPPAzDataTableEntity @CustomDataTable -Entity $Entity -Force
             } catch {
                 $Body = @{
                     Results = @(
@@ -341,6 +356,64 @@ function Invoke-ExecCustomData {
                 Results = @($AvailableAttributes)
             }
         }
+        'ListMappings' {
+            try {
+                $Mappings = Get-CIPPAzDataTableEntity @CustomDataMappingsTable | ForEach-Object {
+                    $Mapping = $_.JSON | ConvertFrom-Json -AsHashtable
+                    [PSCustomObject]@{
+                        id            = $_.RowKey
+                        tenant        = $Mapping.tenantFilter.label
+                        sourceDataset = $Mapping.sourceDataset.label
+                    }
+                }
+                $Body = @{
+                    Results = @($Mappings)
+                }
+            } catch {
+                $Body = @{
+                    Results = @(
+                        @{
+                            state      = 'error'
+                            resultText = "Failed to retrieve mappings: $($_.Exception.Message)"
+                        }
+                    )
+                }
+            }
+        }
+        'AddMapping' {
+            try {
+                $Mapping = $Request.Body.Mapping
+                if (!$Mapping) {
+                    throw 'Mapping data is missing in the request body.'
+                }
+                $id = [Guid]::NewGuid().ToString()
+                $Entity = @{
+                    PartitionKey = 'Mapping'
+                    RowKey       = $id
+                    JSON         = [string]($Mapping | ConvertTo-Json -Depth 5 -Compress)
+                }
+
+                Add-CIPPAzDataTableEntity @CustomDataMappingsTable -Entity $Entity -Force
+                Register-CIPPExtensionScheduledTasks
+
+                $Body = @{
+                    Results = @{
+                        state      = 'success'
+                        resultText = "Mapping with ID '$($id)' added successfully."
+                    }
+                }
+            } catch {
+                $Body = @{
+                    Results = @(
+                        @{
+                            state      = 'error'
+                            resultText = "Failed to add mapping: $($_.Exception.Message)"
+                        }
+                    )
+                }
+            }
+        }
+
         default {
             $Body = @{
                 Results = @(
diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ExecRemoveMailboxRule.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ExecRemoveMailboxRule.ps1
@@ -15,7 +15,7 @@ Function Invoke-ExecRemoveMailboxRule {
     Write-LogMessage -Headers $Headers -API $APIName -tenant $TenantFilter -message 'Accessed this API' -Sev 'Debug'
 
     # Interact with the query or body of the request
-    $TenantFilter = $Request.Query.TenantFilter ?? $Request.Query.TenantFilter
+    $TenantFilter = $Request.Query.TenantFilter ?? $Request.Body.TenantFilter
     $RuleName = $Request.Query.ruleName ?? $Request.Body.ruleName
     $RuleId = $Request.Query.ruleId ?? $Request.Body.ruleId
     $Username = $Request.Query.userPrincipalName ?? $Request.Body.userPrincipalName
diff --git a/Modules/CIPPCore/Public/Get-CippCustomDataAttributes.ps1 b/Modules/CIPPCore/Public/Get-CippCustomDataAttributes.ps1
@@ -18,15 +18,18 @@ function Get-CippCustomDataAttributes {
             if ($Type -eq 'SchemaExtension') {
                 $Name = $CustomData.id
                 foreach ($TargetObject in $CustomData.targetTypes) {
-                    [PSCustomObject]@{
-                        name         = $Name
-                        type         = $Type
-                        targetObject = $TargetObject.ToLower()
-                        properties   = $CustomData.properties
+                    foreach ($Property in $CustomData.properties) {
+                        [PSCustomObject]@{
+                            name          = '{0}.{1}' -f $Name, $Property.name
+                            type          = $Type
+                            targetObject  = $TargetObject
+                            dataType      = $Property.type
+                            isMultiValued = $false
+                        }
                     }
                 }
             } elseif ($Type -eq 'DirectoryExtension') {
-                $Name = $CustomData.RowKey
+                $Name = $CustomDataEntity.RowKey
                 foreach ($TargetObject in $CustomData.targetObjects) {
                     [PSCustomObject]@{
                         name          = $Name
diff --git a/Modules/CippExtensions/Public/Extension Functions/Push-CippExtensionData.ps1 b/Modules/CippExtensions/Public/Extension Functions/Push-CippExtensionData.ps1
@@ -14,5 +14,9 @@ function Push-CippExtensionData {
                 Invoke-HuduExtensionSync -Configuration $Config -TenantFilter $TenantFilter
             }
         }
+        'CustomData' {
+            Write-Host 'Perfoming Custom Data Extension Sync...'
+            Invoke-CustomDataSync -TenantFilter $TenantFilter
+        }
     }
 }
diff --git a/Modules/CippExtensions/Public/Extension Functions/Register-CippExtensionScheduledTasks.ps1 b/Modules/CippExtensions/Public/Extension Functions/Register-CippExtensionScheduledTasks.ps1
@@ -1,5 +1,5 @@
 function Register-CIPPExtensionScheduledTasks {
-    Param(
+    param(
         [switch]$Reschedule
     )
 
@@ -14,13 +14,23 @@ function Register-CIPPExtensionScheduledTasks {
     $PushTasks = Get-CIPPAzDataTableEntity @ScheduledTasksTable -Filter 'Hidden eq true' | Where-Object { $_.Command -match 'Push-CippExtensionData' }
     $Tenants = Get-Tenants -IncludeErrors
 
-    $Extensions = @('Hudu', 'NinjaOne')
+    $Extensions = @('Hudu', 'NinjaOne', 'CustomData')
     $MappedTenants = [System.Collections.Generic.List[string]]::new()
     foreach ($Extension in $Extensions) {
         $ExtensionConfig = $Config.$Extension
-        if ($ExtensionConfig.Enabled -eq $true) {
-            $Mappings = Get-CIPPAzDataTableEntity @MappingsTable -Filter "PartitionKey eq '$($Extension)Mapping'"
-            $FieldMapping = Get-CIPPAzDataTableEntity @MappingsTable -Filter "PartitionKey eq '$($Extension)FieldMapping'"
+        if ($ExtensionConfig.Enabled -eq $true -or $Extension -eq 'CustomData') {
+            if ($Extension -eq 'CustomData') {
+                $CustomDataMappingTable = Get-CIPPTable -TableName CustomDataMapping
+                $Mappings = Get-CIPPAzDataTableEntity @CustomDataMappingTable | ForEach-Object {
+                    $Mapping = $_.JSON | ConvertFrom-Json
+                    [pscustomobject]@{
+                        RowKey = $Mapping.tenantFilter.value
+                    }
+                }
+            } else {
+                $Mappings = Get-CIPPAzDataTableEntity @MappingsTable -Filter "PartitionKey eq '$($Extension)Mapping'"
+                $FieldMapping = Get-CIPPAzDataTableEntity @MappingsTable -Filter "PartitionKey eq '$($Extension)FieldMapping'"
+            }
             $FieldSync = @{}
             $SyncTypes = [System.Collections.Generic.List[string]]::new()
 
@@ -35,7 +45,7 @@ function Register-CIPPExtensionScheduledTasks {
             $SyncTypes.Add('Devices')
 
             foreach ($Mapping in $Mappings) {
-                $Tenant = $Tenants | Where-Object { $_.customerId -eq $Mapping.RowKey }
+                $Tenant = $Tenants | Where-Object { $_.customerId -eq $Mapping.RowKey -or $_.defaultDomainName -eq $Mapping.RowKey -or $Mapping.RowKey -eq 'AllTenants' }
                 if (!$Tenant) {
                     Write-Warning "Tenant $($Mapping.RowKey) not found"
                     continue
diff --git a/Modules/CippExtensions/Public/Extension Functions/Sync-CippExtensionData.ps1 b/Modules/CippExtensions/Public/Extension Functions/Sync-CippExtensionData.ps1
@@ -151,20 +151,26 @@ function Sync-CippExtensionData {
                 )
             }
             'Mailboxes' {
-                $Select = 'id,ExchangeGuid,ArchiveGuid,UserPrincipalName,DisplayName,PrimarySMTPAddress,RecipientType,RecipientTypeDetails,EmailAddresses,WhenSoftDeleted,IsInactiveMailbox,ProhibitSendQuota,ProhibitSendReceiveQuota,LitigationHoldEnabled,InPlaceHolds,HiddenFromAddressListsEnabled'
+                $Select = 'id,ExchangeGuid,ArchiveGuid,UserPrincipalName,DisplayName,PrimarySMTPAddress,RecipientType,RecipientTypeDetails,EmailAddresses,WhenSoftDeleted,IsInactiveMailbox,ForwardingSmtpAddress,DeliverToMailboxAndForward,ForwardingAddress,HiddenFromAddressListsEnabled,ExternalDirectoryObjectId,MessageCopyForSendOnBehalfEnabled,MessageCopyForSentAsEnabled'
                 $ExoRequest = @{
                     tenantid  = $TenantFilter
                     cmdlet    = 'Get-Mailbox'
                     cmdParams = @{}
                     Select    = $Select
                 }
-                $Mailboxes = (New-ExoRequest @ExoRequest) | Select-Object id, ExchangeGuid, ArchiveGuid, WhenSoftDeleted, ProhibitSendQuota, ProhibitSendReceiveQuota, LitigationHoldEnabled, InplaceHolds, HiddenFromAddressListsEnabled, @{ Name = 'UPN'; Expression = { $_.'UserPrincipalName' } },
-
+                $Mailboxes = (New-ExoRequest @ExoRequest) | Select-Object id, ExchangeGuid, ArchiveGuid, WhenSoftDeleted, @{ Name = 'UPN'; Expression = { $_.'UserPrincipalName' } },
                 @{ Name = 'displayName'; Expression = { $_.'DisplayName' } },
                 @{ Name = 'primarySmtpAddress'; Expression = { $_.'PrimarySMTPAddress' } },
                 @{ Name = 'recipientType'; Expression = { $_.'RecipientType' } },
                 @{ Name = 'recipientTypeDetails'; Expression = { $_.'RecipientTypeDetails' } },
-                @{ Name = 'AdditionalEmailAddresses'; Expression = { ($_.'EmailAddresses' | Where-Object { $_ -clike 'smtp:*' }).Replace('smtp:', '') -join ', ' } }
+                @{ Name = 'AdditionalEmailAddresses'; Expression = { ($_.'EmailAddresses' | Where-Object { $_ -clike 'smtp:*' }).Replace('smtp:', '') -join ', ' } },
+                @{Name = 'ForwardingSmtpAddress'; Expression = { $_.'ForwardingSmtpAddress' -replace 'smtp:', '' } },
+                @{Name = 'InternalForwardingAddress'; Expression = { $_.'ForwardingAddress' } },
+                DeliverToMailboxAndForward,
+                HiddenFromAddressListsEnabled,
+                ExternalDirectoryObjectId,
+                MessageCopyForSendOnBehalfEnabled,
+                MessageCopyForSentAsEnabled
 
                 $Entity = @{
                     PartitionKey = $TenantFilter

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,9 @@ function Push-CippExtensionData {`
`14`	`14`	`Invoke-HuduExtensionSync -Configuration $Config -TenantFilter $TenantFilter`
`15`	`15`	`}`
`16`	`16`	`}`
	`17`	`+ 'CustomData' {`
	`18`	`+ Write-Host 'Perfoming Custom Data Extension Sync...'`
	`19`	`+ Invoke-CustomDataSync -TenantFilter $TenantFilter`
	`20`	`+ }`
`17`	`21`	`}`
`18`	`22`	`}`