Merge pull request #175 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

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

@@ -18,7 +18,7 @@ function Invoke-ExecCustomData {
         'ListSchemaExtensions' {
             try {
                 $SchemaExtensions = Get-CIPPAzDataTableEntity @CustomDataTable -Filter "PartitionKey eq 'SchemaExtension'" | Select-Object -ExpandProperty JSON | ConvertFrom-Json
-                if (!$SchemaExtensions) {
+                if (!$SchemaExtensions -or $SchemaExtensions.id -notmatch '_') {
                     $SchemaExtensions = Get-CIPPSchemaExtensions | Sort-Object id
                 }
                 $Body = @{

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

@@ -1,6 +1,6 @@
 using namespace System.Net
 
-Function Invoke-ExecJITAdmin {
+function Invoke-ExecJITAdmin {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -16,8 +16,7 @@ Function Invoke-ExecJITAdmin {
     Write-LogMessage -Headers $User -API $APINAME -message 'Accessed this API' -Sev 'Debug'
 
     if ($Request.Query.Action -eq 'List') {
-        $Schema = Get-CIPPSchemaExtensions | Where-Object { $_.id -match '_cippUser' }
-        #Write-Information "Schema: $($Schema)"
+        $Schema = Get-CIPPSchemaExtensions | Where-Object { $_.id -match '_cippUser' } | Select-Object -First 1
         $Query = @{
             TenantFilter = $Request.Query.TenantFilter
             Endpoint     = 'users'

Modules/CIPPCore/Public/Set-CIPPUserJITAdmin.ps1

@@ -26,7 +26,7 @@ function Set-CIPPUserJITAdmin {
 
     #>
     [CmdletBinding(SupportsShouldProcess = $true)]
-    Param(
+    param(
         [Parameter(Mandatory = $true)]
         [string]$TenantFilter,
 
@@ -50,7 +50,7 @@ function Set-CIPPUserJITAdmin {
         switch ($Action) {
             'Create' {
                 $Password = New-passwordString
-                $Schema = Get-CIPPSchemaExtensions | Where-Object { $_.id -match '_cippUser' }
+                $Schema = Get-CIPPSchemaExtensions | Where-Object { $_.id -match '_cippUser' } | Select-Object -First 1
 
                 $Body = @{
                     givenName         = $User.FirstName

Modules/CIPPCore/Public/Set-CIPPUserJITAdminProperties.ps1

@@ -8,7 +8,7 @@ function Set-CIPPUserJITAdminProperties {
         [switch]$Clear
     )
     try {
-        $Schema = Get-CIPPSchemaExtensions | Where-Object { $_.id -match '_cippUser' }
+        $Schema = Get-CIPPSchemaExtensions | Where-Object { $_.id -match '_cippUser' } | Select-Object -First 1
         if ($Clear.IsPresent) {
             $Body = [PSCustomObject]@{
                 "$($Schema.id)" = @{
@@ -24,7 +24,7 @@ function Set-CIPPUserJITAdminProperties {
                 }
             }
         }
-        
+
         $Json = ConvertTo-Json -Depth 5 -InputObject $Body
         Write-Information $Json
         New-GraphPOSTRequest -type PATCH -Uri "https://graph.microsoft.com/beta/users/$UserId" -Body $Json -tenantid $TenantFilter | Out-Null

Modules/CIPPCore/Public/Set-CIPPUserSchemaProperties.ps1

@@ -24,7 +24,7 @@ function Set-CIPPUserSchemaProperties {
         [object]$Users
     )
 
-    $Schema = Get-CIPPSchemaExtensions | Where-Object { $_.id -match '_cippUser' }
+    $Schema = Get-CIPPSchemaExtensions | Where-Object { $_.id -match '_cippUser' } | Select-Object -First 1
     $int = 0
     $Requests = foreach ($User in $Users) {
         @{

Modules/CippExtensions/Public/Hudu/Get-HuduFieldMapping.ps1

@@ -31,16 +31,31 @@ function Get-HuduFieldMapping {
         $Configuration = (Get-CIPPAzDataTableEntity @Table).config | ConvertFrom-Json -ea stop
         Connect-HuduAPI -configuration $Configuration
 
-        $AssetLayouts = Get-HuduAssetLayouts | Select-Object @{Name = 'FieldType' ; Expression = { 'Layouts' } }, @{Name = 'value'; Expression = { $_.id } }, name, fields
+        try {
+            $AssetLayouts = Get-HuduAssetLayouts -ErrorAction Stop | Select-Object @{Name = 'FieldType' ; Expression = { 'Layouts' } }, @{Name = 'value'; Expression = { $_.id } }, name, fields
+        } catch {
+            $Message = $_.Exception.Message -replace "'" | ConvertFrom-Json -ErrorAction SilentlyContinue
+            if ($Message) {
+                $Message = $Message.error
+            } else {
+                $Message = $_.Exception.Message
+            }
+
+            Write-Warning "Could not get Hudu Asset Layouts, error: $Message"
+            Write-LogMessage -Message "Could not get Hudu Asset Layouts, error: $Message " -Level Error -tenant 'CIPP' -API 'HuduMapping'
+            $AssetLayouts = @(@{FieldType = 'Layouts'; name = "Could not get Hudu Asset Layouts, $Message"; value = -1 })
+        }
     } catch {
-        $Message = if ($_.ErrorDetails.Message) {
-            Get-NormalizedError -Message $_.ErrorDetails.Message
+        $Message = $_.Exception.Message -replace "'" | ConvertFrom-Json -ErrorAction SilentlyContinue
+        if ($Message) {
+            $Message = $Message.error
         } else {
-            $_.Exception.message
+            $Message = $_.Exception.Message
         }
 
+        Write-Warning "Could not get Hudu Asset Layouts, error: $Message"
         Write-LogMessage -Message "Could not get Hudu Asset Layouts, error: $Message " -Level Error -tenant 'CIPP' -API 'HuduMapping'
-        $AssetLayouts = @(@{name = "Could not get Hudu Asset Layouts, error: $Message"; value = '-1' })
+        $AssetLayouts = @(@{FieldType = 'Layouts'; name = "Could not get Hudu Asset Layouts, $Message"; value = -1 })
     }
 
     $Unset = [PSCustomObject]@{