Merge pull request #151 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

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

@@ -360,10 +360,16 @@ function Invoke-ExecCustomData {
             try {
                 $Mappings = Get-CIPPAzDataTableEntity @CustomDataMappingsTable | ForEach-Object {
                     $Mapping = $_.JSON | ConvertFrom-Json -AsHashtable
+
+                    Write-Information ($Mapping | ConvertTo-Json -Depth 5)
                     [PSCustomObject]@{
-                        id            = $_.RowKey
-                        tenant        = $Mapping.tenantFilter.label
-                        sourceDataset = $Mapping.sourceDataset.label
+                        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.label
                     }
                 }
                 $Body = @{
@@ -380,16 +386,16 @@ function Invoke-ExecCustomData {
                 }
             }
         }
-        'AddMapping' {
+        'AddEditMapping' {
             try {
                 $Mapping = $Request.Body.Mapping
                 if (!$Mapping) {
                     throw 'Mapping data is missing in the request body.'
                 }
-                $id = [Guid]::NewGuid().ToString()
+                $MappingId = $Request.Body.id ?? [Guid]::NewGuid().ToString()
                 $Entity = @{
                     PartitionKey = 'Mapping'
-                    RowKey       = $id
+                    RowKey       = [string]$MappingId
                     JSON         = [string]($Mapping | ConvertTo-Json -Depth 5 -Compress)
                 }
 
@@ -399,7 +405,7 @@ function Invoke-ExecCustomData {
                 $Body = @{
                     Results = @{
                         state      = 'success'
-                        resultText = "Mapping with ID '$($id)' added successfully."
+                        resultText = 'Mapping saved successfully.'
                     }
                 }
             } catch {
@@ -413,6 +419,67 @@ function Invoke-ExecCustomData {
                 }
             }
         }
+        'DeleteMapping' {
+            try {
+                $MappingId = $Request.Body.id
+                if (!$MappingId) {
+                    throw 'Mapping ID is missing in the request body.'
+                }
+
+                # Retrieve the mapping entity
+                $MappingEntity = Get-CIPPAzDataTableEntity @CustomDataMappingsTable -Filter "PartitionKey eq 'Mapping' and RowKey eq '$MappingId'"
+                if (!$MappingEntity) {
+                    throw "Mapping with ID '$MappingId' not found."
+                }
+
+                # Delete the mapping entity
+                Remove-AzDataTableEntity @CustomDataMappingsTable -Entity $MappingEntity
+                Register-CIPPExtensionScheduledTasks
+                $Body = @{
+                    Results = @{
+                        state      = 'success'
+                        resultText = 'Mapping deleted successfully.'
+                    }
+                }
+            } catch {
+                $Body = @{
+                    Results = @(
+                        @{
+                            state      = 'error'
+                            resultText = "Failed to delete mapping: $($_.Exception.Message)"
+                        }
+                    )
+                }
+            }
+        }
+        'GetMapping' {
+            try {
+                $MappingId = $Request.Query.id
+                if (!$MappingId) {
+                    throw 'Mapping ID is missing in the request query.'
+                }
+
+                # Retrieve the mapping entity
+                $MappingEntity = Get-CIPPAzDataTableEntity @CustomDataMappingsTable -Filter "PartitionKey eq 'Mapping' and RowKey eq '$MappingId'"
+                if (!$MappingEntity) {
+                    throw "Mapping with ID '$MappingId' not found."
+                }
+
+                $Mapping = $MappingEntity.JSON | ConvertFrom-Json
+                $Body = @{
+                    Results = $Mapping
+                }
+            } catch {
+                $Body = @{
+                    Results = @(
+                        @{
+                            state      = 'error'
+                            resultText = "Failed to retrieve mapping: $($_.Exception.Message)"
+                        }
+                    )
+                }
+            }
+        }
 
         default {
             $Body = @{

Modules/CIPPCore/Public/New-CIPPAlertTemplate.ps1

@@ -31,14 +31,14 @@ function New-CIPPAlertTemplate {
         $DataHTML = foreach ($object in $data) {
             "<p>For the standard $($object.standardName) in template {{Template Name }} we've detected the following:</p> <li>$($object.message)</li>"
             if ($object.object) {
-                $object.object = $object.object | ConvertFrom-Json
-                $object.object = $object.object | Select-Object * -ExcludeProperty Etag, PartitionKey, TimeStamp
-                if ($object.object.compare) {
+                $StandardObject = $object.object | ConvertFrom-Json
+                $StandardObject = $newobject | Select-Object * -ExcludeProperty Etag, PartitionKey, TimeStamp
+                if ($StandardObject.compare) {
                     '<p>The following differences have been detected:</p>'
-                   ($object.object.compare | ConvertTo-Html -Fragment | Out-String).Replace('<table>', ' <table class="table-modern">')
+                    ($StandardObject.compare | ConvertTo-Html -Fragment | Out-String).Replace('<table>', ' <table class="table-modern">')
                 } else {
                     '<p>This is a table representation of the current settings:</p>'
-                    ($object.object | ConvertTo-Html -Fragment -As List | Out-String).Replace('<table>', ' <table class="table-modern">')
+                    ($StandardObject | ConvertTo-Html -Fragment -As List | Out-String).Replace('<table>', ' <table class="table-modern">')
                 }
             }
 

Modules/CIPPCore/Public/New-CippUser.ps1

@@ -37,7 +37,7 @@ function New-CIPPUser {
                 'password'                      = $password
             }
         }
-        if ($userobj.businessPhone) { $bodytoShip | Add-Member -NotePropertyName businessPhones -NotePropertyValue @($UserObj.businessPhone) }
+        if ($userobj.businessPhones) { $bodytoShip | Add-Member -NotePropertyName businessPhones -NotePropertyValue @($UserObj.businessPhones) }
         if ($UserObj.defaultAttributes) {
             $UserObj.defaultAttributes | Get-Member -MemberType NoteProperty | ForEach-Object {
                 Write-Host "Editing user and adding $($_.Name) with value $($UserObj.defaultAttributes.$($_.Name).value)"