Merge branch 'KelvinTegelaar:master' into master

efiniste · Apr 5, 2024 · 0058f3d · 0058f3d
2 parents c9fce43 + 984d3cf
commit 0058f3d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecOnboardTenantQueue.ps1 b/Modules/CIPPCore/Public/Entrypoints/Activity Triggers/Push-ExecOnboardTenantQueue.ps1
@@ -274,11 +274,7 @@ Function Push-ExecOnboardTenantQueue {
                 $Logs.Add([PSCustomObject]@{ Date = Get-Date -UFormat $DateFormat; Log = 'Clearing tenant cache' })
                 $y = 0
                 do {
-                    try {
-                        Remove-CIPPCache -tenantsOnly $true
-                    } catch {}
-
-                    $Tenant = Get-Tenants -IncludeAll | Where-Object { $_.customerId -eq $Relationship.customer.tenantId } | Select-Object -First 1
+                    $Tenant = Get-Tenants -TriggerRefresh -IncludeAll | Where-Object { $_.customerId -eq $Relationship.customer.tenantId } | Select-Object -First 1
                     $y++
                     Start-Sleep -Seconds 20
                 } while (!$Tenant -and $y -le 4)
@@ -327,10 +323,7 @@ Function Push-ExecOnboardTenantQueue {
                         $OnboardingSteps.Step4.Status = 'succeeded'
                         $OnboardingSteps.Step4.Message = 'CPV permissions refreshed'
                         if ($Tenant.defaultDomainName -match 'Domain Error') {
-                            try {
-                                Remove-CIPPCache -tenantsOnly $true
-                            } catch {}
-                            $Tenant = Get-Tenants -IncludeAll | Where-Object { $_.customerId -eq $Relationship.customer.tenantId } | Select-Object -First 1
+                            $Tenant = Get-Tenants -TriggerRefresh -IncludeAll | Where-Object { $_.customerId -eq $Relationship.customer.tenantId } | Select-Object -First 1
                         }
                     } else {
                         $Logs.Add([PSCustomObject]@{ Date = Get-Date -UFormat $DateFormat; Log = 'CPV permissions failed to refresh' })

diff --git a/.../Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-PublicWebhooks.ps1 b/.../Public/Entrypoints/HTTP Functions/Tenant/Administration/Alerts/Invoke-PublicWebhooks.ps1
@@ -90,6 +90,7 @@ function Invoke-PublicWebhooks {
                     Write-Host "Our operations: $Operations"
                     Write-Host "Logs to download: $LogsToDownload"
                     if ($ReceivedItem.ContentType -in $LogsToDownload -or 'AnyLog' -in $LogsToDownload) {
+                        if ($ReceivedItem.ContentType -eq 'Audit.SharePoint') { continue }
                         $Data = New-GraphPostRequest -type GET -uri "https://manage.office.com/api/v1.0/$($ReceivedItem.tenantId)/activity/feed/audit/$($ReceivedItem.contentid)" -tenantid $TenantFilter -scope 'https://manage.office.com/.default'
                     } else {
                         Write-Host "No data to download for $($ReceivedItem.ContentType)"

diff --git a/version_latest.txt b/version_latest.txt
@@ -1 +1 @@
-5.4.3
+5.4.4