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

Fix #5742: Ensure TermsOfUse is an array in AADConditionalAccessPolicy #5772

Merged
merged 11 commits into from
Feb 26, 2025
Merged

Fix #5742: Ensure TermsOfUse is an array in AADConditionalAccessPolicy #5772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e3e2353
Fix #5742: Ensure TermsOfUse is an array in AADConditionalAccessPolicy
Pranaykarvi Feb 14, 2025
331519e
Update MSFT_AADConditionalAccessPolicy.psm1
Pranaykarvi Feb 17, 2025
51e81e6
Merge branch 'microsoft:Dev' into fix-terms-of-use-array
Pranaykarvi Feb 17, 2025
6fbba5b
Update CHANGELOG.md
Pranaykarvi Feb 17, 2025
275334b
Update CHANGELOG.md
Pranaykarvi Feb 17, 2025
0cfb696
Update CHANGELOG.md
Pranaykarvi Feb 17, 2025
f0c30f6
Update CHANGELOG.md
Pranaykarvi Feb 17, 2025
962ee65
Update CHANGELOG.md
Pranaykarvi Feb 17, 2025
ffd6d23
Update CHANGELOG.md
Pranaykarvi Feb 25, 2025
0483c6f
Update CHANGELOG.md
Pranaykarvi Feb 25, 2025
86c4fdb
Merge branch 'Dev' into fix-terms-of-use-array
NikCharlebois Feb 26, 2025
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

* AADConditionalAccessPolicy
* Fixed an issue where `TermsOfUse` was not passed as an array, causing failures in GCC-High environments.
FIXES [#5742](https://github.com/microsoft/Microsoft365DSC/issues/5742)
* AADPasswordRuleSettings
* Updated schema to only accept values 'Enforced' and 'Audit' for parameter BannedPasswordCheckOnPremisesMode
* IntuneDeviceCompliancePolicyWindows10
Expand Down
13 changes: 7 additions & 6 deletions ...t365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1778,12 +1778,13 @@ function Set-TargetResource
}
}

if ($TermsOfUse)
{
Write-Verbose -Message "Gettign Terms of Use {$TermsOfUse}"
$TermsOfUseObj = Get-MgBetaAgreement | Where-Object -FilterScript { $_.DisplayName -eq $TermsOfUse }
$GrantControls.Add('termsOfUse', $TermsOfUseObj.Id)
}
if ($TermsOfUse)
{
Write-Verbose -Message "Getting Terms of Use {$TermsOfUse}"
$TermsOfUseObj = Get-MgBetaAgreement | Where-Object -FilterScript { $_.DisplayName -eq $TermsOfUse }
$GrantControls.Add('termsOfUse', @($TermsOfUseObj.Id))
}


#no translation or conversion needed
Write-Verbose -Message 'Set-Targetresource: Adding processed grant controls'
Expand Down