Merge pull request #512 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

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

@@ -53,7 +53,7 @@ function Invoke-GetCippAlerts {
                 type  = 'error'
             })
     }
-    if ((!$env:WEBSITE_RUN_FROM_PACKAGE -or [string]::IsNullOrEmpty($env:WEBSITE_RUN_FROM_PACKAGE)) -and $env:AzureWebJobsStorage -ne 'UseDevelopmentStorage=true' -and $env:NonLocalHostAzurite -ne 'true') {
+    if (!(![string]::IsNullOrEmpty($env:WEBSITE_RUN_FROM_PACKAGE) -or ![string]::IsNullOrEmpty($env:DEPLOYMENT_STORAGE_CONNECTION_STRING)) -and $env:AzureWebJobsStorage -ne 'UseDevelopmentStorage=true' -and $env:NonLocalHostAzurite -ne 'true') {
         $Alerts.Add(
             @{
                 title = 'Function App in Write Mode'

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

@@ -7,8 +7,20 @@ function Invoke-ListApiTest {
     #>
     [CmdletBinding()]
     param($Request, $TriggerMetadata)
+
+    $Response = @{}
+    $Response.Request = $Request
+    if ($env:DEBUG_ENV_VARS -eq 'true') {
+        $BlockedKeys = @('ApplicationSecret', 'RefreshToken', 'AzureWebJobsStorage', 'DEPLOYMENT_STORAGE_CONNECTION_STRING')
+        $EnvironmentVariables = [PSCustomObject]@{}
+        Get-ChildItem env: | Where-Object { $BlockedKeys -notcontains $_.Name } | ForEach-Object {
+            $EnvironmentVariables | Add-Member -NotePropertyName $_.Name -NotePropertyValue $_.Value
+        }
+        $Response.EnvironmentVariables = $EnvironmentVariables
+    }
+
     return ([HttpResponseContext]@{
             StatusCode = [HttpStatusCode]::OK
-            Body       = ($Request | ConvertTo-Json -Depth 5)
+            Body       = $Response
         })
 }

Modules/CIPPCore/Public/TenantGroups/Update-CIPPDynamicTenantGroups.ps1

@@ -17,6 +17,16 @@ function Update-CIPPDynamicTenantGroups {
     try {
         $GroupTable = Get-CippTable -tablename 'TenantGroups'
         $MembersTable = Get-CippTable -tablename 'TenantGroupMembers'
+        $LicenseCacheTable = Get-CippTable -tablename 'cachetenantskus'
+
+        $Skus = Get-CIPPAzDataTableEntity @LicenseCacheTable -Filter "PartitionKey eq 'sku' and Timestamp ge datetime'$( (Get-Date).ToUniversalTime().AddHours(-8).ToString('yyyy-MM-ddTHH:mm:ssZ') )'"
+
+        $SkuHashtable = @{}
+        foreach ($Sku in $Skus) {
+            if ($Sku.JSON -and (Test-Json -Json $Sku.JSON -ErrorAction SilentlyContinue)) {
+                $SkuHashtable[$Sku.RowKey] = $Sku.JSON | ConvertFrom-Json
+            }
+        }
 
         if ($GroupId) {
             $DynamicGroups = Get-CIPPAzDataTableEntity @GroupTable -Filter "PartitionKey eq 'TenantGroup' and RowKey eq '$GroupId'"
@@ -88,7 +98,20 @@ function Update-CIPPDynamicTenantGroups {
                 }
                 $TenantObj = $AllTenants | ForEach-Object {
                     if ($Rules.property -contains 'availableLicense') {
-                        $LicenseInfo = New-GraphGetRequest -uri 'https://graph.microsoft.com/v1.0/subscribedSkus' -TenantId $_.defaultDomainName
+                        if ($SkuHashtable.ContainsKey($_.customerId)) {
+                            Write-Information "Using cached licenses for tenant $($_.defaultDomainName)"
+                            $LicenseInfo = $SkuHashtable[$_.customerId]
+                        } else {
+                            Write-Information "Fetching licenses for tenant $($_.defaultDomainName)"
+                            $LicenseInfo = New-GraphGetRequest -uri 'https://graph.microsoft.com/v1.0/subscribedSkus' -TenantId $_.defaultDomainName
+                            # Cache the result
+                            $CacheEntity = @{
+                                PartitionKey = 'sku'
+                                RowKey       = [string]$_.customerId
+                                JSON         = [string]($LicenseInfo | ConvertTo-Json -Depth 5 -Compress)
+                            }
+                            Add-CIPPAzDataTableEntity @LicenseCacheTable -Entity $CacheEntity -Force
+                        }
                     }
                     $SKUId = $LicenseInfo.SKUId ?? @()
                     $ServicePlans = (Get-CIPPTenantCapabilities -TenantFilter $_.defaultDomainName).psobject.properties.name

Modules/CippEntrypoints/CippEntrypoints.psm1

@@ -144,6 +144,16 @@ function Receive-CippHttpTrigger {
                 $Response.Body = $Response.Body | ConvertTo-Json -Depth 20 -Compress
             }
             Push-OutputBinding -Name Response -Value ([HttpResponseContext]$Response)
+        } else {
+            Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{
+                    StatusCode = [HttpStatusCode]::InternalServerError
+                    Body       = @{
+                        error = @{
+                            code    = 'InternalServerError'
+                            message = 'An error occurred processing the request'
+                        }
+                    }
+                })
         }
     }
     return