Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev

Author: JohnDuprey

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

@@ -10,62 +10,25 @@ Function Invoke-ListStandardsCompare {
     [CmdletBinding()]
     param($Request, $TriggerMetadata)
 
-    # Create mock data for testing with the correct API structure
-    # Only tenant data with values, no compliance information or standard values
-    $Results = @(
-        @{
-            tenantFilter     = 'TenantOne'
-            standardsResults = @(
-                @{
-                    standardId   = 'standards.MailContacts'
-                    standardName = 'Mail Contacts'
-                    value        = @{
-                        GeneralContact   = '[email protected]'
-                        SecurityContact  = '[email protected]'
-                        MarketingContact = '[email protected]'
-                        TechContact      = '[email protected]'
-                    }
-                },
-                @{
-                    standardId   = 'standards.AuditLog'
-                    standardName = 'Audit Log'
-                    value        = $true
-                },
-                @{
-                    standardId   = 'standards.ProfilePhotos'
-                    standardName = 'Profile Photos'
-                    value        = @{
-                        state = @{
-                            label = 'Enabled'
-                            value = 'enabled'
-                        }
-                    }
-                }
-            )
-        },
-        @{
-            tenantFilter     = 'dev.johnwduprey.com'
-            standardsResults = @(
-                @{
-                    standardId   = 'standards.MailContacts'
-                    standardName = 'Mail Contacts'
-                    value        = @{
-                        GeneralContact  = '[email protected]'
-                        SecurityContact = '[email protected]'
-                    }
-                },
-                @{
-                    standardId   = 'standards.AuditLog'
-                    standardName = 'Audit Log'
-                    value        = $false
+    $Table = Get-CIPPTable -TableName 'CippStandardsReports'
+    $Results = Get-CIPPAzDataTableEntity @Table
+
+    #in the results we have objects starting with "standards." All these have to be converted from JSON. Do not do this is its a boolean
+    $Results | ForEach-Object {
+        $Object = $_
+        $Object.PSObject.Properties | ForEach-Object {
+            if ($_.Name -like 'standards.*') {
+                if ($_.Value -isnot [System.Boolean]) {
+                    $_.Value = ConvertFrom-Json -InputObject $_.Value -ErrorAction SilentlyContinue
                 }
-            )
+            }
         }
-    )
-    
+    }
+
+
     Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK
-            Body       = (ConvertTo-Json -Depth 15 -InputObject $Results)
+            Body       = @($Results)
         })
 
 }

Modules/CIPPCore/Public/Set-StandardCompareField.ps1

@@ -6,13 +6,20 @@ function Set-CIPPStandardsCompareField {
     )
     $Table = Get-CippTable -tablename 'CippStandardsReports'
     $TenantName = Get-Tenants | Where-Object -Property defaultDomainName -EQ $Tenant
-    $FieldValue = ConvertTo-Json -Compress -InputObject $FieldValue | Out-String
+    if ($FieldValue -is [System.Boolean]) {
+        $fieldValue = [bool]$FieldValue
+    } elseif ($FieldValue -is [string]) {
+        $FieldValue = [string]$FieldValue
+    } else {
+        $FieldValue = ConvertTo-Json -Compress -InputObject @($FieldValue) -Depth 10 | Out-String
+        $FieldValue = [string]$FieldValue
+    }
 
     $Existing = Get-CIPPAzDataTableEntity @Table -Filter "PartitionKey eq 'StandardReport' and RowKey eq '$($TenantName.defaultDomainName)'"
     if ($Existing) {
-        $Existing = $Existing | Select-Object * -ExcludeProperty ETag, TimeStamp | ConvertTo-Json -Compress | ConvertFrom-Json -AsHashtable
-        $Existing[$FieldName] = "$FieldValue"
-        $Existing['LastRefresh'] = [string]$(Get-Date (Get-Date).ToUniversalTime() -UFormat '+%Y-%m-%dT%H:%M:%S.000Z')  
+        $Existing = $Existing | Select-Object * -ExcludeProperty ETag, TimeStamp | ConvertTo-Json -Depth 10 -Compress | ConvertFrom-Json -AsHashtable
+        $Existing[$FieldName] = $FieldValue
+        $Existing['LastRefresh'] = [string]$(Get-Date (Get-Date).ToUniversalTime() -UFormat '+%Y-%m-%dT%H:%M:%S.000Z')
         $Existing = [PSCustomObject]$Existing
 
         Add-CIPPAzDataTableEntity @Table -Entity $Existing -Force
@@ -23,8 +30,8 @@ function Set-CIPPStandardsCompareField {
             RowKey       = "$($TenantName.defaultDomainName)"
             PartitionKey = 'StandardReport'
             LastRefresh  = [string]$(Get-Date (Get-Date).ToUniversalTime() -UFormat '+%Y-%m-%dT%H:%M:%S.000Z')
-        } 
-        $Result[$FieldName] = "$FieldValue"
+        }
+        $Result[$FieldName] = $FieldValue
         Add-CIPPAzDataTableEntity @Table -Entity $Result -Force
 
     }

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableMailTips.ps1

@@ -58,13 +58,12 @@ function Invoke-CIPPStandardEnableMailTips {
         if ($StateIsCorrect -eq $true) {
             Write-LogMessage -API 'Standards' -tenant $Tenant -message 'All MailTips are enabled' -sev Info
         } else {
-            Write-StandardsAlert -message "Not all MailTips are enabled" -object $MailTipsState -tenant $Tenant -standardName 'EnableMailTips' -standardId $Settings.standardId
+            Write-StandardsAlert -message 'Not all MailTips are enabled' -object $MailTipsState -tenant $Tenant -standardName 'EnableMailTips' -standardId $Settings.standardId
             Write-LogMessage -API 'Standards' -tenant $Tenant -message 'Not all MailTips are enabled' -sev Info
         }
     }
 
     if ($Settings.report -eq $true) {
-
         Add-CIPPBPAField -FieldName 'MailTipsEnabled' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $tenant
     }
 

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnablePronouns.ps1

@@ -63,13 +63,13 @@ function Invoke-CIPPStandardEnablePronouns {
         if ($CurrentState.isEnabledInOrganization -eq $true) {
             Write-LogMessage -API 'Standards' -tenant $tenant -message 'Pronouns are enabled.' -sev Info
         } else {
-            Write-StandardsAlert -message "Pronouns are not enabled" -object $CurrentState -tenant $tenant -standardName 'EnablePronouns' -standardId $Settings.standardId
+            Write-StandardsAlert -message 'Pronouns are not enabled' -object $CurrentState -tenant $tenant -standardName 'EnablePronouns' -standardId $Settings.standardId
             Write-LogMessage -API 'Standards' -tenant $tenant -message 'Pronouns are not enabled.' -sev Info
         }
     }
 
     if ($Settings.report -eq $true) {
-
+        Set-CIPPStandardsCompareField -FieldName 'standards.EnablePronouns' -FieldValue $CurrentState.isEnabledInOrganization -Tenant $tenant
         Add-CIPPBPAField -FieldName 'PronounsEnabled' -FieldValue $CurrentState.isEnabledInOrganization -StoreAs bool -Tenant $tenant
     }
 }