Merge branch 'Dev' into fix/permissions

Author: FabienTschanz

CHANGELOG.md

@@ -18,6 +18,8 @@
 * IntuneDeviceCompliancePolicyAndroidDeviceOwner
   * Fixed an issue where a JSON serialization warning was outputted
     due to the object depth exceeding two levels.
+* O365OrgSettings
+  * Added `CertificatePath` with `CertificatePassword` as an authentication method.
 * TeamsChannel
   * Updated required permissions for read / update.
 * TeamsEmergencyCallRoutingPolicy

Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgSettings/MSFT_O365OrgSettings.psm1

@@ -142,6 +142,14 @@ function Get-TargetResource
         [System.String]
         $CertificateThumbprint,
 
+        [Parameter()]
+        [System.String]
+        $CertificatePath,
+
+        [Parameter()]
+        [System.Management.Automation.PSCredential]
+        $CertificatePassword,
+
         [Parameter()]
         [Switch]
         $ManagedIdentity,
@@ -193,6 +201,8 @@ function Get-TargetResource
         TenantId              = $TenantId
         ApplicationSecret     = $ApplicationSecret
         CertificateThumbprint = $CertificateThumbprint
+        CertificatePath       = $CertificatePath
+        CertificatePassword   = $CertificatePassword
         ManagedIdentity       = $ManagedIdentity.IsPresent
         AccessTokens          = $AccessTokens
     }
@@ -500,6 +510,14 @@ function Set-TargetResource
         [System.String]
         $CertificateThumbprint,
 
+        [Parameter()]
+        [System.String]
+        $CertificatePath,
+
+        [Parameter()]
+        [System.Management.Automation.PSCredential]
+        $CertificatePassword,
+
         [Parameter()]
         [Switch]
         $ManagedIdentity,
@@ -913,6 +931,14 @@ function Test-TargetResource
         [System.String]
         $CertificateThumbprint,
 
+        [Parameter()]
+        [System.String]
+        $CertificatePath,
+
+        [Parameter()]
+        [System.Management.Automation.PSCredential]
+        $CertificatePassword,
+
         [Parameter()]
         [Switch]
         $ManagedIdentity,
@@ -962,6 +988,14 @@ function Export-TargetResource
         [System.String]
         $CertificateThumbprint,
 
+        [Parameter()]
+        [System.String]
+        $CertificatePath,
+
+        [Parameter()]
+        [System.Management.Automation.PSCredential]
+        $CertificatePassword,
+
         [Parameter()]
         [Switch]
         $ManagedIdentity,
@@ -1000,6 +1034,8 @@ function Export-TargetResource
             TenantId              = $TenantId
             ApplicationSecret     = $ApplicationSecret
             CertificateThumbprint = $CertificateThumbprint
+            CertificatePath       = $CertificatePath
+            CertificatePassword   = $CertificatePassword
             ManagedIdentity       = $ManagedIdentity.IsPresent
             AccessTokens          = $AccessTokens
         }

Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgSettings/MSFT_O365OrgSettings.schema.mof

@@ -1,4 +1,4 @@
-[ClassVersion("1.0.0.1"), FriendlyName("O365OrgSettings")]
+[ClassVersion("1.0.0.2"), FriendlyName("O365OrgSettings")]
 class MSFT_O365OrgSettings : OMI_BaseResource
 {
     [Key, Description("Specifies the resource is a single instance, the value must be 'Yes'"), ValueMap{"Yes"}, Values{"Yes"}] String IsSingleInstance;
@@ -34,6 +34,8 @@ class MSFT_O365OrgSettings : OMI_BaseResource
     [Write, Description("Id of the Azure Active Directory tenant used for authentication.")] String TenantId;
     [Write, Description("Secret of the Azure Active Directory tenant used for authentication."), EmbeddedInstance("MSFT_Credential")] String ApplicationSecret;
     [Write, Description("Thumbprint of the Azure Active Directory application's authentication certificate to use for authentication.")] String CertificateThumbprint;
+    [Write, Description("Username can be made up to anything but password will be used for CertificatePassword"), EmbeddedInstance("MSFT_Credential")] String CertificatePassword;
+    [Write, Description("Path to certificate used in service principal usually a PFX file.")] String CertificatePath;
     [Write, Description("Managed ID being used for authentication.")] Boolean ManagedIdentity;
     [Write, Description("Access token used for authentication.")] String AccessTokens[];
 };

Modules/Microsoft365DSC/Modules/M365DSCReverse.psm1

@@ -618,7 +618,7 @@ function Start-M365DSCConfigurationExtract
         }
 
         # Retrieve the list of Workloads represented by the resources to export and pre-authenticate to each one;
-        if ($ResourcesToExport.Length -gt 0)
+        if ($ResourcesToExport.Count -gt 0)
         {
             $WorkloadsToConnectTo = Get-M365DSCConnectedWorkloadList -ResourceNames $ResourcesToExport
         }