Merge pull request #4897 from ricmestre/fix3960

IntuneDeviceConfigurationEmailProfilePolicyWindows10: Fix export
microsoft · Jul 17, 2024 · f585c37 · f585c37
2 parents 3a3fade + 8fbe693
commit f585c37
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,9 @@
 * EXOMessageClassification
   * Fix issue while creating policy for first time
     FIXES [#4877](https://github.com/microsoft/Microsoft365DSC/issues/4877)
+* IntuneDeviceConfigurationEmailProfilePolicyWindows10
+  * Fix export by fixing some typos and from where values are extracted
+    FIXES [#3960](https://github.com/microsoft/Microsoft365DSC/issues/3960)
 * IntuneDiskEncryptionWindows10
   * Initial Release
     FIXES [#4050](https://github.com/microsoft/Microsoft365DSC/issues/4050)

diff --git a/...mailProfilePolicyWindows10/MSFT_IntuneDeviceConfigurationEmailProfilePolicyWindows10.psm1 b/...mailProfilePolicyWindows10/MSFT_IntuneDeviceConfigurationEmailProfilePolicyWindows10.psm1
@@ -187,21 +187,21 @@ function Get-TargetResource
         }
 
         $enumUserDomainNameSource = $null
-        if ($null -ne $getValue.UserDomainNameSource)
+        if ($null -ne $getValue.AdditionalProperties.userDomainNameSource)
         {
-            $enumUserDomainNameSource = $getValue.UserDomainNameSource.ToString()
+            $enumUserDomainNameSource = $getValue.AdditionalProperties.userDomainNameSource.ToString()
         }
 
         $enumUsernameAADSource = $null
-        if ($null -ne $getValue.UsernameAADSource)
+        if ($null -ne $getValue.AdditionalProperties.usernameAADSource)
         {
-            $enumUsernameAADSource = $getValue.UsernameAADSource.ToString()
+            $enumUsernameAADSource = $getValue.AdditionalProperties.usernameAADSource.ToString()
         }
 
         $enumUsernameSource = $null
-        if ($null -ne $getValue.UsernameSource)
+        if ($null -ne $getValue.AdditionalProperties.usernameSource)
         {
-            $enumUsernameSource = $getValue.UsernameSource.ToString()
+            $enumUsernameSource = $getValue.AdditionalProperties.usernameSource.ToString()
         }
         #endregion
 
@@ -216,7 +216,7 @@ function Get-TargetResource
             SyncCalendar          = $getValue.AdditionalProperties.syncCalendar
             SyncContacts          = $getValue.AdditionalProperties.syncContacts
             SyncTasks             = $getValue.AdditionalProperties.syncTasks
-            CustomDomainName      = $getValue.CustomDomainName
+            CustomDomainName      = $getValue.AdditionalProperties.customDomainName
             UserDomainNameSource  = $enumUserDomainNameSource
             UsernameAADSource     = $enumUsernameAADSource
             UsernameSource        = $enumUsernameSource

diff --git a/...soft365DSC/Microsoft365DSC.IntuneDeviceConfigurationEmailProfilePolicyWindows10.Tests.ps1 b/...soft365DSC/Microsoft365DSC.IntuneDeviceConfigurationEmailProfilePolicyWindows10.Tests.ps1
@@ -127,15 +127,14 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                             emailAddressSource = "userPrincipalName"
                             durationOfEmailToSync = "userDefined"
                             syncCalendar = $True
+                            customDomainName = "FakeStringValue"
+                            userDomainNameSource = "fullDomainName"
+                            usernameAADSource = "userPrincipalName"
+                            usernameSource = "userPrincipalName"
                         }
-                        CustomDomainName = "FakeStringValue"
                         Description = "FakeStringValue"
                         DisplayName = "FakeStringValue"
                         Id = "FakeStringValue"
-                        UserDomainNameSource = "fullDomainName"
-                        UsernameAADSource = "userPrincipalName"
-                        UsernameSource = "userPrincipalName"
-
                     }
                 }
             }
@@ -189,15 +188,14 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                             emailAddressSource = "userPrincipalName"
                             durationOfEmailToSync = "userDefined"
                             syncCalendar = $True
+                            customDomainName = "FakeStringValue"
+                            userDomainNameSource = "fullDomainName"
+                            usernameAADSource = "userPrincipalName"
+                            usernameSource = "userPrincipalName"
                         }
-                        CustomDomainName = "FakeStringValue"
                         Description = "FakeStringValue"
                         DisplayName = "FakeStringValue"
                         Id = "FakeStringValue"
-                        UserDomainNameSource = "fullDomainName"
-                        UsernameAADSource = "userPrincipalName"
-                        UsernameSource = "userPrincipalName"
-
                     }
                 }
             }
@@ -240,14 +238,14 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                             emailSyncSchedule = "userDefined"
                             emailAddressSource = "userPrincipalName"
                             durationOfEmailToSync = "userDefined"
+                            customDomainName = "FakeStringValue"
+                            userDomainNameSource = "fullDomainName"
+                            usernameAADSource = "userPrincipalName"
+                            usernameSource = "userPrincipalName"
                         }
-                        CustomDomainName = "FakeStringValue"
                         Description = "FakeStringValue"
                         DisplayName = "FakeStringValue"
                         Id = "FakeStringValue"
-                        UserDomainNameSource = "fullDomainName"
-                        UsernameAADSource = "userPrincipalName"
-                        UsernameSource = "userPrincipalName"
                     }
                 }
             }
@@ -287,15 +285,14 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
                             emailAddressSource = "userPrincipalName"
                             durationOfEmailToSync = "userDefined"
                             syncCalendar = $True
+                            customDomainName = "FakeStringValue"
+                            userDomainNameSource = "fullDomainName"
+                            usernameAADSource = "userPrincipalName"
+                            usernameSource = "userPrincipalName"
                         }
-                        CustomDomainName = "FakeStringValue"
                         Description = "FakeStringValue"
                         DisplayName = "FakeStringValue"
                         Id = "FakeStringValue"
-                        UserDomainNameSource = "fullDomainName"
-                        UsernameAADSource = "userPrincipalName"
-                        UsernameSource = "userPrincipalName"
-
                     }
                 }
             }