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 BadRequest error when trying to remove AADUser group memberships #5418

Open
wants to merge 6 commits into
base: Dev
Choose a base branch
from
+10 −5
Open

fix BadRequest error when trying to remove AADUser group memberships #5418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7421573
fix invalid filter clause with unterminated string literal when tryin…
snunezMSFT Nov 18, 2024
7ece0df
fic BadRequest, Invalid filter clause, unterminated string literal wh…
snunezMSFT Nov 18, 2024
a6666e9
fix BadRequest: Invalid filter clause, unterminated string literal wh…
snunezMSFT Nov 18, 2024
7883047
fix also the case where you need to add membership for an existing user
snunezMSFT Nov 19, 2024
7e7f403
Changelog updated to include the change in this PR
snunezMSFT Nov 19, 2024
399326f
Using $userId for User.Id when changing role and group membership in …
snunezMSFT Nov 20, 2024
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 @@ -15,6 +15,9 @@
* Initial release.
* M365DSCDRGUtil
* Improve CIM instance detection for specific Intune resources.
* AADUser
* Fixed issue updating user group membership when looking for the group by DisplayName.
* Fixed missing User Id when changing group membership in Set-TargetResource function.

# 1.24.1113.1

Expand Down
12 changes: 7 additions & 5 deletions Modules/Microsoft365DSC/DSCResources/MSFT_AADUser/MSFT_AADUser.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ function Set-TargetResource

$CreationParams.Add('UserId', $UserPrincipalName)
Update-MgUser @CreationParams
$userId = (Get-MgUser -UserId $UserPrincipalName).Id
}
else
{
Expand Down Expand Up @@ -559,6 +560,7 @@ function Set-TargetResource
$CreationParams.Add('MailNickName', $UserPrincipalName.Split('@')[0])
Write-Verbose -Message "Creating new user with values: $(Convert-M365DscHashtableToString -Hashtable $CreationParams)"
$user = New-MgUser @CreationParams
$userId = $user.Id
}

#region Assign Licenses
Expand Down Expand Up @@ -611,14 +613,14 @@ function Set-TargetResource

throw "Cannot add user $UserPrincipalName to group '$memberOfGroup' because it is a dynamic group"
}
New-MgGroupMember -GroupId $group.Id -DirectoryObjectId $user.Id
New-MgGroupMember -GroupId $group.Id -DirectoryObjectId $userId
}
}
else
{
# user is a member of some groups, ensure that user is only a member of groups listed in MemberOf
Compare-Object -ReferenceObject $MemberOf -DifferenceObject $user.MemberOf | ForEach-Object {
$group = Get-MgGroup -Filter "DisplayName eq '$($_.InputObject)" -Property Id, GroupTypes
$group = Get-MgGroup -Filter "DisplayName eq '$($_.InputObject)'" -Property Id, GroupTypes
if ($_.SideIndicator -eq '<=')
{
# Group in MemberOf not present in groups that user is a member of, add user to group
Expand All @@ -642,13 +644,14 @@ function Set-TargetResource

throw "Cannot add user $UserPrincipalName to group '$($_.InputObject)' because it is a dynamic group"
}
New-MgGroupMember -GroupId $group.Id -DirectoryObjectId $user.Id
New-MgGroupMember -GroupId $group.Id -DirectoryObjectId $userId
}
else
{

# Group that user is a member of is not present in MemberOf, remove user from group
# (no need to test for dynamic groups as they are ignored in Get-TargetResource)
Remove-MgGroupMemberDirectoryObjectByRef -GroupId $group.Id -DirectoryObjectId $user.Id
Remove-MgGroupMemberDirectoryObjectByRef -GroupId $group.Id -DirectoryObjectId $userId
}
}
}
Expand All @@ -675,7 +678,6 @@ function Set-TargetResource
foreach ($roleDifference in $diffRoles)
{
$roleDefinitionId = (Get-MgBetaRoleManagementDirectoryRoleDefinition -Filter "DisplayName eq '$($roleDifference.InputObject)'").Id
$userId = (Get-MgUser -UserId $UserPrincipalName).Id

# Roles to remove
if ($roleDifference.SideIndicator -eq '=>')
Expand Down
Loading