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

Jump to bottom

fix: PermissionGrantPolicyIdsAssignedToDefaultUserRole #3595

Merged
merged 3 commits into from
Aug 23, 2023
Merged

fix: PermissionGrantPolicyIdsAssignedToDefaultUserRole #3595

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
c4e268d
fix: PermissionGrantPolicyIdsAssignedToDefaultUserRole to be compatib…
mibarm Aug 22, 2023
5bc7641
Merge branch 'dev' into fix/AADAuthorizationPolicy-PermissionGrantPol…
mibarm Aug 23, 2023
b86be44
add changelog
mibarm Aug 23, 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
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
* EXOSafeAttachmentPolicy
* Deprecated ActionOnError Parameter
FIXES [#3579](https://github.com/microsoft/Microsoft365DSC/issues/3579)

* AADAuthorizationPolicy
* Fix issue with property PermissionGrantPolicyIdsAssignedToDefaultUserRole
FIXES [#3594](https://github.com/microsoft/Microsoft365DSC/issues/3594)
* AADGroupsSettings
* Add support for enabling sensitivity labels in M365-groups
* O365OrgSettings
Expand Down
10 changes: 3 additions & 7 deletions ...Microsoft365DSC/DSCResources/MSFT_AADAuthorizationPolicy/MSFT_AADAuthorizationPolicy.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ function Get-TargetResource
DefaultUserRoleAllowedToReadOtherUsers = $Policy.DefaultUserRolePermissions.AllowedToReadOtherUsers
DefaultUserRoleAllowedToReadBitlockerKeysForOwnedDevice = $Policy.DefaultUserRolePermissions.AllowedToReadBitlockerKeysForOwnedDevice
DefaultUserRoleAllowedToCreateTenants = $Policy.DefaultUserRolePermissions.AllowedToCreateTenants
PermissionGrantPolicyIdsAssignedToDefaultUserRole = $Policy.DefaultUserRolePermissions.PermissionGrantPoliciesAssigned
PermissionGrantPolicyIdsAssignedToDefaultUserRole = $Policy.PermissionGrantPolicyIdsAssignedToDefaultUserRole
GuestUserRole = Get-GuestUserRoleNameFromId -GuestUserRoleId $Policy.GuestUserRoleId
Ensure = 'Present'
Credential = $Credential
Expand Down Expand Up @@ -325,12 +325,8 @@ function Set-TargetResource
{
if ($param -like 'Permission*')
{
#beta profile
#$UpdateParameters.Add($param, $currentParameters.$param)
#Write-Verbose -Message "Added '$param' to UpdateParameters"
#v1.0 profile
$defaultUserRolePermissions.Add('PermissionGrantPoliciesAssigned', $currentParameters.$param)
Write-Verbose -Message "Added 'PermissionGrantPoliciesAssigned' ($param) to defaultUserRolePermissions"
$UpdateParameters.Add($param, $currentParameters.$param)
Write-Verbose -Message "Added '$param' to UpdateParameters"
}
else
{
Expand Down
70 changes: 35 additions & 35 deletions Tests/Unit/Microsoft365DSC/Microsoft365DSC.AADAuthorizationPolicy.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,21 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
}
Mock -CommandName Get-MgBetaPolicyAuthorizationPolicy -MockWith {
$AADAuthPol = [pscustomobject]@{
Id = 'authorizationPolicy'
DisplayName = 'Authorization Policy'
Description = 'something'
allowedToSignUpEmailBasedSubscriptions = $true
allowedToUseSSPR = $true
allowEmailVerifiedUsersToJoinOrganization = $true
AllowInvitesFrom = 'Everyone'
blockMsolPowerShell = $false
defaultUserRolePermissions = [pscustomobject]@{
allowedToCreateApps = $true
allowedToCreateSecurityGroups = $true
allowedToReadOtherUsers = $true
PermissionGrantPoliciesAssigned = [string[]]@()
Id = 'authorizationPolicy'
DisplayName = 'Authorization Policy'
Description = 'something'
AllowedToSignUpEmailBasedSubscriptions = $true
AllowedToUseSspr = $true
AllowEmailVerifiedUsersToJoinOrganization = $true
AllowInvitesFrom = 'Everyone'
BlockMsolPowerShell = $false
PermissionGrantPolicyIdsAssignedToDefaultUserRole = [string[]]@()
DefaultUserRolePermissions = [pscustomobject]@{
AllowedToCreateApps = $true
AllowedToCreateSecurityGroups = $true
AllowedToReadOtherUsers = $true
}
GuestUserRoleId = '10dae51f-b6af-4016-8d66-8c2a99b929b3' # Guest
GuestUserRoleId = '10dae51f-b6af-4016-8d66-8c2a99b929b3' # Guest
}
return $AADAuthPol
}
Expand Down Expand Up @@ -129,21 +129,21 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {

Mock -CommandName Get-MgBetaPolicyAuthorizationPolicy -MockWith {
$AADAuthPol = [pscustomobject]@{
Id = 'authorizationPolicy'
DisplayName = 'Authorization Policy'
Description = 'something'
allowedToSignUpEmailBasedSubscriptions = $true
allowedToUseSSPR = $true
allowEmailVerifiedUsersToJoinOrganization = $true
AllowInvitesFrom = 'Everyone'
blockMsolPowerShell = $false
defaultUserRolePermissions = [pscustomobject]@{
Id = 'authorizationPolicy'
DisplayName = 'Authorization Policy'
Description = 'something'
allowedToSignUpEmailBasedSubscriptions = $true
allowedToUseSSPR = $true
allowEmailVerifiedUsersToJoinOrganization = $true
AllowInvitesFrom = 'Everyone'
blockMsolPowerShell = $false
PermissionGrantPolicyIdsAssignedToDefaultUserRole = [string[]]@()
defaultUserRolePermissions = [pscustomobject]@{
allowedToCreateApps = $true
allowedToCreateSecurityGroups = $true
allowedToReadOtherUsers = $true
PermissionGrantPoliciesAssigned = [string[]]@()
}
GuestUserRoleId = '10dae51f-b6af-4016-8d66-8c2a99b929b3' # Guest
GuestUserRoleId = '10dae51f-b6af-4016-8d66-8c2a99b929b3' # Guest
}
return $AADAuthPol
}
Expand Down Expand Up @@ -183,20 +183,20 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {

Mock -CommandName Get-MgBetaPolicyAuthorizationPolicy -MockWith {
$AADAuthPol = [pscustomobject]@{
DisplayName = 'Authorization Policy'
Description = 'something'
allowedToSignUpEmailBasedSubscriptions = $true
allowedToUseSSPR = $true
allowEmailVerifiedUsersToJoinOrganization = $true
AllowInvitesFrom = 'Everyone'
blockMsolPowerShell = $false
defaultUserRolePermissions = [pscustomobject]@{
DisplayName = 'Authorization Policy'
Description = 'something'
allowedToSignUpEmailBasedSubscriptions = $true
allowedToUseSSPR = $true
allowEmailVerifiedUsersToJoinOrganization = $true
AllowInvitesFrom = 'Everyone'
blockMsolPowerShell = $false
PermissionGrantPolicyIdsAssignedToDefaultUserRole = [string[]]@()
defaultUserRolePermissions = [pscustomobject]@{
allowedToCreateApps = $true
allowedToCreateSecurityGroups = $true
allowedToReadOtherUsers = $true
PermissionGrantPoliciesAssigned = [string[]]@()
}
GuestUserRoleId = '10dae51f-b6af-4016-8d66-8c2a99b929b3' # Guest
GuestUserRoleId = '10dae51f-b6af-4016-8d66-8c2a99b929b3' # Guest
}
return $AADAuthPol
}
Expand Down