Merge pull request #913 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Add-CIPPDelegatedPermission.ps1

@@ -8,6 +8,7 @@ function Add-CIPPDelegatedPermission {
         $TenantFilter
     )
     Write-Information 'Adding Delegated Permissions'
+    $ApplicationId = $ApplicationId ?? $env:ApplicationID
     Set-Location (Get-Item $PSScriptRoot).FullName
 
     if ($ApplicationId -eq $env:ApplicationID -and $TenantFilter -eq $env:TenantID) {
@@ -77,9 +78,18 @@ function Add-CIPPDelegatedPermission {
     } else {
         New-GraphGETRequest -uri "https://graph.microsoft.com/beta/servicePrincipals?`$select=appId,id,displayName&`$top=999" -tenantid $TenantFilter -skipTokenCache $true -NoAuthCheck $true
     }
-    $ourSVCPrincipal = $ServicePrincipalList | Where-Object -Property appId -EQ $ApplicationId
     $Results = [System.Collections.Generic.List[string]]::new()
 
+    $ourSVCPrincipal = $ServicePrincipalList | Where-Object -Property AppId -EQ $ApplicationId | Select-Object -First 1
+    if (!$ourSVCPrincipal) {
+        $ServicePrincipalList = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/servicePrincipals?`$select=appId,id,displayName&`$top=999" -tenantid $TenantFilter -skipTokenCache $true -NoAuthCheck $true
+        $ourSVCPrincipal = $ServicePrincipalList | Where-Object -Property AppId -EQ $ApplicationId | Select-Object -First 1
+    }
+    if (!$ourSVCPrincipal) {
+        $Results.Add("Failed to find service principal for application $ApplicationId in tenant $TenantFilter")
+        return $Results
+    }
+
     $CurrentDelegatedScopes = New-GraphGETRequest -uri "https://graph.microsoft.com/beta/servicePrincipals/$($ourSVCPrincipal.id)/oauth2PermissionGrants" -skipTokenCache $true -tenantid $TenantFilter -NoAuthCheck $true
 
     foreach ($App in $RequiredResourceAccess) {

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ExecScheduleForwardingVacation.ps1

@@ -43,14 +43,14 @@ function Invoke-ExecScheduleForwardingVacation {
                 if ([string]::IsNullOrWhiteSpace($ForwardInternal)) {
                     throw 'Forwarding target is required for internal forwarding.'
                 }
-                $SharedParams.ForwardInternal = $ForwardInternal
+                $SharedParams | Add-Member -NotePropertyName 'ForwardInternal' -NotePropertyValue $ForwardInternal -Force
                 $TargetValue = $ForwardInternal
             }
             'ExternalAddress' {
                 if ([string]::IsNullOrWhiteSpace($ForwardExternal)) {
                     throw 'Forwarding target is required for external forwarding.'
                 }
-                $SharedParams.ForwardExternal = $ForwardExternal
+                $SharedParams | Add-Member -NotePropertyName 'ForwardExternal' -NotePropertyValue $ForwardExternal -Force
                 $TargetValue = $ForwardExternal
             }
             default {

Modules/CIPPCore/Public/Get-TenantProperties.ps1

@@ -4,9 +4,22 @@ function Get-TenantProperties {
     )
 
     $tableName = 'TenantProperties'
-    $query = "PartitionKey eq '$customerId'"
     $Table = Get-CIPPTable -TableName $tableName
-    $tenantProperties = Get-CIPPAzDataTableEntity @Table -Filter $query
+
+    $SafeCustomerId = ConvertTo-CIPPODataFilterValue -Value $customerId -Type String
+    $Query = "PartitionKey eq '$SafeCustomerId'"
+    $tenantProperties = @(Get-CIPPAzDataTableEntity @Table -Filter $Query)
+
+    if ($tenantProperties.Count -eq 0 -and -not [string]::IsNullOrWhiteSpace($customerId)) {
+        $Tenant = Get-Tenants -TenantFilter $customerId -IncludeErrors | Select-Object -First 1
+        $ResolvedCustomerId = $Tenant.customerId
+
+        if (-not [string]::IsNullOrWhiteSpace($ResolvedCustomerId) -and $ResolvedCustomerId -ne $customerId) {
+            $SafeResolvedCustomerId = ConvertTo-CIPPODataFilterValue -Value $ResolvedCustomerId -Type String
+            $ResolvedQuery = "PartitionKey eq '$SafeResolvedCustomerId'"
+            $tenantProperties = @(Get-CIPPAzDataTableEntity @Table -Filter $ResolvedQuery)
+        }
+    }
 
     $properties = @{}
     foreach ($property in $tenantProperties) {