Merge pull request KelvinTegelaar#1917 from benzzc/standard-comparison-fix

Fix: incorrect expected value type in Defender standards

Author: KelvinTegelaar

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

@@ -201,7 +201,23 @@ function Invoke-CIPPStandardMalwareFilterPolicy {
     }
 
     if ($Settings.report -eq $true) {
-        $CurrentValue = $CurrentState | Select-Object Name, EnableFileFilter, FileTypeAction, FileTypes, ZapEnabled, QuarantineTag, EnableInternalSenderAdminNotifications, InternalSenderAdminAddress, EnableExternalSenderAdminNotifications, ExternalSenderAdminAddress
+	$CurrentValue = @{
+	    Name = $CurrentState.Name
+	    EnableFileFilter = $CurrentState.EnableFileFilter
+	    FileTypeAction = $CurrentState.FileTypeAction
+	    FileTypes = $CurrentState.FileTypes
+	    ZapEnabled = $CurrentState.ZapEnabled
+	    QuarantineTag = $CurrentState.QuarantineTag
+	    EnableInternalSenderAdminNotifications = $CurrentState.EnableInternalSenderAdminNotifications
+	    EnableExternalSenderAdminNotifications = $CurrentState.EnableExternalSenderAdminNotifications
+	}
+
+	if ($CurrentState.EnableInternalSenderAdminNotifications) {
+		$CurrentValue['InternalSenderAdminAddress'] = $CurrentState.InternalSenderAdminAddress
+	}
+	if ($CurrentState.EnableExternalSenderAdminNotifications) {
+		$CurrentValue['ExternalSenderAdminAddress'] = $CurrentState.ExternalSenderAdminAddress
+	}
 
         $ExpectedValue = @{
             Name                                   = $PolicyName
@@ -211,10 +227,16 @@ function Invoke-CIPPStandardMalwareFilterPolicy {
             ZapEnabled                             = $true
             QuarantineTag                          = $Settings.QuarantineTag
             EnableInternalSenderAdminNotifications = $Settings.EnableInternalSenderAdminNotifications
-            InternalSenderAdminAddress             = $Settings.InternalSenderAdminAddress
             EnableExternalSenderAdminNotifications = $Settings.EnableExternalSenderAdminNotifications
-            ExternalSenderAdminAddress             = $Settings.ExternalSenderAdminAddress
         }
+
+	if ($Settings.EnableInternalSenderAdminNotifications) {
+		$ExpectedValue['InternalSenderAdminAddress'] = $Settings.InternalSenderAdminAddress
+	}
+	if ($Settings.EnableExternalSenderAdminNotifications) {
+		$ExpectedValue['ExternalSenderAdminAddress'] = $Settings.ExternalSenderAdminAddress
+	}
+
         Set-CIPPStandardsCompareField -FieldName 'standards.MalwareFilterPolicy' -CurrentValue $CurrentValue -ExpectedValue $ExpectedValue -TenantFilter $Tenant
         Add-CIPPBPAField -FieldName 'MalwareFilterPolicy' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $tenant
     }

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

@@ -195,7 +195,7 @@ function Invoke-CIPPStandardSafeAttachmentPolicy {
                 redirectAddress = $CurrentState.RedirectAddress
             }
 
-            $ExpectedValue = [pscustomobject]@{
+            $ExpectedValue = @{
                 name            = $PolicyName
                 enable          = $true
                 action          = $Settings.SafeAttachmentAction

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

@@ -281,7 +281,7 @@ function Invoke-CIPPStandardSpamFilterPolicy {
             RegionBlockList                  = $CurrentState.RegionBlockList
             AllowedSenderDomains             = $CurrentState.AllowedSenderDomains
         }
-        $ExpectedValue = [pscustomobject]@{
+        $ExpectedValue = @{
             Name                             = $PolicyName
             SpamAction                       = $SpamAction
             SpamQuarantineTag                = $SpamQuarantineTag