Merge pull request #440 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/Invoke-PublicPhishingCheck.ps1

@@ -16,6 +16,10 @@ function Invoke-PublicPhishingCheck {
 
     if ($Request.body.Cloned -and $Tenant.customerId -eq $Request.body.TenantId) {
         Write-AlertMessage -message $Request.body.AlertMessage -sev 'Alert' -tenant $Request.body.TenantId
+    } elseif ($Request.Body.source -and $Tenant) {
+        $Message = "Alert received from $($Request.Body.source) for $($Request.body.TenantId)"
+        Write-Information ($Request.Body | ConvertTo-Json)
+        Write-AlertMessage -message $Message -sev 'Alert' -tenant $Tenant.customerId -LogData $Request.body
     }
 
     # Associate values to output bindings by calling 'Push-OutputBinding'.

Modules/CIPPCore/Public/GraphHelper/Get-Tenants.ps1

@@ -42,8 +42,8 @@ function Get-Tenants {
             $IncludedTenantFilter = [scriptblock]::Create("`$_.customerId -eq '$TenantFilter'")
             $RelationshipFilter = " and customer/tenantId eq '$TenantFilter'"
         } else {
-            $Filter = "{0} and defaultDomainName eq '{1}'" -f $Filter, $TenantFilter
-            $IncludedTenantFilter = [scriptblock]::Create("`$_.defaultDomainName -eq '$TenantFilter'")
+            $Filter = "{0} and defaultDomainName eq '{1}' or initialDomainName eq '{1}'" -f $Filter, $TenantFilter
+            $IncludedTenantFilter = [scriptblock]::Create("`$_.defaultDomainName -eq '$TenantFilter' -or `$_.initialDomainName -eq '$TenantFilter'")
             $RelationshipFilter = ''
         }
     } else {

Modules/CIPPCore/Public/GraphHelper/Write-AlertMessage.ps1

@@ -1,4 +1,4 @@
-function Write-AlertMessage($message, $tenant = 'None', $tenantId = $null) {
+function Write-AlertMessage($message, $tenant = 'None', $tenantId = $null, $LogData = @{}) {
     <#
     .FUNCTIONALITY
     Internal
@@ -10,7 +10,7 @@ function Write-AlertMessage($message, $tenant = 'None', $tenantId = $null) {
     $ExistingMessage = Get-CIPPAzDataTableEntity @Table -Filter $Filter
     if (!$ExistingMessage) {
         Write-Host 'No duplicate message found, writing to log'
-        Write-LogMessage -message $message -tenant $tenant -sev 'Alert' -tenantId $tenantId -API 'Alerts'
+        Write-LogMessage -message $message -tenant $tenant -sev 'Alert' -tenantId $tenantId -API 'Alerts' -LogData $LogData
     } else {
         Write-Host 'Alerts: Duplicate entry found, not writing to log'