Merge pull request #476 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListCustomDataMappings.ps1

@@ -0,0 +1,71 @@
+function Invoke-ListCustomDataMappings {
+    <#
+    .FUNCTIONALITY
+        Entrypoint
+    .ROLE
+        CIPP.Core.Read
+    #>
+    [CmdletBinding()]
+    param($Request, $TriggerMetadata)
+
+    $CustomDataMappingsTable = Get-CippTable -TableName 'CustomDataMappings'
+    $TenantFilter = $Request.Query.tenantFilter
+    $SourceTypeFilter = $Request.Query.sourceType
+    $DirectoryObjectFilter = $Request.Query.directoryObject
+
+    Write-Information "Listing custom data mappings with filters - sourceType: $SourceTypeFilter, directoryObject: $DirectoryObjectFilter, tenant: $TenantFilter"
+
+    try {
+        $Mappings = Get-CIPPAzDataTableEntity @CustomDataMappingsTable | ForEach-Object {
+            $Mapping = $_.JSON | ConvertFrom-Json -AsHashtable
+
+            # Filter by tenant
+            $TenantList = Expand-CIPPTenantGroups -TenantFilter $Mapping.tenantFilter
+            if ($TenantFilter -and ($TenantList -contains $TenantFilter -or $TenantList -eq 'AllTenants')) {
+                return
+            }
+
+            $MappingObject = [PSCustomObject]@{
+                id                    = $_.RowKey
+                tenant                = $Mapping.tenantFilter.label
+                dataset               = $Mapping.extensionSyncDataset.label
+                sourceType            = $Mapping.sourceType.label
+                directoryObject       = $Mapping.directoryObjectType.label
+                syncProperty          = $Mapping.extensionSyncProperty.label ?? @($Mapping.extensionSyncDataset.addedFields.select -split ',')
+                customDataAttribute   = $Mapping.customDataAttribute
+                manualEntryFieldLabel = $Mapping.manualEntryFieldLabel
+            }
+
+            # Apply safe filtering
+            $Include = $true
+            if ($SourceTypeFilter -and $MappingObject.sourceType -ne $SourceTypeFilter) {
+                $Include = $false
+            }
+            if ($DirectoryObjectFilter -and $MappingObject.directoryObject -ne $DirectoryObjectFilter) {
+                $Include = $false
+            }
+
+            if ($Include) {
+                return $MappingObject
+            }
+        } | Where-Object { $_ -ne $null }
+
+        $Body = @{
+            Results = @($Mappings)
+        }
+    } catch {
+        $Body = @{
+            Results = @(
+                @{
+                    state      = 'error'
+                    resultText = "Failed to retrieve mappings: $($_.Exception.Message)"
+                }
+            )
+        }
+    }
+
+    return ([HttpResponseContext]@{
+            StatusCode = [HttpStatusCode]::OK
+            Body       = $Body
+        })
+}

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

@@ -365,10 +365,10 @@ function Invoke-ExecCustomData {
                     [PSCustomObject]@{
                         id                  = $_.RowKey
                         tenant              = $Mapping.tenantFilter.label
-                        dataset             = $Mapping.extensionSyncDataset.label
+                        dataset             = $Mapping.extensionSyncDataset.label ?? 'N/A'
                         sourceType          = $Mapping.sourceType.label
                         directoryObject     = $Mapping.directoryObjectType.label
-                        syncProperty        = $Mapping.extensionSyncProperty.label ?? @($Mapping.extensionSyncDataset.addedFields.select -split ',')
+                        syncProperty        = $Mapping.extensionSyncProperty.label ?? ($Mapping.extensionSyncDataset ? @($Mapping.extensionSyncDataset.addedFields.select -split ',') : 'N/A')
                         customDataAttribute = $Mapping.customDataAttribute.label
                     }
                 }

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-EditUser.ps1

@@ -61,13 +61,20 @@ function Invoke-EditUser {
         }
         if ($UserObj.defaultAttributes) {
             $UserObj.defaultAttributes | Get-Member -MemberType NoteProperty | ForEach-Object {
-                Write-Host "Editing user and adding $($_.Name) with value $($UserObj.defaultAttributes.$($_.Name).value)"
                 if (-not [string]::IsNullOrWhiteSpace($UserObj.defaultAttributes.$($_.Name).value)) {
-                    Write-Host 'adding body to ship'
+                    Write-Host "Editing user and adding $($_.Name) with value $($UserObj.defaultAttributes.$($_.Name).value)"
                     $BodyToShip | Add-Member -NotePropertyName $_.Name -NotePropertyValue $UserObj.defaultAttributes.$($_.Name).value -Force
                 }
             }
         }
+        if ($UserObj.customData) {
+            $UserObj.customData | Get-Member -MemberType NoteProperty | ForEach-Object {
+                if (-not [string]::IsNullOrWhiteSpace($UserObj.customData.$($_.Name))) {
+                    Write-Host "Editing user and adding custom data $($_.Name) with value $($UserObj.customData.$($_.Name))"
+                    $BodyToShip | Add-Member -NotePropertyName $_.Name -NotePropertyValue $UserObj.customData.$($_.Name) -Force
+                }
+            }
+        }
         $bodyToShip = ConvertTo-Json -Depth 10 -InputObject $BodyToship -Compress
         $null = New-GraphPostRequest -uri "https://graph.microsoft.com/beta/users/$($UserObj.id)" -tenantid $UserObj.tenantFilter -type PATCH -body $BodyToship -verbose
         $Results.Add( 'Success. The user has been edited.' )

Modules/CIPPCore/Public/New-CippUser.ps1

@@ -49,6 +49,15 @@ function New-CIPPUser {
                 }
             }
         }
+        if ($UserObj.customData) {
+            $UserObj.customData | Get-Member -MemberType NoteProperty | ForEach-Object {
+                Write-Host "Editing user and adding custom data $($_.Name) with value $($UserObj.customData.$($_.Name))"
+                if (-not [string]::IsNullOrWhiteSpace($UserObj.customData.$($_.Name))) {
+                    Write-Host 'adding custom data to body'
+                    $BodyToShip | Add-Member -NotePropertyName $_.Name -NotePropertyValue $UserObj.customData.$($_.Name) -Force
+                }
+            }
+        }
         $bodyToShip = ConvertTo-Json -Depth 10 -InputObject $BodyToship -Compress
         Write-Host "Shipping: $bodyToShip"
         $GraphRequest = New-GraphPostRequest -uri 'https://graph.microsoft.com/beta/users' -tenantId $UserObj.tenantFilter -type POST -body $BodyToship -verbose