Merge pull request #2154 from NikCharlebois/Fix#2151

AADConditionalAccessPolicy: Fixes #2151
microsoft · Jul 29, 2022 · c2b0259 · c2b0259
2 parents 3678370 + 7cf129b
commit c2b0259
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 * AADConditionalAccessPolicy
   * DEPRECATED then IncludeDevices and ExcludeDevices parameters.
+  * Fixed issue extracting a policy that had invalid users or groups (deleted from AAD).
+  FIXES [#2151](https://github.com/microsoft/Microsoft365DSC/issues/2151)
 
 # 1.22.727.1
 

diff --git a/...t365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1 b/...t365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1
@@ -253,7 +253,7 @@ function Get-TargetResource
                     $IncludeUser = $null
                     try
                     {
-                        $IncludeUser = (Get-MgUser -UserId $IncludeUserGUID).userprincipalname
+                        $IncludeUser = (Get-MgUser -UserId $IncludeUserGUID -ErrorAction Stop).userprincipalname
                     }
                     catch
                     {
@@ -302,7 +302,7 @@ function Get-TargetResource
                     $ExcludeUser = $null
                     try
                     {
-                        $ExcludeUser = (Get-MgUser -UserId $ExcludeUserGUID).userprincipalname
+                        $ExcludeUser = (Get-MgUser -UserId $ExcludeUserGUID -ErrorAction Stop).userprincipalname
                     }
                     catch
                     {
@@ -2034,13 +2034,13 @@ function Export-TargetResource
                 $Results = Get-TargetResource @Params
 
                 #DEPRECATED
-                if ($Results.IncludeDevices.Length -gt 0)
+                if ($Results.IncludeDevices)
                 {
                     Write-Host "`r`n    $($Global:M365DSCEmojiYellowCircle) The Include Devices parameter is deprecated. Instead use the Device Filter Mode and Device Filter Rule parameters in the portal."
                     $Results.Remove("IncludeDevices") | Out-Null
                 }
                 #DEPRECATED
-                if ($Results.ExcludeDevices.Length -gt 0)
+                if ($Results.ExcludeDevices)
                 {
                     Write-Host "`r`n    $($Global:M365DSCEmojiYellowCircle) The Exclude Devices parameter is deprecated. Instead use the Device Filter Mode and Device Filter Rule parameters in the portal."
                     $Results.Remove("ExcludeDevices") | Out-Null