Merge pull request #493 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

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

@@ -124,6 +124,11 @@ function Invoke-ListGraphRequest {
 
     try {
         $Results = Get-GraphRequestList @GraphRequestParams
+
+        if ($script:LastGraphResponseHeaders) {
+            $Metadata.GraphHeaders = $script:LastGraphResponseHeaders
+        }
+
         if ($Results | Where-Object { $_.PSObject.Properties.Name -contains 'nextLink' }) {
             if (![string]::IsNullOrEmpty($Results.nextLink) -and $Request.Query.TenantFilter -ne 'AllTenants') {
                 Write-Host "NextLink: $($Results.nextLink | Where-Object { $_ } | Select-Object -Last 1)"

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Transport/Invoke-AddTransportRule.ps1

@@ -14,6 +14,9 @@ function Invoke-AddTransportRule {
 
     $RequestParams = $Request.Body.PowerShellCommand | ConvertFrom-Json | Select-Object -Property * -ExcludeProperty GUID, HasSenderOverride, ExceptIfHasSenderOverride, ExceptIfMessageContainsDataClassifications, MessageContainsDataClassifications
 
+    # Remove null properties from payload
+    $RequestParams.PSObject.Properties | Where-Object { $_.Value -eq $null } | ForEach-Object { $RequestParams.PSObject.Properties.Remove($_.Name) }
+
     $Tenants = ($Request.body.selectedTenants).value
 
     $AllowedTenants = Test-CippAccess -Request $Request -TenantList

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/New-CippCoreRequest.ps1

@@ -21,6 +21,9 @@ function New-CippCoreRequest {
     }
 
     if ($PSCmdlet.ShouldProcess("Processing request for $($Request.Params.CIPPEndpoint)")) {
+        # Set script scope variables for Graph API to indicate HTTP request/high priority
+        $script:XMsThrottlePriority = 'high'
+
         if ((Get-Command -Name $FunctionName -ErrorAction SilentlyContinue) -or $FunctionName -eq 'Invoke-Me') {
             try {
                 $Access = Test-CIPPAccess -Request $Request

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

@@ -70,7 +70,16 @@ function Invoke-ListTenants {
     }
     try {
         $TenantFilter = $Request.Query.tenantFilter
-        $Tenants = Get-Tenants -IncludeErrors -SkipDomains
+        $tenantParams = @{
+            IncludeErrors = $true
+            SkipDomains   = $true
+        }
+        if ($TenantFilter -and $TenantFilter -ne 'AllTenants') {
+            $tenantParams['TenantFilter'] = $TenantFilter
+        }
+
+        $Tenants = Get-Tenants @tenantParams
+
         if ($TenantAccess -notcontains 'AllTenants') {
             $Tenants = $Tenants | Where-Object -Property customerId -In $TenantAccess
         }
@@ -98,7 +107,7 @@ function Invoke-ListTenants {
             }
         }
 
-        if ($null -eq $TenantFilter -or $TenantFilter -eq 'null') {
+        if (($null -eq $TenantFilter -or $TenantFilter -eq 'null') -or $Request.Query.Mode -eq 'TenantList') {
             $TenantList = [system.collections.generic.list[object]]::new()
             if ($AllTenantSelector -eq $true) {
                 $AllTenantsObject = @{
@@ -141,7 +150,7 @@ function Invoke-ListTenants {
             }
 
         } else {
-            $body = $Tenants | Where-Object -Property defaultDomainName -EQ $TenantFilter
+            $body = $Tenants
         }
 
         Write-LogMessage -headers $Headers -tenant $TenantFilter -API $APIName -message 'Listed Tenant Details' -Sev 'Debug'

Modules/CIPPCore/Public/GraphHelper/New-GraphBulkRequest.ps1

@@ -17,6 +17,10 @@ function New-GraphBulkRequest {
     if ($NoAuthCheck -or (Get-AuthorisedRequest -Uri $uri -TenantID $tenantid)) {
         $headers = Get-GraphToken -tenantid $tenantid -scope $scope -AsApp $asapp
 
+        if ($script:XMsThrottlePriority) {
+            $headers['x-ms-throttle-priority'] = $script:XMsThrottlePriority
+        }
+
         $URL = "https://graph.microsoft.com/$Version/`$batch"
 
         # Track consecutive Graph API failures

Modules/CIPPCore/Public/GraphHelper/New-GraphGetRequest.ps1

@@ -36,6 +36,11 @@ function New-GraphGetRequest {
         if ($ComplexFilter) {
             $headers['ConsistencyLevel'] = 'eventual'
         }
+
+        if ($script:XMsThrottlePriority) {
+            $headers['x-ms-throttle-priority'] = $script:XMsThrottlePriority
+        }
+
         $nextURL = $uri
         if ($extraHeaders) {
             foreach ($key in $extraHeaders.Keys) {
@@ -68,15 +73,14 @@ function New-GraphGetRequest {
                         Headers     = $headers
                         ContentType = 'application/json; charset=utf-8'
                     }
-                    if ($IncludeResponseHeaders) {
-                        $GraphRequest.ResponseHeadersVariable = 'ResponseHeaders'
-                    }
 
                     if ($ReturnRawResponse) {
                         $GraphRequest.SkipHttpErrorCheck = $true
                         $Data = Invoke-WebRequest @GraphRequest
                     } else {
+                        $GraphRequest.ResponseHeadersVariable = 'ResponseHeaders'
                         $Data = (Invoke-RestMethod @GraphRequest)
+                        $script:LastGraphResponseHeaders = $ResponseHeaders
                     }
 
                     # If we reach here, the request was successful