Merge pull request #548 from KelvinTegelaar/dev

pull[bot] · web-flow · commit 7c7d0a6a3e08 · 2025-11-19T06:41:22.000Z
[pull] dev from KelvinTegelaar:dev
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPStandard.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Standards/Push-CIPPStandard.ps1
@@ -12,13 +12,32 @@ function Push-CIPPStandard {
     $Standard = $Item.Standard
     $FunctionName = 'Invoke-CIPPStandard{0}' -f $Standard
     Write-Information "We'll be running $FunctionName"
-    $Rerun = Test-CIPPRerun -Type Standard -Tenant $Tenant -API "$($Standard)_$($Item.templateId)"
+
+    if ($Standard -in @('IntuneTemplate', 'ConditionalAccessTemplate')) {
+        $API = "$Standard_$($Item.templateId)_$($Item.Settings.TemplateList.value)"
+    } else {
+        $API = "$Standard_$($Item.templateId)"
+    }
+
+    $Rerun = Test-CIPPRerun -Type Standard -Tenant $Tenant -API $API
     if ($Rerun) {
         Write-Information 'Detected rerun. Exiting cleanly'
         exit 0
     } else {
         Write-Information "Rerun is set to false. We'll be running $FunctionName"
     }
+
+    $script:StandardInfo = @{
+        Standard           = $Standard
+        StandardTemplateId = $Item.templateId
+    }
+    if ($Standard -eq 'IntuneTemplate') {
+        $script:StandardInfo.IntuneTemplateId = $Item.Settings.TemplateList.value
+    }
+    if ($Standard -eq 'ConditionalAccessTemplate') {
+        $script:StandardInfo.ConditionalAccessTemplateId = $Item.Settings.TemplateList.value
+    }
+
     try {
         # Convert settings to JSON, replace %variables%, then convert back to object
         $SettingsJSON = $Item.Settings | ConvertTo-Json -Depth 10 -Compress
diff --git a/Modules/CIPPCore/Public/Entrypoints/Invoke-ListExtensionsConfig.ps1 b/Modules/CIPPCore/Public/Entrypoints/Invoke-ListExtensionsConfig.ps1
@@ -1,4 +1,4 @@
-Function Invoke-ListExtensionsConfig {
+function Invoke-ListExtensionsConfig {
     <#
     .FUNCTIONALITY
         Entrypoint,AnyTenant
@@ -9,27 +9,32 @@ Function Invoke-ListExtensionsConfig {
     param($Request, $TriggerMetadata)
     $Table = Get-CIPPTable -TableName Extensionsconfig
     try {
-        $Body = (Get-CIPPAzDataTableEntity @Table).config | ConvertFrom-Json -Depth 10 -ErrorAction Stop
-        if ($Body.HaloPSA.TicketType -and !$Body.HaloPSA.TicketType.value) {
-            # translate ticket type to autocomplete format
-            Write-Information "Ticket Type: $($Body.HaloPSA.TicketType)"
-            $Types = Get-HaloTicketType
-            $Type = $Types | Where-Object { $_.id -eq $Body.HaloPSA.TicketType }
-            #Write-Information ($Type | ConvertTo-Json)
-            if ($Type) {
-                $Body.HaloPSA.TicketType = @{
-                    label = $Type.name
-                    value = $Type.id
+        $Config = (Get-CIPPAzDataTableEntity @Table).config
+        if (Test-Json -Json $Config) {
+            $Body = $Config | ConvertFrom-Json -Depth 10 -ErrorAction Stop
+            if ($Body.HaloPSA.TicketType -and !$Body.HaloPSA.TicketType.value) {
+                # translate ticket type to autocomplete format
+                Write-Information "Ticket Type: $($Body.HaloPSA.TicketType)"
+                $Types = Get-HaloTicketType
+                $Type = $Types | Where-Object { $_.id -eq $Body.HaloPSA.TicketType }
+                #Write-Information ($Type | ConvertTo-Json)
+                if ($Type) {
+                    $Body.HaloPSA.TicketType = @{
+                        label = $Type.name
+                        value = $Type.id
+                    }
                 }
             }
+        } else {
+            $Body = @{}
         }
     } catch {
         Write-Information (Get-CippException -Exception $_ | ConvertTo-Json)
         $Body = @{}
     }
     return [HttpResponseContext]@{
-            StatusCode = [HttpStatusCode]::OK
-            Body       = $body
-        }
+        StatusCode = [HttpStatusCode]::OK
+        Body       = $body
+    }
 
 }
diff --git a/Modules/CIPPCore/Public/GraphHelper/Write-LogMessage.ps1 b/Modules/CIPPCore/Public/GraphHelper/Write-LogMessage.ps1
@@ -66,6 +66,16 @@ function Write-LogMessage {
     if ($tenantId) {
         $TableRow.Add('TenantID', [string]$tenantId)
     }
+    if ($script:StandardInfo) {
+        $TableRow.Standard = [string]$script:StandardInfo.Standard
+        $TableRow.StandardTemplateId = [string]$script:StandardInfo.StandardTemplateId
+        if ($script:StandardInfo.IntuneTemplate) {
+            $TableRow.IntuneTemplateId = [string]$script:StandardInfo.IntuneTemplateId
+        }
+        if ($script:StandardInfo.ConditionalAccessTemplate) {
+            $TableRow.ConditionalAccessTemplateId = [string]$script:StandardInfo.ConditionalAccessTemplateId
+        }
+    }
 
     $Table.Entity = $TableRow
     Add-CIPPAzDataTableEntity @Table | Out-Null
diff --git a/Modules/CIPPCore/Public/Send-CIPPAlert.ps1 b/Modules/CIPPCore/Public/Send-CIPPAlert.ps1
@@ -95,7 +95,7 @@ function Send-CIPPAlert {
         Write-Information 'Trying to send webhook'
 
         try {
-            if ($Config.webhook -ne '' -or $AltWebhook -ne '') {
+            if (![string]::IsNullOrWhiteSpace($Config.webhook) -or ![string]::IsNullOrWhiteSpace($AltWebhook)) {
                 if ($PSCmdlet.ShouldProcess($Config.webhook, 'Sending webhook')) {
                     $webhook = if ($AltWebhook) { $AltWebhook } else { $Config.webhook }
                     switch -wildcard ($webhook) {
@@ -121,8 +121,10 @@ function Send-CIPPAlert {
                         }
                     }
                 }
+                Write-LogMessage -API 'Webhook Alerts' -message "Sent Webhook alert $title to External webhook" -tenant $TenantFilter -sev info
+            } else {
+                Write-LogMessage -API 'Webhook Alerts' -message 'No webhook URL configured' -sev warning
             }
-            Write-LogMessage -API 'Webhook Alerts' -message "Sent Webhook alert $title to External webhook" -tenant $TenantFilter -sev info
 
         } catch {
             $ErrorMessage = Get-CippException -Exception $_
diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableGuests.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableGuests.ps1
@@ -33,7 +33,17 @@ function Invoke-CIPPStandardDisableGuests {
     #>
 
     param($Tenant, $Settings)
-    ##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'DisableGuests'
+    $TestResult = Test-CIPPStandardLicense -StandardName 'DisableGuests' -TenantFilter $Tenant -RequiredCapabilities @('AAD_PREMIUM', 'AAD_PREMIUM_P2')
+
+    if ($TestResult -eq $false) {
+        #writing to each item that the license is not present.
+        $settings.TemplateList | ForEach-Object {
+            Set-CIPPStandardsCompareField -FieldName 'standards.DisableGuests' -FieldValue 'This tenant does not have the required license for this standard.' -Tenant $Tenant
+        }
+        Write-Host "We're exiting as the correct license is not present for this standard."
+        return $true
+    } #we're done.
+
     $checkDays = if ($Settings.days) { $Settings.days } else { 90 } # Default to 90 days if not set. Pre v8.5.0 compatibility
     $Days = (Get-Date).AddDays(-$checkDays).ToUniversalTime()
     $Lookup = $Days.ToString('o')
@@ -58,7 +68,7 @@ function Invoke-CIPPStandardDisableGuests {
             foreach ($guest in $GraphRequest) {
                 try {
                     $null = New-GraphPostRequest -type Patch -tenantid $tenant -uri "https://graph.microsoft.com/beta/users/$($guest.id)" -body '{"accountEnabled":"false"}'
-                    Write-LogMessage -API 'Standards' -tenant $tenant -message "Disabling guest $($guest.UserPrincipalName) ($($guest.id))" -sev Info
+                    Write-LogMessage -API 'Standards' -tenant $tenant -message "Disabling guest $($guest.UserPrincipalName) ($($guest.id)). Last sign-in: $($guest.signInActivity.lastSuccessfulSignInDateTime)" -sev Info
                 } catch {
                     $ErrorMessage = Get-CippException -Exception $_
                     Write-LogMessage -API 'Standards' -tenant $tenant -message "Failed to disable guest $($guest.UserPrincipalName) ($($guest.id)): $($ErrorMessage.NormalizedError)" -sev Error -LogData $ErrorMessage

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ function Send-CIPPAlert {`
`95`	`95`	`Write-Information 'Trying to send webhook'`
`96`	`96`
`97`	`97`	`try {`
`98`		`- if ($Config.webhook -ne '' -or $AltWebhook -ne '') {`
	`98`	`+ if (![string]::IsNullOrWhiteSpace($Config.webhook) -or ![string]::IsNullOrWhiteSpace($AltWebhook)) {`
`99`	`99`	`if ($PSCmdlet.ShouldProcess($Config.webhook, 'Sending webhook')) {`
`100`	`100`	`$webhook = if ($AltWebhook) { $AltWebhook } else { $Config.webhook }`
`101`	`101`	`switch -wildcard ($webhook) {`
`@@ -121,8 +121,10 @@ function Send-CIPPAlert {`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`}`
	`124`	`+ Write-LogMessage -API 'Webhook Alerts' -message "Sent Webhook alert $title to External webhook" -tenant $TenantFilter -sev info`
	`125`	`+ } else {`
	`126`	`+ Write-LogMessage -API 'Webhook Alerts' -message 'No webhook URL configured' -sev warning`
`124`	`127`	`}`
`125`		`- Write-LogMessage -API 'Webhook Alerts' -message "Sent Webhook alert $title to External webhook" -tenant $TenantFilter -sev info`
`126`	`128`
`127`	`129`	`} catch {`
`128`	`130`	`$ErrorMessage = Get-CippException -Exception $_`