[pull] master from KelvinTegelaar:master

.gitignore

@@ -9,3 +9,7 @@ Logs
 ExcludedTenants
 SendNotifications/config.json
 .env
+
+
+# Cursor IDE
+.cursor/rules

Modules/CIPPCore/Public/Add-CIPPScheduledTask.ps1

@@ -24,106 +24,178 @@ function Add-CIPPScheduledTask {
         $Headers
     )
 
-    $Table = Get-CIPPTable -TableName 'ScheduledTasks'
-
-    if ($RunNow.IsPresent -and $RowKey) {
-        try {
-            $Filter = "PartitionKey eq 'ScheduledTask' and RowKey eq '$($RowKey)'"
-            $ExistingTask = (Get-CIPPAzDataTableEntity @Table -Filter $Filter)
-            $ExistingTask.ScheduledTime = [int64](([datetime]::UtcNow) - (Get-Date '1/1/1970')).TotalSeconds
-            $ExistingTask.TaskState = 'Planned'
-            Add-CIPPAzDataTableEntity @Table -Entity $ExistingTask -Force
-            Write-LogMessage -headers $Headers -API 'RunNow' -message "Task $($ExistingTask.Name) scheduled to run now" -Sev 'Info' -Tenant $ExistingTask.Tenant
-            return "Task $($ExistingTask.Name) scheduled to run now"
-        } catch {
-            $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-            Write-LogMessage -headers $Headers -API 'RunNow' -message "Could not run task: $ErrorMessage" -Sev 'Error'
-            return "Could not run task: $ErrorMessage"
-        }
-    } else {
-        if ($DisallowDuplicateName) {
-            $Filter = "PartitionKey eq 'ScheduledTask' and Name eq '$($Task.Name)'"
-            $ExistingTask = (Get-CIPPAzDataTableEntity @Table -Filter $Filter)
-            if ($ExistingTask) {
-                return "Task with name $($Task.Name) already exists"
+    try {
+
+        $Table = Get-CIPPTable -TableName 'ScheduledTasks'
+
+        if ($RunNow.IsPresent -and $RowKey) {
+            try {
+                $Filter = "PartitionKey eq 'ScheduledTask' and RowKey eq '$($RowKey)'"
+                $ExistingTask = (Get-CIPPAzDataTableEntity @Table -Filter $Filter)
+                $ExistingTask.ScheduledTime = [int64](([datetime]::UtcNow) - (Get-Date '1/1/1970')).TotalSeconds
+                $ExistingTask.TaskState = 'Planned'
+                Add-CIPPAzDataTableEntity @Table -Entity $ExistingTask -Force
+                Write-LogMessage -headers $Headers -API 'RunNow' -message "Task $($ExistingTask.Name) scheduled to run now" -Sev 'Info' -Tenant $ExistingTask.Tenant
+                return "Task $($ExistingTask.Name) scheduled to run now"
+            } catch {
+                $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
+                Write-LogMessage -headers $Headers -API 'RunNow' -message "Could not run task: $ErrorMessage" -Sev 'Error'
+                return "Could not run task: $ErrorMessage"
             }
-        }
+        } else {
+            if ($DisallowDuplicateName) {
+                $Filter = "PartitionKey eq 'ScheduledTask' and Name eq '$($Task.Name)'"
+                $ExistingTask = (Get-CIPPAzDataTableEntity @Table -Filter $Filter)
+                if ($ExistingTask) {
+                    return "Task with name $($Task.Name) already exists"
+                }
+            }
+
+            $propertiesToCheck = @('Webhook', 'Email', 'PSA')
+            $PostExecutionObject = ($propertiesToCheck | Where-Object { $task.PostExecution.$_ -eq $true })
+            $PostExecution = $PostExecutionObject ? ($PostExecutionObject -join ',') : ($Task.PostExecution.value -join ',')
+            $Parameters = [System.Collections.Hashtable]@{}
+            foreach ($Key in $task.Parameters.PSObject.Properties.Name) {
+                $Param = $task.Parameters.$Key
+
+                if ($null -eq $Param -or $Param -eq '' -or ($Param | Measure-Object).Count -eq 0) {
+                    continue
+                }
 
-        $propertiesToCheck = @('Webhook', 'Email', 'PSA')
-        $PostExecutionObject = ($propertiesToCheck | Where-Object { $task.PostExecution.$_ -eq $true })
-        $PostExecution = $PostExecutionObject ? ($PostExecutionObject -join ',') : ($Task.PostExecution.value -join ',')
-        $Parameters = [System.Collections.Hashtable]@{}
-        foreach ($Key in $task.Parameters.PSObject.Properties.Name) {
-            $Param = $task.Parameters.$Key
+                # handle different object types in params
+                if ($Param -is [System.Collections.IDictionary] -or $Param[0].Key) {
+                    Write-Information "Parameter $Key is a hashtable"
+                    $ht = @{}
+                    foreach ($p in $Param.GetEnumerator()) {
+                        $ht[$p.Key] = $p.Value
+                    }
+                    $Parameters[$Key] = [PSCustomObject]$ht
+                    Write-Information "Converted $Key to PSObject $($Parameters[$Key] | ConvertTo-Json -Compress)"
+                } elseif ($Param -is [System.Object[]] -and -not ($Param -is [string])) {
+                    Write-Information "Parameter $Key is an enumerable object"
+                    $Param = $Param | ForEach-Object {
+                        if ($null -eq $_) {
+                            # Skip null entries
+                            return
+                        }
+                        if ($_ -is [System.Collections.IDictionary]) {
+                            [PSCustomObject]$_
+                        } elseif ($_ -is [PSCustomObject]) {
+                            $_
+                        } else {
+                            $_
+                        }
+                    } | Where-Object { $null -ne $_ }
+                    $Parameters[$Key] = $Param
+                } else {
+                    Write-Information "Parameter $Key is a simple value"
+                    $Parameters[$Key] = $Param
+                }
+            }
 
-            if ($null -eq $Param -or $Param -eq '' -or ($Param | Measure-Object).Count -eq 0) {
-                continue
+            if ($Headers) {
+                $Parameters.Headers = $Headers | Select-Object -Property 'x-forwarded-for', 'x-ms-client-principal', 'x-ms-client-principal-idp', 'x-ms-client-principal-name'
             }
-            if ($Param -is [System.Collections.IDictionary] -or $Param.Key) {
-                $ht = @{}
-                foreach ($p in $Param.GetEnumerator()) {
-                    $ht[$p.Key] = $p.Value
+
+            $Parameters = ($Parameters | ConvertTo-Json -Depth 10 -Compress)
+            $AdditionalProperties = [System.Collections.Hashtable]@{}
+            foreach ($Prop in $task.AdditionalProperties) {
+                if ($null -eq $Prop.Value -or $Prop.Value -eq '' -or ($Prop.Value | Measure-Object).Count -eq 0) {
+                    continue
                 }
-                $Parameters[$Key] = [PSCustomObject]$ht
+                $AdditionalProperties[$Prop.Key] = $Prop.Value
+            }
+            $AdditionalProperties = ([PSCustomObject]$AdditionalProperties | ConvertTo-Json -Compress)
+            if ($Parameters -eq 'null') { $Parameters = '' }
+            if (!$Task.RowKey) {
+                $RowKey = (New-Guid).Guid
             } else {
-                $Parameters[$Key] = $Param
+                $RowKey = $Task.RowKey
             }
-        }
 
-        if ($Headers) {
-            $Parameters.Headers = $Headers | Select-Object -Property 'x-forwarded-for', 'x-ms-client-principal', 'x-ms-client-principal-idp', 'x-ms-client-principal-name'
-        }
+            $Recurrence = if ([string]::IsNullOrEmpty($task.Recurrence.value)) {
+                $task.Recurrence
+            } else {
+                $task.Recurrence.value
+            }
 
-        $Parameters = ($Parameters | ConvertTo-Json -Depth 10 -Compress)
-        $AdditionalProperties = [System.Collections.Hashtable]@{}
-        foreach ($Prop in $task.AdditionalProperties) {
-            $AdditionalProperties[$Prop.Key] = $Prop.Value
-        }
-        $AdditionalProperties = ([PSCustomObject]$AdditionalProperties | ConvertTo-Json -Compress)
-        if ($Parameters -eq 'null') { $Parameters = '' }
-        if (!$Task.RowKey) {
-            $RowKey = (New-Guid).Guid
-        } else {
-            $RowKey = $Task.RowKey
-        }
+            if ([int64]$task.ScheduledTime -eq 0 -or [string]::IsNullOrEmpty($task.ScheduledTime)) {
+                $task.ScheduledTime = [int64](([datetime]::UtcNow) - (Get-Date '1/1/1970')).TotalSeconds
+            }
+            $excludedTenants = if ($task.excludedTenants.value) {
+                $task.excludedTenants.value -join ','
+            }
 
-        $Recurrence = if ([string]::IsNullOrEmpty($task.Recurrence.value)) {
-            $task.Recurrence
-        } else {
-            $task.Recurrence.value
-        }
+            # Handle tenant filter - support both single tenant and tenant groups
+            $tenantFilter = $task.TenantFilter.value ? $task.TenantFilter.value : $task.TenantFilter
+            $originalTenantFilter = $task.TenantFilter
 
-        if ([int64]$task.ScheduledTime -eq 0 -or [string]::IsNullOrEmpty($task.ScheduledTime)) {
-            $task.ScheduledTime = [int64](([datetime]::UtcNow) - (Get-Date '1/1/1970')).TotalSeconds
-        }
-        $excludedTenants = if ($task.excludedTenants.value) {
-            $task.excludedTenants.value -join ','
-        }
-        $entity = @{
-            PartitionKey         = [string]'ScheduledTask'
-            TaskState            = [string]'Planned'
-            RowKey               = [string]$RowKey
-            Tenant               = $task.TenantFilter.value ? "$($task.TenantFilter.value)" : "$($task.TenantFilter)"
-            excludedTenants      = [string]$excludedTenants
-            Name                 = [string]$task.Name
-            Command              = [string]$task.Command.value
-            Parameters           = [string]$Parameters
-            ScheduledTime        = [string]$task.ScheduledTime
-            Recurrence           = [string]$Recurrence
-            PostExecution        = [string]$PostExecution
-            AdditionalProperties = [string]$AdditionalProperties
-            Hidden               = [bool]$Hidden
-            Results              = 'Planned'
-        }
-        if ($SyncType) {
-            $entity.SyncType = $SyncType
-        }
-        try {
-            Add-CIPPAzDataTableEntity @Table -Entity $entity -Force
-        } catch {
-            $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
-            return "Could not add task: $ErrorMessage"
+            # If tenant filter is a complex object (from form), extract the value
+            if ($tenantFilter -is [PSCustomObject] -and $tenantFilter.value) {
+                $originalTenantFilter = $tenantFilter
+                $tenantFilter = $tenantFilter.value
+            }
+
+            # If tenant filter is a string but still seems to be JSON, try to parse it
+            if ($tenantFilter -is [string] -and $tenantFilter.StartsWith('{')) {
+                try {
+                    $parsedTenantFilter = $tenantFilter | ConvertFrom-Json
+                    if ($parsedTenantFilter.value) {
+                        $originalTenantFilter = $parsedTenantFilter
+                        $tenantFilter = $parsedTenantFilter.value
+                    }
+                } catch {
+                    # If parsing fails, use the string as is
+                    Write-Warning "Could not parse tenant filter JSON: $tenantFilter"
+                }
+            }
+
+            $entity = @{
+                PartitionKey         = [string]'ScheduledTask'
+                TaskState            = [string]'Planned'
+                RowKey               = [string]$RowKey
+                Tenant               = [string]$tenantFilter
+                excludedTenants      = [string]$excludedTenants
+                Name                 = [string]$task.Name
+                Command              = [string]$task.Command.value
+                Parameters           = [string]$Parameters
+                ScheduledTime        = [string]$task.ScheduledTime
+                Recurrence           = [string]$Recurrence
+                PostExecution        = [string]$PostExecution
+                AdditionalProperties = [string]$AdditionalProperties
+                Hidden               = [bool]$Hidden
+                Results              = 'Planned'
+            }
+
+            # Store the original tenant filter for group expansion during execution
+            if ($originalTenantFilter -is [PSCustomObject] -and $originalTenantFilter.type -eq 'Group') {
+                $entity['TenantGroup'] = [string]($originalTenantFilter | ConvertTo-Json -Compress)
+            } elseif ($originalTenantFilter -is [string] -and $originalTenantFilter.StartsWith('{')) {
+                # Check if it's a serialized group object
+                try {
+                    $parsedOriginal = $originalTenantFilter | ConvertFrom-Json
+                    if ($parsedOriginal.type -eq 'Group') {
+                        $entity['TenantGroup'] = [string]$originalTenantFilter
+                    }
+                } catch {
+                    # Not a JSON object, ignore
+                }
+            }
+            if ($SyncType) {
+                $entity.SyncType = $SyncType
+            }
+            try {
+                Add-CIPPAzDataTableEntity @Table -Entity $entity -Force
+            } catch {
+                $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
+                return "Could not add task: $ErrorMessage"
+            }
+            return "Successfully added task: $($entity.Name)"
         }
-        return "Successfully added task: $($entity.Name)"
+    } catch {
+        Write-Warning "Failed to add scheduled task: $($_.Exception.Message)"
+        Write-Information $_.InvocationInfo.PositionMessage
+        $ErrorMessage = Get-NormalizedError -Message $_.Exception.Message
+        throw "Could not add task: $ErrorMessage"
     }
 }

Modules/CIPPCore/Public/Alerts/Get-CIPPAlertLowTenantAlignment.ps1

@@ -0,0 +1,52 @@
+function Get-CIPPAlertLowTenantAlignment {
+    <#
+    .SYNOPSIS
+        Alert for low tenant alignment percentage
+    .DESCRIPTION
+        This alert checks tenant alignment scores against standards templates and alerts when the alignment percentage falls below the specified threshold.
+    .PARAMETER TenantFilter
+        The tenant to check alignment for
+    .PARAMETER InputValue
+        The minimum alignment percentage threshold (0-100). Default is 80.
+    .FUNCTIONALITY
+        Entrypoint
+    .EXAMPLE
+        Get-CIPPAlertLowTenantAlignment -TenantFilter "contoso.onmicrosoft.com" -InputValue 75
+    #>
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        $TenantFilter,
+        [Alias('input')]
+        [ValidateRange(0, 100)]
+        [int]$InputValue = 99
+    )
+
+    try {
+        # Get tenant alignment data using the new function
+        $AlignmentData = Get-CIPPTenantAlignment -TenantFilter $TenantFilter
+
+        if (-not $AlignmentData) {
+            Write-AlertMessage -tenant $TenantFilter -message "No alignment data found for tenant $TenantFilter. This may indicate no standards templates are configured or applied to this tenant."
+            return
+        }
+
+        $LowAlignmentAlerts = $AlignmentData | Where-Object { $_.AlignmentScore -lt $InputValue } | ForEach-Object {
+            [PSCustomObject]@{
+                TenantFilter             = $_.TenantFilter
+                StandardName             = $_.StandardName
+                StandardId               = $_.StandardId
+                AlignmentScore           = $_.AlignmentScore
+                LicenseMissingPercentage = $_.LicenseMissingPercentage
+                LatestDataCollection     = $_.LatestDataCollection
+            }
+        }
+
+        if ($LowAlignmentAlerts.Count -gt 0) {
+            Write-AlertTrace -cmdletName $MyInvocation.MyCommand -tenantFilter $TenantFilter -data $LowAlignmentAlerts
+        }
+
+    } catch {
+        Write-AlertMessage -tenant $TenantFilter -message "Could not get tenant alignment data for $TenantFilter`: $(Get-NormalizedError -message $_.Exception.message)"
+    }
+}

Modules/CIPPCore/Public/Authentication/Get-CIPPHttpFunctions.ps1

@@ -1,5 +1,5 @@
 function Get-CIPPHttpFunctions {
-    Param(
+    param(
         [switch]$ByRole,
         [switch]$ByRoleGroup
     )
@@ -8,7 +8,7 @@ function Get-CIPPHttpFunctions {
         $Functions = Get-Command -Module CIPPCore | Where-Object { $_.Visibility -eq 'Public' -and $_.Name -match 'Invoke-*' }
         $Results = foreach ($Function in $Functions) {
             $Help = Get-Help $Function
-            if ($Help.Functionality -ne 'Entrypoint') { continue }
+            if ($Help.Functionality -notmatch 'Entrypoint') { continue }
             if ($Help.Role -eq 'Public') { continue }
             [PSCustomObject]@{
                 Function = $Function.Name