Merge pull request #614 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPDriftManagement.ps1

@@ -36,8 +36,9 @@ function Push-CippDriftManagement {
 
             $GenerateEmail = New-CIPPAlertTemplate -format 'html' -data $Data -CIPPURL $CIPPURL -Tenant $Item.Tenant -InputObject 'driftStandard' -AuditLogLink $drift.standardId
 
-            # Send email alert if configured and not disabled
+            # Check if notifications are disabled (default to false if not set)
             if (-not $Settings.driftAlertDisableEmail) {
+                # Send email alert if configured
                 $CIPPAlert = @{
                     Type         = 'email'
                     Title        = $GenerateEmail.title
@@ -46,33 +47,35 @@ function Push-CippDriftManagement {
                 }
                 Write-Information "Sending email alert for tenant $($Item.Tenant)"
                 Send-CIPPAlert @CIPPAlert -altEmail $email
+                
+                # Send webhook alert if configured
+                $WebhookData = @{
+                    Title      = $GenerateEmail.title
+                    ActionUrl  = $GenerateEmail.ButtonUrl
+                    ActionText = $GenerateEmail.ButtonText
+                    AlertData  = $Data
+                    Tenant     = $Item.Tenant
+                } | ConvertTo-Json -Depth 5 -Compress
+                $CippAlert = @{
+                    Type         = 'webhook'
+                    Title        = $GenerateEmail.title
+                    JSONContent  = $WebhookData
+                    TenantFilter = $Item.Tenant
+                }
+                Write-Information "Sending webhook alert for tenant $($Item.Tenant)"
+                Send-CIPPAlert @CippAlert -altWebhook $webhook
+                
+                # Send PSA alert
+                $CIPPAlert = @{
+                    Type         = 'psa'
+                    Title        = $GenerateEmail.title
+                    HTMLContent  = $GenerateEmail.htmlcontent
+                    TenantFilter = $Item.Tenant
+                }
+                Send-CIPPAlert @CIPPAlert
             } else {
-                Write-Information "Email alert disabled for tenant $($Item.Tenant)"
-            }
-            # Send webhook alert if configured
-            $WebhookData = @{
-                Title      = $GenerateEmail.title
-                ActionUrl  = $GenerateEmail.ButtonUrl
-                ActionText = $GenerateEmail.ButtonText
-                AlertData  = $Data
-                Tenant     = $Item.Tenant
-            } | ConvertTo-Json -Depth 5 -Compress
-            $CippAlert = @{
-                Type         = 'webhook'
-                Title        = $GenerateEmail.title
-                JSONContent  = $WebhookData
-                TenantFilter = $Item.Tenant
-            }
-            Write-Information "Sending webhook alert for tenant $($Item.Tenant)"
-            Send-CIPPAlert @CippAlert -altWebhook $webhook
-            # Always send PSA alert
-            $CIPPAlert = @{
-                Type         = 'psa'
-                Title        = $GenerateEmail.title
-                HTMLContent  = $GenerateEmail.htmlcontent
-                TenantFilter = $Item.Tenant
+                Write-Information "All notifications disabled for tenant $($Item.Tenant)"
             }
-            Send-CIPPAlert @CIPPAlert
             return $true
         } else {
             Write-LogMessage -API 'DriftStandards' -tenant $Item.Tenant -message "No new drift deviations found for tenant $($Item.Tenant)" -sev Info

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-ListNewUserDefaults.ps1

@@ -12,15 +12,13 @@ function Invoke-ListNewUserDefaults {
 
     # Get the TenantFilter from query parameters
     $TenantFilter = $Request.Query.TenantFilter
-    Write-Host "TenantFilter from request: $TenantFilter"
-    
+
     # Get the includeAllTenants flag from query or body parameters (defaults to true)
     $IncludeAllTenants = if ($Request.Query.includeAllTenants -eq 'false' -or $Request.Body.includeAllTenants -eq 'false') {
         $false
     } else {
         $true
     }
-    Write-Host "IncludeAllTenants: $IncludeAllTenants"
 
     # Get the templates table
     $Table = Get-CippTable -tablename 'templates'
@@ -33,15 +31,12 @@ function Invoke-ListNewUserDefaults {
             $data = $row.JSON | ConvertFrom-Json -Depth 100 -ErrorAction Stop
             $data | Add-Member -NotePropertyName 'GUID' -NotePropertyValue $row.GUID -Force
             $data | Add-Member -NotePropertyName 'RowKey' -NotePropertyValue $row.RowKey -Force
-            Write-Host "Template found: $($data.templateName), tenantFilter: $($data.tenantFilter)"
             $data
         } catch {
             Write-Warning "Failed to process User Default template: $($row.RowKey) - $($_.Exception.Message)"
         }
     }
 
-    Write-Host "Total templates before filtering: $($Templates.Count)"
-
     # Filter by tenant if TenantFilter is provided
     if ($TenantFilter) {
         if ($TenantFilter -eq 'AllTenants') {
@@ -57,7 +52,6 @@ function Invoke-ListNewUserDefaults {
                 $Templates = $Templates | Where-Object -Property tenantFilter -eq $TenantFilter
             }
         }
-        Write-Host "Templates after filtering: $($Templates.Count)"
     }
 
     # Sort by template name