Merge pull request #387 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-CIPPOffboardingJob.ps1

@@ -32,7 +32,7 @@ function Invoke-CIPPOffboardingJob {
         }
         { $_.ResetPass -eq $true } {
             try {
-                Set-CIPPResetPassword -tenantFilter $TenantFilter -DisplayName -UserID $username -Headers $Headers -APIName $APIName
+                Set-CIPPResetPassword -tenantFilter $TenantFilter -DisplayName $DisplayName -UserID $username -Headers $Headers -APIName $APIName
             } catch {
                 $_.Exception.Message
             }

Modules/CIPPCore/Public/Functions/Get-CIPPTenantAlignment.ps1

@@ -101,7 +101,13 @@ function Get-CIPPTenantAlignment {
 
             if ($Template.tenantFilter -and $Template.tenantFilter.Count -gt 0) {
                 # Extract tenant values from the tenantFilter array
-                $TenantValues = $Template.tenantFilter | ForEach-Object { $_.value }
+                $TenantValues = $Template.tenantFilter | ForEach-Object {
+                    if ($_.type -eq 'group') {
+                        (Get-TenantGroups -GroupId $_.value).members.defaultDomainName
+                    } else {
+                        $_.value
+                    }
+                }
 
                 if ($TenantValues -contains 'AllTenants') {
                     $AppliestoAllTenants = $true