Merge pull request #183 from KelvinTegelaar/dev

pull[bot] · web-flow · commit 58d840885721 · 2025-03-29T00:41:12.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneComplianceSettings.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneComplianceSettings.ps1
@@ -31,7 +31,7 @@ function Invoke-CIPPStandardIntuneComplianceSettings {
 
     param($Tenant, $Settings)
 
-    $CurrentState = New-GraphGetRequest -Uri 'https://graph.microsoft.com/beta/deviceManagement/settings' -tenantid $Tenant
+    $CurrentState = New-GraphGetRequest -Uri 'https://graph.microsoft.com/beta/deviceManagement/settings' -tenantid $Tenant | Select-Object secureByDefault, deviceComplianceCheckinThresholdDays
 
     if ($null -eq $Settings.deviceComplianceCheckinThresholdDays) { $Settings.deviceComplianceCheckinThresholdDays = $CurrentState.deviceComplianceCheckinThresholdDays }
     $SecureByDefault = [bool]($Settings.secureByDefault.value ? $Settings.secureByDefault.value : $Settings.secureByDefault)
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPEmailAttestation.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPEmailAttestation.ps1
@@ -35,21 +35,26 @@ function Invoke-CIPPStandardSPEmailAttestation {
 
     $CurrentState = Get-CIPPSPOTenant -TenantFilter $Tenant | Select-Object -Property EmailAttestationReAuthDays, EmailAttestationRequired
 
-    $StateIsCorrect = ($CurrentState.EmailAttestationReAuthDays -eq $Settings.Days) -and
+    $StateIsCorrect = ($CurrentState.EmailAttestationReAuthDays -eq [int]$Settings.Days) -and
     ($CurrentState.EmailAttestationRequired -eq $true)
 
     if ($Settings.remediate -eq $true) {
         if ($StateIsCorrect -eq $true) {
             Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'SharePoint reauthentication with verification code is already restricted.' -Sev Info
         } else {
             $Properties = @{
-                EmailAttestationReAuthDays = $Settings.Days
+                EmailAttestationReAuthDays = [int]$Settings.Days
                 EmailAttestationRequired   = $true
             }
 
             try {
-                Get-CIPPSPOTenant -TenantFilter $Tenant | Set-CIPPSPOTenant -Properties $Properties
-                Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'Successfully set reauthentication with verification code restriction.' -Sev Info
+                $Response = Get-CIPPSPOTenant -TenantFilter $Tenant | Set-CIPPSPOTenant -Properties $Properties
+                if ($Response.ErrorInfo.ErrorMessage) {
+                    $ErrorMessage = Get-NormalizedError -Message $Response.ErrorInfo.ErrorMessage
+                    Write-LogMessage -API 'Standards' -Tenant $Tenant -Message "Failed to set reauthentication with verification code restriction. Error: $ErrorMessage" -Sev Error
+                } else {
+                    Write-LogMessage -API 'Standards' -Tenant $Tenant -Message 'Successfully set reauthentication with verification code restriction.' -Sev Info
+                }
             } catch {
                 $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
                 Write-LogMessage -API 'Standards' -Tenant $Tenant -Message "Failed to set reauthentication with verification code restriction. Error: $ErrorMessage" -Sev Error
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpamFilterPolicy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpamFilterPolicy.ps1
@@ -73,7 +73,7 @@ function Invoke-CIPPStandardSpamFilterPolicy {
     ($CurrentState.PhishQuarantineTag -eq $PhishQuarantineTag) -and
     ($CurrentState.HighConfidencePhishAction -eq 'Quarantine') -and
     ($CurrentState.HighConfidencePhishQuarantineTag -eq $HighConfidencePhishQuarantineTag) -and
-    ($CurrentState.BulkThreshold -eq $Settings.BulkThreshold) -and
+    ($CurrentState.BulkThreshold -eq [int]$Settings.BulkThreshold) -and
     ($CurrentState.QuarantineRetentionPeriod -eq 30) -and
     ($CurrentState.IncreaseScoreWithImageLinks -eq $IncreaseScoreWithImageLinks) -and
     ($CurrentState.IncreaseScoreWithNumericIps -eq 'On') -and
@@ -126,7 +126,7 @@ function Invoke-CIPPStandardSpamFilterPolicy {
                 PhishQuarantineTag                   = $PhishQuarantineTag
                 HighConfidencePhishAction            = 'Quarantine'
                 HighConfidencePhishQuarantineTag     = $HighConfidencePhishQuarantineTag
-                BulkThreshold                        = $Settings.BulkThreshold
+                BulkThreshold                        = [int]$Settings.BulkThreshold
                 QuarantineRetentionPeriod            = 30
                 IncreaseScoreWithImageLinks          = $IncreaseScoreWithImageLinks
                 IncreaseScoreWithNumericIps          = 'On'
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsEmailIntegration.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsEmailIntegration.ps1
@@ -66,7 +66,7 @@ Function Invoke-CIPPStandardTeamsEmailIntegration {
         }
     }
 
-    if ($Setings.report -eq $true) {
+    if ($Settings.report -eq $true) {
 
         if ($StateIsCorrect) {
             $FieldValue = $true
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsExternalAccessPolicy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsExternalAccessPolicy.ps1
@@ -73,7 +73,7 @@ function Invoke-CIPPStandardTeamsExternalAccessPolicy {
         }
     }
 
-    if ($Setings.report -eq $true) {
+    if ($Settings.report -eq $true) {
         Add-CIPPBPAField -FieldName 'TeamsExternalAccessPolicy' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $Tenant
 
         if ($StateIsCorrect) {
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsExternalFileSharing.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsExternalFileSharing.ps1
@@ -81,7 +81,7 @@ function Invoke-CIPPStandardTeamsExternalFileSharing {
         }
     }
 
-    if ($Setings.report -eq $true) {
+    if ($Settings.report -eq $true) {
         Add-CIPPBPAField -FieldName 'TeamsExternalFileSharing' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $Tenant
 
         if ($StateIsCorrect) {
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsFederationConfiguration.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsFederationConfiguration.ps1
@@ -129,9 +129,9 @@ function Invoke-CIPPStandardTeamsFederationConfiguration {
         }
     }
 
-    if ($Setings.report -eq $true) {
+    if ($Settings.report -eq $true) {
         Add-CIPPBPAField -FieldName 'FederationConfiguration' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $Tenant
-        if ($StateIsCorrect) {
+        if ($StateIsCorrect -eq $true) {
             $FieldValue = $true
         } else {
             $FieldValue = $CurrentState
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserPreferredLanguage.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserPreferredLanguage.ps1
@@ -62,7 +62,7 @@ function Invoke-CIPPStandardUserPreferredLanguage {
             Write-StandardsAlert -message "The following accounts do not have the preferred language set to $preferredLanguage" -object $IncorrectUsers -tenant $Tenant -standardName 'UserPreferredLanguage' -standardId $Settings.standardId
             Write-LogMessage -API 'Standards' -tenant $Tenant -message "The following accounts do not have the preferred language set to $preferredLanguage : $($IncorrectUsers.userPrincipalName -join ', ')" -sev Info
         } else {
-            Write-LogMessage -API 'Standards' -tenant $Tenant -message 'No accounts do not have the preferred language set to the preferred language' -sev Info
+            Write-LogMessage -API 'Standards' -tenant $Tenant -message 'All accounts have the preferred language set.' -sev Info
         }
     }
 
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardsharingDomainRestriction.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardsharingDomainRestriction.ps1
@@ -41,10 +41,15 @@ function Invoke-CIPPStandardsharingDomainRestriction {
         $StateIsCorrect = $CurrentState.sharingDomainRestrictionMode -eq 'none'
     } else {
         $SelectedDomains = [String[]]$Settings.Domains.Split(',').Trim() ?? @()
-        $StateIsCorrect = ($CurrentState.sharingDomainRestrictionMode -eq $mode) -and
-        ($mode -eq 'allowList' -and (!(Compare-Object -ReferenceObject $CurrentState.sharingAllowedDomainList -DifferenceObject $SelectedDomains))) -or
-        ($mode -eq 'blockList' -and (!(Compare-Object -ReferenceObject $CurrentState.sharingBlockedDomainList -DifferenceObject $SelectedDomains)))
+        $CurrentAllowedDomains = $CurrentState.sharingAllowedDomainList ?? @()
+        $CurrentBlockedDomains = $CurrentState.sharingBlockedDomainList ?? @()
+
+        $StateIsCorrect = ($CurrentState.sharingDomainRestrictionMode -eq $mode) -and (
+            ($mode -eq 'allowList' -and ([string[]]($CurrentAllowedDomains | Sort-Object) -join ',') -eq ([string[]]($SelectedDomains | Sort-Object) -join ',')) -or
+            ($mode -eq 'blockList' -and ([string[]]($CurrentBlockedDomains | Sort-Object) -join ',') -eq ([string[]]($SelectedDomains | Sort-Object) -join ','))
+        )
     }
+    Write-Host "StateIsCorrect: $StateIsCorrect"
 
     if ($Settings.remediate -eq $true) {
         if ($StateIsCorrect -eq $true) {
@@ -61,14 +66,15 @@ function Invoke-CIPPStandardsharingDomainRestriction {
             }
 
             $cmdParams = @{
-                tenantid    = $tenant
-                uri         = 'https://graph.microsoft.com/beta/admin/sharepoint/settings'
-                AsApp       = $true
-                Type        = 'PATCH'
-                Body        = ($Body | ConvertTo-Json)
-                ContentType = 'application/json'
+                tenantid = $tenant
+                uri      = 'https://graph.microsoft.com/beta/admin/sharepoint/settings'
+                AsApp    = $true
+                Type     = 'PATCH'
+                body     = ($Body | ConvertTo-Json)
             }
 
+            Write-Host ($cmdParams | ConvertTo-Json -Depth 5)
+
             try {
                 $null = New-GraphPostRequest @cmdParams
                 Write-LogMessage -API 'Standards' -tenant $tenant -message 'Successfully updated Sharing Domain Restriction settings' -sev Info
diff --git a/Modules/CIPPCore/Public/Webhooks/Test-CIPPAuditLogRules.ps1 b/Modules/CIPPCore/Public/Webhooks/Test-CIPPAuditLogRules.ps1
@@ -195,7 +195,7 @@ function Test-CIPPAuditLogRules {
             $CIPPClause = [System.Collections.Generic.List[string]]::new()
             $AddedLocationCondition = $false
             foreach ($condition in $conditions) {
-                if ($condition.Property.value -eq 'CIPPGeoLocation' -and !$AddedLocationCondition) {
+                if ($condition.Property.label -eq 'CIPPGeoLocation' -and !$AddedLocationCondition) {
                     $conditionsString.Add("`$_.HasLocationData -eq `$true")
                     $CIPPClause.Add('HasLocationData is true')
                     $AddedLocationCondition = $true
diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-7.4.1
+7.4.2

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ Function Invoke-CIPPStandardTeamsEmailIntegration {`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`- if ($Setings.report -eq $true) {`
	`69`	`+ if ($Settings.report -eq $true) {`
`70`	`70`
`71`	`71`	`if ($StateIsCorrect) {`
`72`	`72`	`$FieldValue = $true`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ function Invoke-CIPPStandardTeamsExternalAccessPolicy {`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`		`- if ($Setings.report -eq $true) {`
	`76`	`+ if ($Settings.report -eq $true) {`
`77`	`77`	`Add-CIPPBPAField -FieldName 'TeamsExternalAccessPolicy' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $Tenant`
`78`	`78`
`79`	`79`	`if ($StateIsCorrect) {`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ function Invoke-CIPPStandardTeamsExternalFileSharing {`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
`84`		`- if ($Setings.report -eq $true) {`
	`84`	`+ if ($Settings.report -eq $true) {`
`85`	`85`	`Add-CIPPBPAField -FieldName 'TeamsExternalFileSharing' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $Tenant`
`86`	`86`
`87`	`87`	`if ($StateIsCorrect) {`
Original file line number	Diff line number	Diff line change
`@@ -129,9 +129,9 @@ function Invoke-CIPPStandardTeamsFederationConfiguration {`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`
`132`		`- if ($Setings.report -eq $true) {`
	`132`	`+ if ($Settings.report -eq $true) {`
`133`	`133`	`Add-CIPPBPAField -FieldName 'FederationConfiguration' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $Tenant`
`134`		`- if ($StateIsCorrect) {`
	`134`	`+ if ($StateIsCorrect -eq $true) {`
`135`	`135`	`$FieldValue = $true`
`136`	`136`	`} else {`
`137`	`137`	`$FieldValue = $CurrentState`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ function Invoke-CIPPStandardUserPreferredLanguage {`
`62`	`62`	`Write-StandardsAlert -message "The following accounts do not have the preferred language set to $preferredLanguage" -object $IncorrectUsers -tenant $Tenant -standardName 'UserPreferredLanguage' -standardId $Settings.standardId`
`63`	`63`	`Write-LogMessage -API 'Standards' -tenant $Tenant -message "The following accounts do not have the preferred language set to $preferredLanguage : $($IncorrectUsers.userPrincipalName -join ', ')" -sev Info`
`64`	`64`	`} else {`
`65`		`- Write-LogMessage -API 'Standards' -tenant $Tenant -message 'No accounts do not have the preferred language set to the preferred language' -sev Info`
	`65`	`+ Write-LogMessage -API 'Standards' -tenant $Tenant -message 'All accounts have the preferred language set.' -sev Info`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`