Merge pull request #2642 from NikCharlebois/FIXES-#2597

Fixes #2597
microsoft · Dec 8, 2022 · b00c668 · b00c668
2 parents 572b2d3 + dc20b86
commit b00c668
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 # UNRELEASED
 
+* AADGroup
+  * Fixes an issue where licenses aren't properly assigned when no existing licenses exist.
+    FIXES [#2597](https://github.com/microsoft/Microsoft365DSC/issues/2597)
 * AADServicePrincipal
   * Fixes an issue where the service principals weren't created or updated when using ApplicationSecret to authenticate.
     FIXES [#2615](https://github.com/microsoft/Microsoft365DSC/issues/2615)

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroup/MSFT_AADGroup.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroup/MSFT_AADGroup.psm1
@@ -1178,7 +1178,7 @@ function Get-M365DSCCombinedLicenses
     {
         foreach ($license in $DesiredLicenses)
         {
-            if (-not $result.SkuId.Contains($license.SkuId))
+            if ($result.Length -eq 0)
             {
                 $result += @{
                     SkuId         = $license.SkuId
@@ -1187,12 +1187,22 @@ function Get-M365DSCCombinedLicenses
             }
             else
             {
-                #Set the Desired Disabled Plans if the sku is already added to the list
-                foreach ($item in $result)
+                if (-not $result.SkuId.Contains($license.SkuId))
                 {
-                    if ($item.SkuId -eq $license.SkuId)
+                    $result += @{
+                        SkuId         = $license.SkuId
+                        DisabledPlans = $license.DisabledPlans
+                    }
+                }
+                else
+                {
+                    #Set the Desired Disabled Plans if the sku is already added to the list
+                    foreach ($item in $result)
                     {
-                        $item.DisabledPlans = $license.DisabledPlans
+                        if ($item.SkuId -eq $license.SkuId)
+                        {
+                            $item.DisabledPlans = $license.DisabledPlans
+                        }
                     }
                 }
             }