Merge pull request #5642 from NikCharlebois/AADDeviceRegistrationPolicy

Fixes issues when trying to disable AAD join
microsoft · Jan 16, 2025 · 129fc89 · 129fc89
2 parents 90942ce + f813308
commit 129fc89
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 # UNRELEASED
 
+* AADDeviceRegistrationPolicy
+  * Fixes an error when trying to disable AAD join.
 * FabricAdminTenantSettings
   * Added support for the AllowGetOneLakeUDK, AllowMountDfCreation, AllowOneLakeUDK,
     ArtifactOrgAppPreview properties.

diff --git a/...65DSC/DSCResources/MSFT_AADDeviceRegistrationPolicy/MSFT_AADDeviceRegistrationPolicy.psm1 b/...65DSC/DSCResources/MSFT_AADDeviceRegistrationPolicy/MSFT_AADDeviceRegistrationPolicy.psm1
@@ -352,23 +352,23 @@ function Set-TargetResource
     }
 
     $azureADRegistrationAllowedToRegister = '#microsoft.graph.noDeviceRegistrationMembership'
-    if ($AzureAdJoinLocalAdminsRegisteringMode -eq 'All')
+    if ($AzureADAllowedToJoin -eq 'All')
     {
         $azureADRegistrationAllowedToRegister = '#microsoft.graph.allDeviceRegistrationMembership'
     }
-    elseif ($AzureAdJoinLocalAdminsRegisteringMode -eq 'Selected')
+    elseif ($AzureADAllowedToJoin -eq 'Selected')
     {
         $azureADRegistrationAllowedToRegister = '#microsoft.graph.enumeratedDeviceRegistrationMembership'
 
         $azureADRegistrationAllowedUsers = @()
-        foreach ($user in $AzureAdJoinLocalAdminsRegisteringUsers)
+        foreach ($user in $AzureADAllowedToJoinUsers)
         {
             $userInfo = Get-MgUser -UserId $user
             $azureADRegistrationAllowedUsers += $userInfo.Id
         }
 
         $azureADRegistrationAllowedGroups = @()
-        foreach ($group in $AzureAdJoinLocalAdminsRegisteringGroups)
+        foreach ($group in $AzureADAllowedToJoinGroups)
         {
             $groupInfo = Get-MgGroup -Filter "DisplayName eq '$group'"
             $azureADRegistrationAllowedGroups += $groupInfo.Id