Merge pull request #1156 from JohnDuprey/dev

bugfixes
KelvinTegelaar · Oct 16, 2024 · 306c8a2 · 306c8a2
2 parents 205453d + 9160578
commit 306c8a2
Showing 1 changed file with 21 additions and 24 deletions.
diff --git a/Modules/CIPPCore/Public/GraphHelper/Get-Tenants.ps1 b/Modules/CIPPCore/Public/GraphHelper/Get-Tenants.ps1
@@ -162,34 +162,32 @@ function Get-Tenants {
         if ($PartnerTenantState.state -eq 'PartnerTenantAvailable') {
             # Add partner tenant if env is set
             $Domains = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/domains?$top=999' -tenantid $env:TenantID -NoAuthCheck:$true
-            $IncludedTenantsCache.Add([PSCustomObject]@{
-                    RowKey            = $env:TenantID
-                    PartitionKey      = 'Tenants'
-                    customerId        = $env:TenantID
-                    defaultDomainName = ($Domains | Where-Object { $_.isDefault -eq $true }).id
-                    initialDomainName = ($Domains | Where-Object { $_.isInitial -eq $true }).id
-                    displayName       = '*Partner Tenant'
-                    domains           = 'PartnerTenant'
-                    Excluded          = $false
-                    ExcludeUser       = ''
-                    ExcludeDate       = ''
-                    GraphErrorCount   = 0
-                    LastGraphError    = ''
-                    RequiresRefresh   = [bool]$RequiresRefresh
-                    LastRefresh       = (Get-Date).ToUniversalTime()
-                }) | Out-Null
+            $PartnerTenant = [PSCustomObject]@{
+                RowKey            = $env:TenantID
+                PartitionKey      = 'Tenants'
+                customerId        = $env:TenantID
+                defaultDomainName = ($Domains | Where-Object { $_.isDefault -eq $true }).id
+                initialDomainName = ($Domains | Where-Object { $_.isInitial -eq $true }).id
+                displayName       = '*Partner Tenant'
+                domains           = 'PartnerTenant'
+                Excluded          = $false
+                ExcludeUser       = ''
+                ExcludeDate       = ''
+                GraphErrorCount   = 0
+                LastGraphError    = ''
+                RequiresRefresh   = [bool]$RequiresRefresh
+                LastRefresh       = (Get-Date).ToUniversalTime()
+            }
+            $IncludedTenantsCache.Add($PartnerTenant)
+            Add-AzDataTableEntity @TenantsTable -Entity $PartnerTenant -Force | Out-Null
 
         }
-        foreach ($Tenant in $TenantList | Where-Object $IncludedTenantFilter) {
+        foreach ($Tenant in $TenantList) {
             if ($Tenant.defaultDomainName -eq 'Invalid' -or [string]::IsNullOrWhiteSpace($Tenant.defaultDomainName)) {
                 Write-LogMessage -API 'Get-Tenants' -message "We're skipping $($Tenant.displayName) as it has an invalid default domain name. Something is up with this instance." -level 'Critical'
                 continue
             }
-            $IncludedTenantsCache.Add($Tenant) | Out-Null
-        }
-
-        if ($IncludedTenantsCache) {
-            Add-CIPPAzDataTableEntity @TenantsTable -Entity $IncludedTenantsCache -Force | Out-Null
+            $IncludedTenantsCache.Add($Tenant)
         }
     }
     if ($PartnerTenantState.state -eq 'owntenant' -and $IncludedTenantsCache.RowKey.count -eq 0) {
@@ -215,6 +213,5 @@ function Get-Tenants {
             Add-CIPPAzDataTableEntity @TenantsTable -Entity $IncludedTenantsCache -Force | Out-Null
         }
     }
-
-    return ($IncludedTenantsCache | Where-Object { $null -ne $_.defaultDomainName -and ($_.defaultDomainName -notmatch 'Domain Error' -or $IncludeAll.IsPresent) -and $IncludedTenantFilter } | Sort-Object -Property displayName)
+    return $IncludedTenantsCache | Where-Object { ($null -ne $_.defaultDomainName -and ($_.defaultDomainName -notmatch 'Domain Error' -or $IncludeAll.IsPresent)) } | Where-Object $IncludedTenantFilter | Sort-Object -Property displayName
 }