Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #3406 #3419

Merged
merged 3 commits into from
Jun 26, 2023
Merged

Fixes #3406 #3419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
787512f
Update MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1
NikCharlebois Jun 26, 2023
fdadffb
Update CHANGELOG.md
NikCharlebois Jun 26, 2023
4ccc41e
Update Microsoft365DSC.AADAuthenticationMethodPolicyAuthenticator.Tes…
NikCharlebois Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

# UNRELEASED

* AADAuthenticationMethodPolicyAuthenticator
* Deprecated the NumberMatchingRequiredState Feature Setting.
FIXES [#3406](https://github.com/microsoft/Microsoft365DSC/issues/3406)
* EXOAvailabilityConfig
* Fixes an error where an error was thrown when the OrgWideAccount wasn't set.
FIXES [#3402](https://github.com/microsoft/Microsoft365DSC/issues/3402)
Expand Down
106 changes: 30 additions & 76 deletions ...henticationMethodPolicyAuthenticator/MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,58 +242,6 @@ function Get-TargetResource
$complexDisplayLocationInformationRequiredState = $null
}
$complexFeatureSettings.Add('DisplayLocationInformationRequiredState', $complexDisplayLocationInformationRequiredState)
$complexNumberMatchingRequiredState = @{}
$complexExcludeTarget = @{}
if ($getValue.additionalProperties.featureSettings.numberMatchingRequiredState.excludeTarget.id -notmatch 'all_users|00000000-0000-0000-0000-000000000000')
{
$myExcludeTargetsDisplayName = Get-MgGroup -GroupId $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.excludeTarget.id
$complexExcludeTarget.Add('Id', $myExcludeTargetsDisplayName.DisplayName)
}
else
{
$complexExcludeTarget.Add('Id', $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.excludeTarget.id)
}
if ($null -ne $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.excludeTarget.targetType)
{
$complexExcludeTarget.Add('TargetType', $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.excludeTarget.targetType.toString())
}
if ($complexExcludeTarget.values.Where({ $null -ne $_ }).count -eq 0)
{
$complexExcludeTarget = $null
}
$complexNumberMatchingRequiredState.Add('ExcludeTarget', $complexExcludeTarget)
$complexIncludeTarget = @{}
if ($getValue.additionalProperties.featureSettings.numberMatchingRequiredState.includeTarget.id -notmatch 'all_users|00000000-0000-0000-0000-000000000000')
{
$myIncludeTargetsDisplayName = Get-MgGroup -GroupId $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.includeTarget.id
$complexIncludeTarget.Add('Id', $myIncludeTargetsDisplayName.DisplayName)
}
else
{
$complexIncludeTarget.Add('Id', $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.includeTarget.id)
}
if ($null -ne $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.includeTarget.targetType)
{
$complexIncludeTarget.Add('TargetType', $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.includeTarget.targetType.toString())
}
if ($complexIncludeTarget.values.Where({ $null -ne $_ }).count -eq 0)
{
$complexIncludeTarget = $null
}
$complexNumberMatchingRequiredState.Add('IncludeTarget', $complexIncludeTarget)
if ($null -ne $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.state)
{
$complexNumberMatchingRequiredState.Add('State', $getValue.additionalProperties.featureSettings.numberMatchingRequiredState.state.toString())
}
if ($complexNumberMatchingRequiredState.values.Where({ $null -ne $_ }).count -eq 0)
{
$complexNumberMatchingRequiredState = $null
}
$complexFeatureSettings.Add('NumberMatchingRequiredState', $complexNumberMatchingRequiredState)
if ($complexFeatureSettings.values.Where({ $null -ne $_ }).count -eq 0)
{
$complexFeatureSettings = $null
}

$complexExcludeTargets = @()
foreach ($currentExcludeTargets in $getValue.excludeTargets)
Expand Down Expand Up @@ -499,15 +447,12 @@ function Set-TargetResource
$groupid = (Get-MgGroup -Filter $Filter).id.ToString()
$CreateParameters.featureSettings.displayLocationInformationRequiredState.excludeTarget.foreach('id',$groupid)
}
if ($CreateParameters.featureSettings.numberMatchingRequiredState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
$Filter = "Displayname eq '$($CreateParameters.featureSettings.numberMatchingRequiredState.includeTarget.id)'" | Out-String
$groupid = (Get-MgGroup -Filter $Filter).id.ToString()
$CreateParameters.featureSettings.numberMatchingRequiredState.includeTarget.foreach('id',$groupid)
}
if ($CreateParameters.featureSettings.numberMatchingRequiredState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
$Filter = "Displayname eq '$($CreateParameters.featureSettings.numberMatchingRequiredState.excludeTarget.id)'" | Out-String
$groupid = (Get-MgGroup -Filter $Filter).id.ToString()
$CreateParameters.featureSettings.numberMatchingRequiredState.excludeTarget.foreach('id',$groupid)

# DEPRECATED
if ($CreateParameters.featureSettings.ContainsKey('NumberMatchingRequiredState'))
{
Write-Verbose -Message "The NumberMatchingRequiredState feature is deprecated and will be ignored. Please remove it from your configuration."
$CreateParameters.featureSettings.Remove('NumberMatchingRequiredState')
}

$keys = (([Hashtable]$CreateParameters).clone()).Keys
Expand Down Expand Up @@ -558,45 +503,54 @@ function Set-TargetResource

$UpdateParameters.Remove('Id') | Out-Null
# replace group Displayname with group id
if ($UpdateParameters.featureSettings.companionAppAllowedState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
if ($UpdateParameters.featureSettings.companionAppAllowedState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users' -and
$UpdateParameters.featureSettings.ContainsKey('companionAppAllowedState'))
{
$Filter = "Displayname eq '$($UpdateParameters.featureSettings.companionAppAllowedState.includeTarget.id)'" | Out-String
$groupid = (Get-MgGroup -Filter $Filter).id.ToString()
$UpdateParameters.featureSettings.companionAppAllowedState.includeTarget.foreach('id',$groupid)
}
if ($UpdateParameters.featureSettings.companionAppAllowedState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
if ($UpdateParameters.featureSettings.companionAppAllowedState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users' -and
$UpdateParameters.featureSettings.ContainsKey('companionAppAllowedState'))
{
$Filter = "Displayname eq '$($UpdateParameters.featureSettings.companionAppAllowedState.excludeTarget.id)'" | Out-String
$groupid = (Get-MgGroup -Filter $Filter).id.ToString()
$UpdateParameters.featureSettings.companionAppAllowedState.excludeTarget.foreach('id',$groupid)
}
if ($UpdateParametrs.featureSettings.displayAppInformationRequiredState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
if ($UpdateParameters.featureSettings.displayAppInformationRequiredState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users' -and
$UpdateParameters.featureSettings.ContainsKey('displayAppInformationRequiredState'))
{
$Filter = "Displayname eq '$($UpdateParameters.featureSettings.displayAppInformationRequiredState.includeTarget.id)'" | Out-String
$groupid = (Get-MgGroup -Filter $Filter).id.ToString()
$UpdateParameters.featureSettings.displayAppInformationRequiredState.includeTarget.foreach('id',$groupid)
}
if ($UpdateParameters.featureSettings.displayAppInformationRequiredState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
if ($UpdateParameters.featureSettings.displayAppInformationRequiredState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users' -and
$UpdateParameters.featureSettings.ContainsKey('displayAppInformationRequiredState'))
{
$Filter = "Displayname eq '$($UpdateParameters.featureSettings.displayAppInformationRequiredState.excludeTarget.id)'" | Out-String
$groupid = (Get-MgGroup -Filter $Filter).id.ToString()
$UpdateParameters.featureSettings.displayAppInformationRequiredState.excludeTarget.foreach('id',$groupid)
}
if ($UpdateParameters.featureSettings.displayLocationInformationRequiredState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
if ($UpdateParameters.featureSettings.displayLocationInformationRequiredState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users' -and
$UpdateParameters.featureSettings.ContainsKey('displayLocationInformationRequiredState'))
{
$Filter = "Displayname eq '$($UpdateParameters.featureSettings.displayLocationInformationRequiredState.includeTarget.id)'" | Out-String
$groupid = (Get-MgGroup -Filter $Filter).id.ToString()
$UpdateParameters.featureSettings.displayLocationInformationRequiredState.includeTarget.foreach('id',$groupid)
}
if ($UpdateParameters.featureSettings.displayLocationInformationRequiredState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
if ($UpdateParameters.featureSettings.displayLocationInformationRequiredState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users' -and
$UpdateParameters.featureSettings.ContainsKey('displayLocationInformationRequiredState'))
{
$Filter = "Displayname eq '$($UpdateParameters.featureSettings.displayLocationInformationRequiredState.excludeTarget.id)'" | Out-String
$groupid = (Get-MgGroup -Filter $Filter).id.ToString()
$UpdateParameters.featureSettings.displayLocationInformationRequiredState.excludeTarget.foreach('id',$groupid)
}
if ($UpdateParameters.featureSettings.numberMatchingRequiredState.includeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
$Filter = "Displayname eq '$($UpdateParameters.featureSettings.numberMatchingRequiredState.includeTarget.id)'" | Out-String
$groupid = (Get-MgGroup -Filter $Filter).id.ToString()
$UpdateParameters.featureSettings.numberMatchingRequiredState.includeTarget.foreach('id',$groupid)
}
if ($UpdateParameters.featureSettings.numberMatchingRequiredState.excludeTarget.id -notmatch '00000000-0000-0000-0000-000000000000|all_users'){
$Filter = "Displayname eq '$($UpdateParameters.featureSettings.numberMatchingRequiredState.excludeTarget.id)'" | Out-String
$groupid = (Get-MgGroup -Filter $Filter).id.ToString()
$UpdateParameters.featureSettings.numberMatchingRequiredState.excludeTarget.foreach('id',$groupid)

# DEPRECATED
if ($UpdateParameters.featureSettings.ContainsKey('NumberMatchingRequiredState'))
{
Write-Verbose -Message "The NumberMatchingRequiredState feature is deprecated and will be ignored. Please remove it from your configuration."
$UpdateParameters.featureSettings.Remove('NumberMatchingRequiredState')
}

$keys = (([Hashtable]$UpdateParameters).clone()).Keys
Expand Down
77 changes: 0 additions & 77 deletions ...Unit/Microsoft365DSC/Microsoft365DSC.AADAuthenticationMethodPolicyAuthenticator.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
id = 'Fakegroup'
} -ClientOnly)
} -ClientOnly)
numberMatchingRequiredState = (New-CimInstance -ClassName MSFT_MicrosoftGraphauthenticationMethodFeatureConfiguration -Property @{
state = 'default'
includeTarget = (New-CimInstance -ClassName MSFT_AADAuthenticationMethodPolicyAuthenticatorFeatureTarget -Property @{
targetType = 'group'
id = 'Fakegroup'
} -ClientOnly)
excludeTarget = (New-CimInstance -ClassName MSFT_AADAuthenticationMethodPolicyAuthenticatorFeatureTarget -Property @{
targetType = 'group'
id = 'Fakegroup'
} -ClientOnly)
} -ClientOnly)
} -ClientOnly)
Id = 'MicrosoftAuthenticator'
isSoftwareOathEnabled = $True
Expand Down Expand Up @@ -191,17 +180,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
id = 'Fakegroup'
} -ClientOnly)
} -ClientOnly)
numberMatchingRequiredState = (New-CimInstance -ClassName MSFT_MicrosoftGraphauthenticationMethodFeatureConfiguration -Property @{
state = 'default'
includeTarget = (New-CimInstance -ClassName MSFT_AADAuthenticationMethodPolicyAuthenticatorFeatureTarget -Property @{
targetType = 'group'
id = 'Fakegroup'
} -ClientOnly)
excludeTarget = (New-CimInstance -ClassName MSFT_AADAuthenticationMethodPolicyAuthenticatorFeatureTarget -Property @{
targetType = 'group'
id = 'Fakegroup'
} -ClientOnly)
} -ClientOnly)
} -ClientOnly)
Id = 'MicrosoftAuthenticator'
isSoftwareOathEnabled = $True
Expand Down Expand Up @@ -343,17 +321,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
id = 'Fakegroup'
} -ClientOnly)
} -ClientOnly)
numberMatchingRequiredState = (New-CimInstance -ClassName MSFT_MicrosoftGraphauthenticationMethodFeatureConfiguration -Property @{
state = 'default'
includeTarget = (New-CimInstance -ClassName MSFT_AADAuthenticationMethodPolicyAuthenticatorFeatureTarget -Property @{
targetType = 'group'
id = 'Fakegroup'
} -ClientOnly)
excludeTarget = (New-CimInstance -ClassName MSFT_AADAuthenticationMethodPolicyAuthenticatorFeatureTarget -Property @{
targetType = 'group'
id = 'Fakegroup'
} -ClientOnly)
} -ClientOnly)
} -ClientOnly)
Id = 'MicrosoftAuthenticator'
isSoftwareOathEnabled = $True
Expand Down Expand Up @@ -412,17 +379,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
id = 'Fakegroup'
}
}
numberMatchingRequiredState = @{
state = 'default'
includeTarget = @{
targetType = 'group'
id = 'Fakegroup'
}
excludeTarget = @{
targetType = 'group'
id = 'Fakegroup'
}
}
}
'@odata.type' = '#microsoft.graph.microsoftAuthenticatorAuthenticationMethodConfiguration'
isSoftwareOathEnabled = $True
Expand Down Expand Up @@ -495,17 +451,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
id = 'Fakegroup'
} -ClientOnly)
} -ClientOnly)
numberMatchingRequiredState = (New-CimInstance -ClassName MSFT_MicrosoftGraphauthenticationMethodFeatureConfiguration -Property @{
state = 'default'
includeTarget = (New-CimInstance -ClassName MSFT_AADAuthenticationMethodPolicyAuthenticatorFeatureTarget -Property @{
targetType = 'group'
id = 'Fakegroup'
} -ClientOnly)
excludeTarget = (New-CimInstance -ClassName MSFT_AADAuthenticationMethodPolicyAuthenticatorFeatureTarget -Property @{
targetType = 'group'
id = 'Fakegroup'
} -ClientOnly)
} -ClientOnly)
} -ClientOnly)
Id = 'MicrosoftAuthenticator'
isSoftwareOathEnabled = $True
Expand Down Expand Up @@ -565,17 +510,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
id = 'Fakegroup'
}
}
numberMatchingRequiredState = @{
state = 'default'
includeTarget = @{
targetType = 'group'
id = 'Fakegroup'
}
excludeTarget = @{
targetType = 'group'
id = 'Fakegroup'
}
}
}
}
ExcludeTargets = @(
Expand Down Expand Up @@ -655,17 +589,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
id = 'Fakegroup'
}
}
numberMatchingRequiredState = @{
state = 'default'
includeTarget = @{
targetType = 'group'
id = 'Fakegroup'
}
excludeTarget = @{
targetType = 'group'
id = 'Fakegroup'
}
}
}
'@odata.type' = '#microsoft.graph.microsoftAuthenticatorAuthenticationMethodConfiguration'
isSoftwareOathEnabled = $True
Expand Down