From aec3b2e178c94de5803142a9d20377528e56955d Mon Sep 17 00:00:00 2001
From: Fabien Tschanz <fabien.tschanz@mobi.ch>
Date: Tue, 4 Feb 2025 13:57:37 +0100
Subject: [PATCH] Update authentication properties

---
 CHANGELOG.md                                  |  5 +-
 .../MSFT_EXOSmtpDaneInbound.psm1              | 81 +++++++++++++++----
 2 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ae55c46d2..571efd4a35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,11 @@
 
 * AADConditionalAccessPolicy
   * Changed the InsiderRiskTypes property to a string array.
+* EXOSmtpDaneInbound
+  * Updated authentication properties to align with MOF definition.
+    FIXES [#5709](https://github.com/microsoft/Microsoft365DSC/issues/5709)
 * MISC
-  * Changed the CIMInstance logic of various resources to us common logic.
+  * Changed the CIMInstance logic of various resources to use common logic.
 
 # 1.25.129.3
 
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSmtpDaneInbound/MSFT_EXOSmtpDaneInbound.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSmtpDaneInbound/MSFT_EXOSmtpDaneInbound.psm1
index 8383f481c3..e82804d280 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSmtpDaneInbound/MSFT_EXOSmtpDaneInbound.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSmtpDaneInbound/MSFT_EXOSmtpDaneInbound.psm1
@@ -29,9 +29,21 @@ function Get-TargetResource
         [System.String]
         $CertificateThumbprint,
 
+        [Parameter()]
+        [System.String]
+        $CertificatePath,
+
         [Parameter()]
         [System.Management.Automation.PSCredential]
-        $ApplicationSecret
+        $CertificatePassword,
+
+        [Parameter()]
+        [Switch]
+        $ManagedIdentity,
+
+        [Parameter()]
+        [System.String[]]
+        $AccessTokens
     )
 
     New-M365DSCConnection -Workload 'ExchangeOnline' `
@@ -65,9 +77,12 @@ function Get-TargetResource
             Ensure                = 'Present'
             Credential            = $Credential
             ApplicationId         = $ApplicationId
-            TenantId              = $TenantId
             CertificateThumbprint = $CertificateThumbprint
-            ApplicationSecret     = $ApplicationSecret
+            CertificatePath       = $CertificatePath
+            CertificatePassword   = $CertificatePassword
+            Managedidentity       = $ManagedIdentity.IsPresent
+            TenantId              = $TenantId
+            AccessTokens          = $AccessTokens
         }
         return [System.Collections.Hashtable] $results
     }
@@ -113,9 +128,21 @@ function Set-TargetResource
         [System.String]
         $CertificateThumbprint,
 
+        [Parameter()]
+        [System.String]
+        $CertificatePath,
+
         [Parameter()]
         [System.Management.Automation.PSCredential]
-        $ApplicationSecret
+        $CertificatePassword,
+
+        [Parameter()]
+        [Switch]
+        $ManagedIdentity,
+
+        [Parameter()]
+        [System.String[]]
+        $AccessTokens
     )
 
     New-M365DSCConnection -Workload 'ExchangeOnline' `
@@ -188,9 +215,21 @@ function Test-TargetResource
         [System.String]
         $CertificateThumbprint,
 
+        [Parameter()]
+        [System.String]
+        $CertificatePath,
+
         [Parameter()]
         [System.Management.Automation.PSCredential]
-        $ApplicationSecret
+        $CertificatePassword,
+
+        [Parameter()]
+        [Switch]
+        $ManagedIdentity,
+
+        [Parameter()]
+        [System.String[]]
+        $AccessTokens
     )
 
     #Ensure the proper dependencies are installed in the current environment.
@@ -243,16 +282,24 @@ function Export-TargetResource
         $TenantId,
 
         [Parameter()]
-        [System.Management.Automation.PSCredential]
-        $ApplicationSecret,
+        [System.String]
+        $CertificateThumbprint,
 
         [Parameter()]
         [System.String]
-        $CertificateThumbprint,
+        $CertificatePath,
+
+        [Parameter()]
+        [System.Management.Automation.PSCredential]
+        $CertificatePassword,
 
         [Parameter()]
         [Switch]
-        $ManagedIdentity
+        $ManagedIdentity,
+
+        [Parameter()]
+        [System.String[]]
+        $AccessTokens
     )
 
    $ConnectionMode = New-M365DSCConnection -Workload 'ExchangeOnline' `
@@ -298,14 +345,16 @@ function Export-TargetResource
             }
             Write-Host "    |---[$i/$($getValue.Count)] $displayedKey" -NoNewline
             $params = @{
-                DomainName = $config.DomainName
-                Ensure = 'Present'
-                Credential = $Credential
-                ApplicationId = $ApplicationId
-                TenantId = $TenantId
+                DomainName            = $config.DomainName
+                Ensure                = 'Present'
+                Credential            = $Credential
+                ApplicationId         = $ApplicationId
                 CertificateThumbprint = $CertificateThumbprint
-                ApplicationSecret = $ApplicationSecret
-
+                CertificatePath       = $CertificatePath
+                CertificatePassword   = $CertificatePassword
+                Managedidentity       = $ManagedIdentity.IsPresent
+                TenantId              = $TenantId
+                AccessTokens          = $AccessTokens
             }
 
             $Results = Get-TargetResource @Params