Merge pull request #2084 from NikCharlebois/Fix-2009

Fixes 2009
microsoft · Jul 8, 2022 · 454cd33 · 454cd33
2 parents 231d046 + 9c5eddb
commit 454cd33
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 # UNRELEASED
 
+* IntuneAppProtectionPolicyiOS
+   * Fixed issue with creation a new policies where it was complaining about invalid minimum versions.
+   * Added the CustomBrowserProtocol paramters.
+     FIXES [#2009](https://github.com/microsoft/Microsoft365DSC/issues/2009)
 * SCComplianceTag
   * Fixed issue where FilePlanProperty was not properly applied unless another child property was also modified.
 * DEPENDENCIES

diff --git a/...DSC/DSCResources/MSFT_IntuneAppProtectionPolicyiOS/MSFT_IntuneAppProtectionPolicyiOS.psm1 b/...DSC/DSCResources/MSFT_IntuneAppProtectionPolicyiOS/MSFT_IntuneAppProtectionPolicyiOS.psm1
@@ -144,6 +144,10 @@ function Get-TargetResource
         [System.String[]]
         $ExcludedGroups,
 
+        [Parameter()]
+        [System.String]
+        $CustomBrowserProtocol,
+
         [Parameter(Mandatory = $true)]
         [System.String]
         [ValidateSet('Absent', 'Present')]
@@ -267,6 +271,7 @@ function Get-TargetResource
             AppDataEncryptionType                   = $policy.AppDataEncryptionType
             Assignments                             = $assignmentsArray
             ExcludedGroups                          = $exclusionArray
+            CustomBrowserProtocol                   = $policy.CustomBrowserProtocol
             Apps                                    = $appsArray
             Ensure                                  = "Present"
             Credential                              = $Credential
@@ -439,6 +444,10 @@ function Set-TargetResource
         [System.String[]]
         $ExcludedGroups,
 
+        [Parameter()]
+        [System.String]
+        $CustomBrowserProtocol,
+
         [Parameter(Mandatory = $true)]
         [System.String]
         [ValidateSet('Absent', 'Present')]
@@ -669,6 +678,10 @@ function Test-TargetResource
         [System.String[]]
         $ExcludedGroups,
 
+        [Parameter()]
+        [System.String]
+        $CustomBrowserProtocol,
+
         [Parameter(Mandatory = $true)]
         [System.String]
         [ValidateSet('Absent', 'Present')]
@@ -938,11 +951,39 @@ function Get-M365DSCIntuneAppProtectionPolicyiOSJSON
         "simplePinBlocked": $($Parameters.SimplePinBlocked.ToString().ToLower()),
         "minimumPinLength": $($Parameters.MinimumPinLength),
         "managedBrowser": "$($Parameters.ManagedBrowser)",
+"@
+    if ($Parameters.MinimumWarningAppVersion)
+    {
+        $JsonContent += @"
         "minimumRequiredAppVersion": "$($Parameters.MinimumWarningAppVersion)",
+"@
+    }
+    if ($Parameters.MinimumRequiredOsVersion)
+    {
+        $JsonContent += @"
         "minimumRequiredOsVersion": "$($Parameters.MinimumRequiredOsVersion)",
+"@
+    }
+    if ($Parameters.MinimumRequiredSdkVersion)
+    {
+        $JsonContent += @"
         "minimumRequiredSdkVersion": "$($Parameters.MinimumRequiredSdkVersion)",
+"@
+    }
+    if ($Parameters.MinimumWarningAppVersion)
+    {
+        $JsonContent += @"
         "minimumWarningAppVersion": "$($Parameters.MinimumWarningAppVersion)",
+"@
+    }
+    if ($Parameters.MinimumWarningOsVersion)
+    {
+        $JsonContent += @"
         "minimumWarningOsVersion": "$($Parameters.MinimumWarningOsVersion)",
+"@
+    }
+
+    $JSONContent += @"
         "pinCharacterSet": "$($Parameters.PinCharacterSet)",
         "contactSyncBlocked": $($Parameters.ContactSyncBlocked.ToString().ToLower()),
         "periodBeforePinReset": "$($Parameters.PeriodBeforePinReset)",

diff --git a/...CResources/MSFT_IntuneAppProtectionPolicyiOS/MSFT_IntuneAppProtectionPolicyiOS.schema.mof b/...CResources/MSFT_IntuneAppProtectionPolicyiOS/MSFT_IntuneAppProtectionPolicyiOS.schema.mof
@@ -36,6 +36,7 @@ class MSFT_IntuneAppProtectionPolicyiOS : OMI_BaseResource
     [Write, Description("List of IDs representing the iOS apps controlled by this protection policy.")] String Apps[];
     [Write, Description("List of IDs of the groups assigned to this iOS Protection Policy.")] String Assignments[];
     [Write, Description("List of IDs of the groups that are excluded from this iOS Protection Policy.")] String ExcludedGroups[];
+    [Write, Description("A custom browser protocol to open weblink on iOS.")] String CustomBrowserProtocol;
     [Write, Description("Present ensures the policy exists, absent ensures it is removed."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] string Ensure;
     [Write, Description("Credentials of the Intune Admin."), EmbeddedInstance("MSFT_Credential")] string Credential;
     [Write, Description("ID of the Azure Active Directory application to authenticate with.")] String ApplicationId;