[pull] master from KelvinTegelaar:master

Modules/CIPPActivityTriggers/Public/Entrypoints/Activity Triggers/Domain Analyser/Push-DomainAnalyserDomain.ps1

@@ -62,6 +62,7 @@ function Push-DomainAnalyserDomain {
         MSCNAMEDKIMSelectors   = ''
         EnterpriseEnrollment   = ''
         EnterpriseRegistration = ''
+        AutoDiscover           = ''
         Score                  = ''
         MaximumScore           = 160
         ScorePercentage        = ''
@@ -293,6 +294,26 @@ function Push-DomainAnalyserDomain {
     }
     #EndRegion Intune Enrollment CNAME Check
 
+    #Region AutoDiscover Check
+    try {
+        $AutoDiscoverRecord = Read-AutoDiscoverRecord -Domain $Domain
+        $AutoDiscoverFailCount = $AutoDiscoverRecord.ValidationFails | Measure-Object | Select-Object -ExpandProperty Count
+        $AutoDiscoverWarnCount = $AutoDiscoverRecord.ValidationWarns | Measure-Object | Select-Object -ExpandProperty Count
+        if ($AutoDiscoverFailCount -eq 0 -and $AutoDiscoverWarnCount -eq 0) {
+            $Result.AutoDiscover = 'Correct'
+        } elseif ($AutoDiscoverFailCount -eq 0) {
+            $Result.AutoDiscover = "$($AutoDiscoverRecord.RecordType): $($AutoDiscoverRecord.Record)"
+            $ScoreExplanation.Add("AutoDiscover $($AutoDiscoverRecord.RecordType) record points to unexpected target") | Out-Null
+        } else {
+            $Result.AutoDiscover = 'No Record'
+            $ScoreExplanation.Add('No AutoDiscover DNS record found') | Out-Null
+        }
+    } catch {
+        $Result.AutoDiscover = 'Error'
+        Write-LogMessage -API 'DomainAnalyser' -tenant $DomainObject.TenantId -message "AutoDiscover check error for $Domain" -LogData (Get-CippException -Exception $_) -sev Error
+    }
+    #EndRegion AutoDiscover Check
+
     #Region MSCNAME DKIM Records
     # Get Microsoft DKIM CNAME selector Records
     # Ugly, but i needed to create a scope/loop i could break out of without breaking the rest of the function

Modules/CIPPActivityTriggers/Public/Entrypoints/Activity Triggers/Graph Requests/Push-ListGraphRequestQueue.ps1

@@ -63,6 +63,15 @@ function Push-ListGraphRequestQueue {
             Data         = [string]$Json
         }
         Add-CIPPAzDataTableEntity @Table -Entity $GraphResults -Force | Out-Null
+
+        if ($env:CIPPNG -eq 'true') {
+            try {
+                [Craft.Services.CacheBridge]::InvalidateByScope('AllTenants')
+            } catch {
+                Write-Information "CacheBridge invalidation skipped: $($_.Exception.Message)"
+            }
+        }
+
         return $true
     } catch {
         Write-Warning "Queue Error: $($_.Exception.Message)"

Modules/CIPPAlerts/Public/Alerts/Get-CIPPAlertIntunePolicyConflicts.ps1

@@ -48,9 +48,10 @@ function Get-CIPPAlertIntunePolicyConflicts {
         return
     }
 
-    $AlertableStatuses = @()
-    if ($Config.AlertErrors) { $AlertableStatuses += 'error', 'failed' }
-    if ($Config.AlertConflicts) { $AlertableStatuses += 'conflict' }
+    $AlertableStatuses = @(
+        if ($Config.AlertErrors) { 'error'; 'failed' }
+        if ($Config.AlertConflicts) { 'conflict' }
+    )
 
     if (-not $AlertableStatuses) {
         return
@@ -68,7 +69,7 @@ function Get-CIPPAlertIntunePolicyConflicts {
         return
     }
 
-    $Issues = @()
+    $Issues = [System.Collections.Generic.List[object]]::new()
 
     if ($Config.IncludePolicies) {
         try {
@@ -77,16 +78,16 @@ function Get-CIPPAlertIntunePolicyConflicts {
             foreach ($Device in $ManagedDevices) {
                 $PolicyStates = $Device.deviceConfigurationStates | Where-Object { $_.state -and ($AlertableStatuses -contains $_.state) }
                 foreach ($State in $PolicyStates) {
-                    $Issues += [PSCustomObject]@{
-                        Message           = "Policy '$($State.displayName)' is $($State.state) on device '$($Device.deviceName)' for $($Device.userPrincipalName)."
-                        Tenant            = $TenantFilter
-                        Type              = 'Policy'
-                        PolicyName        = $State.displayName
-                        IssueStatus       = $State.state
-                        DeviceName        = $Device.deviceName
-                        UserPrincipalName = $Device.userPrincipalName
-                        DeviceId          = $Device.id
-                    }
+                    $Issues.Add([PSCustomObject]@{
+                            Message           = "Policy '$($State.displayName)' is $($State.state) on device '$($Device.deviceName)' for $($Device.userPrincipalName)."
+                            Tenant            = $TenantFilter
+                            Type              = 'Policy'
+                            PolicyName        = $State.displayName
+                            IssueStatus       = $State.state
+                            DeviceName        = $Device.deviceName
+                            UserPrincipalName = $Device.userPrincipalName
+                            DeviceId          = $Device.id
+                        })
                 }
             }
         } catch {
@@ -105,16 +106,16 @@ function Get-CIPPAlertIntunePolicyConflicts {
                 }
 
                 foreach ($Status in $BadStatuses) {
-                    $Issues += [PSCustomObject]@{
-                        Message           = "App '$($App.displayName)' install is $($Status.installState) on device '$($Status.deviceName)' for $($Status.userPrincipalName)."
-                        Tenant            = $TenantFilter
-                        Type              = 'Application'
-                        AppName           = $App.displayName
-                        IssueStatus       = $Status.installState
-                        DeviceName        = $Status.deviceName
-                        UserPrincipalName = $Status.userPrincipalName
-                        DeviceId          = $Status.deviceId
-                    }
+                    $Issues.Add([PSCustomObject]@{
+                            Message           = "App '$($App.displayName)' install is $($Status.installState) on device '$($Status.deviceName)' for $($Status.userPrincipalName)."
+                            Tenant            = $TenantFilter
+                            Type              = 'Application'
+                            AppName           = $App.displayName
+                            IssueStatus       = $Status.installState
+                            DeviceName        = $Status.deviceName
+                            UserPrincipalName = $Status.userPrincipalName
+                            DeviceId          = $Status.deviceId
+                        })
                 }
             }
         } catch {
@@ -132,11 +133,11 @@ function Get-CIPPAlertIntunePolicyConflicts {
         $AppCount = ($Issues | Where-Object { $_.Type -eq 'Application' }).Count
 
         $AlertData = @([PSCustomObject]@{
-                Message        = "Found $PolicyCount policy issues and $AppCount application issues in Intune."
-                Tenant         = $TenantFilter
-                PolicyIssues   = $PolicyCount
-                AppIssues      = $AppCount
-                Issues         = $Issues
+                Message      = "Found $PolicyCount policy issues and $AppCount application issues in Intune."
+                Tenant       = $TenantFilter
+                PolicyIssues = $PolicyCount
+                AppIssues    = $AppCount
+                Issues       = $Issues
             })
     } else {
         $AlertData = $Issues

Modules/CIPPCore/Public/Add-CIPPBPAField.ps1

@@ -34,7 +34,7 @@ function Add-CIPPBPAField {
             $Result[$fieldName] = [string]$JsonString
         }
         'string' {
-            $Result[$fieldName], [string]$FieldValue
+            $Result[$fieldName] = [string]$FieldValue
         }
     }
     Add-CIPPAzDataTableEntity @Table -Entity $Result -Force

Modules/CIPPCore/Public/CippQueue/New-CippQueueEntry.ps1

@@ -21,6 +21,7 @@ function New-CippQueueEntry {
     }
 
     if ($env:CIPPNG -eq 'true') {
+        [Craft.Services.QueueStatusBridge]::RegisterQueueMetadata($QueueEntry.RowKey, $Name, $Link, $Reference)
         return $QueueEntry
     }
 

Modules/CIPPCore/Public/Compare-CIPPIntuneObject.ps1

@@ -12,7 +12,7 @@ function Compare-CIPPIntuneObject {
         [Parameter(Mandatory = $false)]
         [string[]]$CompareType = @()
     )
-    if ($CompareType -ne 'Catalog') {
+    if ($CompareType -notcontains 'Catalog') {
         $defaultExcludeProperties = @(
             'id',
             'createdDateTime',