Merge branch 'dev' of https://github.com/KelvinTegelaar/CIPP-API into dev

Author: JohnDuprey

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Administration/Invoke-ExecOffboardTenant.ps1

@@ -1,4 +1,4 @@
-Function Invoke-ExecOffboardTenant {
+function Invoke-ExecOffboardTenant {
     <#
     .FUNCTIONALITY
         Entrypoint
@@ -84,7 +84,7 @@ Function Invoke-ExecOffboardTenant {
                     $property = $_
                     $propertyContacts = $orgContacts.($($property))
 
-                    if ($propertyContacts -AND ($domains -notcontains ($propertyContacts | ForEach-Object { $_.Split('@')[1] }))) {
+                    if ($propertyContacts -and ($domains -notcontains ($propertyContacts | ForEach-Object { $_.Split('@')[1] }))) {
                         $newPropertyContent = [System.Collections.Generic.List[object]]($propertyContacts | Where-Object { $domains -notcontains $_.Split('@')[1] })
 
                         $patchContactBody = if (!($newPropertyContent)) { "{ `"$($property)`" : [] }" } else { [pscustomobject]@{ $property = $newPropertyContent } | ConvertTo-Json }
@@ -103,6 +103,29 @@ Function Invoke-ExecOffboardTenant {
                 # TODO Add logic for privacyProfile later - rvdwegen
 
             }
+
+            if ($request.body.RemoveDomainAnalyserData -eq $true) {
+                # Remove all Domain Analyser data for this tenant
+                try {
+                    $DomainTable = Get-CIPPTable -Table 'Domains'
+                    $Filter = "TenantGUID eq '{0}'" -f $TenantId
+                    $DomainEntries = Get-CIPPAzDataTableEntity @DomainTable -Filter $Filter
+                    
+                    if ($DomainEntries) {
+                        $DomainCount = ($DomainEntries | Measure-Object).Count
+                        foreach ($Domain in $DomainEntries) {
+                            Remove-AzDataTableEntity @DomainTable -Entity $Domain
+                        }
+                        $Results.Add("Successfully removed $DomainCount Domain Analyser entries")
+                        Write-LogMessage -headers $Request.Headers -API $APIName -message "Removed $DomainCount Domain Analyser entries" -Sev 'Info' -tenant $TenantFilter
+                    } else {
+                        $Results.Add('No Domain Analyser data found for this tenant')
+                    }
+                } catch {
+                    $Errors.Add("Failed to remove Domain Analyser data: $($_.Exception.message)")
+                }
+            }
+
             $VendorApps = $Request.Body.vendorApplications
             if ($VendorApps) {
                 $VendorApps | ForEach-Object {