Fixes microsoft#2576

NikCharlebois · Nov 22, 2022 · 623643f · 623643f
1 parent 3fd5c31
commit 623643f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@
 * AADUser
   * Fixed issue with license assignment
     FIXES [#2556](https://github.com/microsoft/Microsoft365DSC/issues/2556)
+* EXOOrganizationRelationship
+  * Add 'None' as supported value for MailboxMoveCapability
+    FIXES [#2570](https://github.com/microsoft/Microsoft365DSC/issues/2570)
 * IntuneRoledefinition
   * Initial Release
   * Manage Intune Role definition
@@ -26,9 +29,9 @@
 * SCRetentionComplianceRule
   * Fixes issue with Teams Policy where the RetentionDurationDisplayHint and ExpirationDateOption parameters weren't returned by the Get- function.
     FIXES [#2472](https://github.com/microsoft/Microsoft365DSC/issues/2472)
-* EXOOrganizationRelationship
-  * Add 'None' as supported value for MailboxMoveCapability
-    FIXES [#2570](https://github.com/microsoft/Microsoft365DSC/issues/2570)
+* TeamsFederationConfiguration
+  * Fixes an issue where the extraction of allowed domain and blocked domain wasn't in the proper format.
+    FIXES [#2576](https://github.com/microsoft/Microsoft365DSC/issues/2576)
 * DEPENDENCIES
   * Updated Microsoft.Graph.* to version 1.17.0;
   * Updated MSCloudLoginAssistant to version 1.0.98;

diff --git a/...DSC/DSCResources/MSFT_TeamsFederationConfiguration/MSFT_TeamsFederationConfiguration.psm1 b/...DSC/DSCResources/MSFT_TeamsFederationConfiguration/MSFT_TeamsFederationConfiguration.psm1
@@ -71,10 +71,32 @@ function Get-TargetResource
     {
         $config = Get-CsTenantFederationConfiguration -ErrorAction Stop
 
+        $AllowedDomainsArray = $config.AllowedDomains.AllowedDomain.Domain
+        $AllowedDomainsValues = @()
+
+        if ($AllowedDomainsArray.Length -gt 0)
+        {
+            foreach ($domain in $AllowedDomainsArray)
+            {
+                $AllowedDomainsValues += $domain
+            }
+        }
+
+        $BlockedDomainsArray = $config.BlockedDomains.Domain
+        $BlockedDomainsValues = @()
+
+        if ($BlockedDomainsArray.Length -gt 0)
+        {
+            foreach ($domain in $BlockedDomainsArray)
+            {
+                $BlockedDomainsValues += $domain
+            }
+        }
+
         return @{
             Identity                  = $Identity
-            AllowedDomains            = [System.String[]]$config.AllowedDomains
-            BlockedDomains            = [System.String[]]$config.BlockedDomains
+            AllowedDomains            = $AllowedDomainsValues
+            BlockedDomains            = $BlockedDomainsValues
             AllowFederatedUsers       = $config.AllowFederatedUsers
             AllowPublicUsers          = $config.AllowPublicUsers
             AllowTeamsConsumer        = $config.AllowTeamsConsumer