Merge pull request #619 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ExecPartnerWebhook.ps1

@@ -18,15 +18,21 @@ function Invoke-ExecPartnerWebhook {
 
                 $ConfigTable = Get-CIPPTable -TableName Config
                 $WebhookConfig = Get-CIPPAzDataTableEntity @ConfigTable -Filter "RowKey eq 'PartnerWebhookOnboarding'"
-                if ($WebhookConfig.StandardsExcludeAllTenants -eq $true) {
-                    $Results | Add-Member -MemberType NoteProperty -Name 'standardsExcludeAllTenants' -Value $true -Force
+                if ($WebhookConfig) {
+                    $Results | Add-Member -MemberType NoteProperty -Name 'enabled' -Value ([bool]$WebhookConfig.Enabled) -Force
+                    if ($WebhookConfig.StandardsExcludeAllTenants -eq $true) {
+                        $Results | Add-Member -MemberType NoteProperty -Name 'standardsExcludeAllTenants' -Value $true -Force
+                    }
+                } else {
+                    $Results | Add-Member -MemberType NoteProperty -Name 'enabled' -Value $false -Force
                 }
             } catch {}
             if (!$Results) {
                 $Results = [PSCustomObject]@{
                     webhoookUrl           = 'None'
                     lastModifiedTimestamp = 'Never'
                     webhookEvents         = @()
+                    enabled               = $false
                 }
             }
         }
@@ -50,6 +56,7 @@ function Invoke-ExecPartnerWebhook {
             $PartnerWebhookOnboarding = [PSCustomObject]@{
                 PartitionKey               = 'Config'
                 RowKey                     = 'PartnerWebhookOnboarding'
+                Enabled                    = [bool]$Request.Body.enabled
                 StandardsExcludeAllTenants = $Request.Body.standardsExcludeAllTenants
             }
             Add-CIPPAzDataTableEntity @ConfigTable -Entity $PartnerWebhookOnboarding -Force | Out-Null

Modules/CIPPCore/Public/Webhooks/Invoke-CIPPPartnerWebhookProcessing.ps1

@@ -9,7 +9,7 @@ function Invoke-CippPartnerWebhookProcessing {
             $AuditLog = New-GraphGetRequest -uri $Data.AuditUri -tenantid $env:TenantID -NoAuthCheck $true -scope 'https://api.partnercenter.microsoft.com/.default'
         }
 
-        Switch ($Data.EventName) {
+        switch ($Data.EventName) {
             'test-created' {
                 Write-LogMessage -API 'Webhooks' -message 'Partner Center webhook test received' -Sev 'Info'
             }
@@ -62,16 +62,23 @@ function Invoke-CippPartnerWebhookProcessing {
                         # Check for partner webhook onboarding settings
                         $ConfigTable = Get-CIPPTable -TableName Config
                         $WebhookConfig = Get-CIPPAzDataTableEntity @ConfigTable -Filter "RowKey eq 'PartnerWebhookOnboarding'"
-                        if ($WebhookConfig.StandardsExcludeAllTenants -eq $true) {
-                            $OnboardItem.StandardsExcludeAllTenants = $true
-                        }
 
-                        # Add onboarding entry to the table
-                        $OnboardTable = Get-CIPPTable -TableName 'TenantOnboarding'
-                        Add-CIPPAzDataTableEntity @OnboardTable -Entity $TenantOnboarding -Force -ErrorAction Stop
+                        # Only proceed if automated onboarding is enabled
+                        if ($WebhookConfig.Enabled -eq $true) {
+                            if ($WebhookConfig.StandardsExcludeAllTenants -eq $true) {
+                                $OnboardItem.StandardsExcludeAllTenants = $true
+                            }
+
+                            # Add onboarding entry to the table
+                            $OnboardTable = Get-CIPPTable -TableName 'TenantOnboarding'
+                            Add-CIPPAzDataTableEntity @OnboardTable -Entity $TenantOnboarding -Force -ErrorAction Stop
 
-                        # Start onboarding
-                        Push-ExecOnboardTenantQueue -Item $OnboardItem
+                            # Start onboarding
+                            Push-ExecOnboardTenantQueue -Item $OnboardItem
+                            Write-LogMessage -API 'Webhooks' -message "Automated onboarding started for relationship $Id" -Sev 'Info'
+                        } else {
+                            Write-LogMessage -API 'Webhooks' -message "Automated onboarding is disabled. GDAP relationship $Id approved but not onboarded automatically." -Sev 'Info'
+                        }
                     } else {
                         if ($AuditLog) {
                             Write-LogMessage -API 'Webhooks' -message "Partner Center $($Data.EventName) audit log webhook received" -LogData $AuditObj -Sev 'Alert'