Merge pull request #117 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ListBPATemplates.ps1

@@ -18,8 +18,9 @@ Function Invoke-ListBPATemplates {
     $Table = Get-CippTable -tablename 'templates'
 
     $Templates = Get-ChildItem 'Config\*.BPATemplate.json' | ForEach-Object {
+        $TemplateJson = Get-Content $_ | ConvertFrom-Json | ConvertTo-Json -Compress -Depth 10
         $Entity = @{
-            JSON         = "$(Get-Content $_)"
+            JSON         = "$TemplateJson"
             RowKey       = "$($_.name)"
             PartitionKey = 'BPATemplate'
             GUID         = "$($_.name)"
@@ -31,10 +32,14 @@ Function Invoke-ListBPATemplates {
     $Templates = Get-CIPPAzDataTableEntity @Table -Filter $Filter
 
     if ($Request.Query.RawJson) {
+        foreach ($Template in $Templates) {
+            $Template.JSON = $Template.JSON -replace '"parameters":', '"Parameters":'
+        }
         $Templates = $Templates.JSON | ConvertFrom-Json
     } else {
         $Templates = $Templates | ForEach-Object {
-            $Template = $_.JSON | ConvertFrom-Json
+            $TemplateJson = $_.JSON -replace '"parameters":', '"Parameters":'
+            $Template = $TemplateJson | ConvertFrom-Json
             @{
                 GUID  = $_.GUID
                 Data  = $Template.fields

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Tools/Invoke-AddBPATemplate.ps1

@@ -18,7 +18,7 @@ Function Invoke-AddBPATemplate {
         $Table = Get-CippTable -tablename 'templates'
         $Table.Force = $true
         Add-CIPPAzDataTableEntity @Table -Entity @{
-            JSON         = "$($Request.body | ConvertTo-Json -Depth 10)"
+            JSON         = "$($Request.body | ConvertTo-Json -Depth 10 -Compress)"
             RowKey       = $Request.body.name
             PartitionKey = 'BPATemplate'
             GUID         = $Request.body.name

Modules/CIPPCore/Public/Get-CIPPLAPSPassword.ps1

@@ -12,7 +12,11 @@ function Get-CIPPLapsPassword {
         $GraphRequest = (New-GraphGetRequest -noauthcheck $true -uri "https://graph.microsoft.com/beta/directory/deviceLocalCredentials/$($device)?`$select=credentials" -tenantid $TenantFilter).credentials | Select-Object -First 1 | ForEach-Object {
             $PlainText = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($_.passwordBase64))
             $date = $_.BackupDateTime
-            "The password for $($_.AccountName) is $($PlainText) generated at $($date)"
+            [PSCustomObject]@{
+                resultText = "LAPS password retrieved, generated at $($date). Copy the password by clicking the copy button"
+                copyField  = $PlainText
+                state      = 'success'
+            }
         }
         if ($GraphRequest) { return $GraphRequest } else { return "No LAPS password found for $device" }
     } catch {

Modules/CIPPCore/Public/Standards/Get-CIPPStandards.ps1

@@ -17,16 +17,16 @@ function Get-CIPPStandards {
     $Table = Get-CippTable -tablename 'templates'
     $Filter = "PartitionKey eq 'StandardsTemplateV2'"
     $Templates = (Get-CIPPAzDataTableEntity @Table -Filter $Filter | Sort-Object TimeStamp).JSON |
-    ForEach-Object {
-        try {
-            # Fix old "Action" => "action"
-            $JSON = $_ -replace '"Action":', '"action":'
-            ConvertFrom-Json -InputObject $JSON -ErrorAction SilentlyContinue
-        } catch {}
-    } |
-    Where-Object {
-        $_.GUID -like $TemplateId -and $_.runManually -eq $runManually
-    }
+        ForEach-Object {
+            try {
+                # Fix old "Action" => "action"
+                $JSON = $_ -replace '"Action":', '"action":' -replace '"permissionlevel":', '"permissionLevel":'
+                ConvertFrom-Json -InputObject $JSON -ErrorAction SilentlyContinue
+            } catch {}
+        } |
+        Where-Object {
+            $_.GUID -like $TemplateId -and $_.runManually -eq $runManually
+        }
 
     # 2. Get tenant list, filter if needed
     $AllTenantsList = Get-Tenants