fix compares

Author: KelvinTegelaar

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

@@ -103,8 +103,19 @@ function Invoke-CIPPStandardDeployMailContact {
     # Report
     if ($Settings.report -eq $true) {
         $ReportData = $ContactData.Clone()
+        $ContactData = @{
+            DisplayName          = $Settings.DisplayName
+            ExternalEmailAddress = $Settings.ExternalEmailAddress
+            FirstName            = $Settings.FirstName
+            LastName             = $Settings.LastName
+        }
         $CurrentValue = $ExistingContact | Select-Object DisplayName, ExternalEmailAddress, FirstName, LastName
-        $ReportData.Exists = [bool]$ExistingContact
+        $currentValue = @{
+            DisplayName          = $ExistingContact.displayName
+            ExternalEmailAddress = ($ExistingContact.ExternalEmailAddress -replace 'SMTP:', '')
+            FirstName            = $ExistingContact.firstName
+            LastName             = $ExistingContact.lastName
+        }
         Add-CIPPBPAField -FieldName 'DeployMailContact' -FieldValue $ReportData -StoreAs json -Tenant $Tenant
         Set-CIPPStandardsCompareField -FieldName 'standards.DeployMailContact' -CurrentValue $CurrentValue -ExpectedValue $ReportData -Tenant $Tenant
     }

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

@@ -104,7 +104,7 @@ function Invoke-CIPPStandardOauthConsent {
             permissionGrantPolicyIdsAssignedToDefaultUserRole = $State.permissionGrantPolicyIdsAssignedToDefaultUserRole
         }
         $ExpectedValue = @{
-            permissionGrantPolicyIdsAssignedToDefaultUserRole = @('managePermissionGrantsForSelf.cipp-consent-policy')
+            permissionGrantPolicyIdsAssignedToDefaultUserRole = @('ManagePermissionGrantsForSelf.cipp-consent-policy')
         }
         Set-CIPPStandardsCompareField -FieldName 'standards.OauthConsent' -CurrentValue $CurrentValue -ExpectedValue $ExpectedValue -Tenant $tenant
     }

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

@@ -76,8 +76,8 @@ function Invoke-CIPPStandardSafeAttachmentPolicy {
 
         try {
             $CurrentState = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-SafeAttachmentPolicy' |
-                Where-Object -Property Name -EQ $PolicyName |
-                Select-Object Name, Enable, Action, QuarantineTag, Redirect, RedirectAddress
+            Where-Object -Property Name -EQ $PolicyName |
+            Select-Object Name, Enable, Action, QuarantineTag, Redirect, RedirectAddress
         } catch {
             $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
             Write-LogMessage -API 'Standards' -Tenant $Tenant -Message "Could not get the SafeAttachmentPolicy state for $Tenant. Error: $ErrorMessage" -Sev Error
@@ -94,8 +94,8 @@ function Invoke-CIPPStandardSafeAttachmentPolicy {
         $AcceptedDomains = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-AcceptedDomain'
 
         $RuleState = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-SafeAttachmentRule' |
-            Where-Object -Property Name -EQ $RuleName |
-            Select-Object Name, SafeAttachmentPolicy, Priority, RecipientDomainIs
+        Where-Object -Property Name -EQ $RuleName |
+        Select-Object Name, SafeAttachmentPolicy, Priority, RecipientDomainIs
 
         $RuleStateIsCorrect = ($RuleState.Name -eq $RuleName) -and
         ($RuleState.SafeAttachmentPolicy -eq $PolicyName) -and
@@ -186,13 +186,13 @@ function Invoke-CIPPStandardSafeAttachmentPolicy {
                 redirectAddress = $CurrentState.RedirectAddress
             }
 
-            $ExpectedValue = @{
+            $ExpectedValue = [pscustomobject]@{
                 name            = $PolicyName
                 enable          = $true
                 action          = $Settings.SafeAttachmentAction
                 quarantineTag   = $Settings.QuarantineTag
                 redirect        = $Settings.Redirect
-                redirectAddress = $Settings.RedirectAddress
+                redirectAddress = "$($Settings.RedirectAddress)"
             }
             Set-CIPPStandardsCompareField -FieldName 'standards.SafeAttachmentPolicy' -CurrentValue $CurrentValue -ExpectedValue $ExpectedValue -Tenant $Tenant
         }

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

@@ -284,7 +284,7 @@ function Invoke-CIPPStandardSpamFilterPolicy {
             RegionBlockList                  = $CurrentState.RegionBlockList
             AllowedSenderDomains             = $CurrentState.AllowedSenderDomains
         }
-        $ExpectedValue = @{
+        $ExpectedValue = [pscustomobject]@{
             Name                             = $PolicyName
             SpamAction                       = $SpamAction
             SpamQuarantineTag                = $SpamQuarantineTag
@@ -308,7 +308,7 @@ function Invoke-CIPPStandardSpamFilterPolicy {
             LanguageBlockList                = $Settings.EnableLanguageBlockList ? @($Settings.EnableLanguageBlockList) : @()
             EnableRegionBlockList            = $Settings.EnableRegionBlockList
             RegionBlockList                  = $Settings.RegionBlockList.value ? @($Settings.RegionBlockList.value) : @()
-            AllowedSenderDomains             = $Settings.AllowedSenderDomains.value ?? @()
+            AllowedSenderDomains             = $Settings.AllowedSenderDomains.value ? @($Settings.AllowedSenderDomains.value) : @()
         }
         Set-CIPPStandardsCompareField -FieldName 'standards.SpamFilterPolicy' -CurrentValue $CurrentValue -ExpectedValue $ExpectedValue -Tenant $Tenant
     }