AdfsWebApiApplication: Fix Multiple AllowedClientTypes Property (#64)

X-Guardian · Apr 19, 2023 · 7ea6ae0 · 7ea6ae0
1 parent 209b081
commit 7ea6ae0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- AdsfWebApiApplication
+  - Fixed issue when the `AllowedClientTypes` Property had multiple values ([#63](https://github.com/X-Guardian/AdfsDsc/issues/63)])
+
 ## [1.3.0] - 2023-03-19
 
 ### Fixed

diff --git a/Tests/Unit/MSFT_AdfsWebApiApplication.Tests.ps1 b/Tests/Unit/MSFT_AdfsWebApiApplication.Tests.ps1
@@ -124,7 +124,7 @@ try
             AccessControlPolicyParameters        = $mockAccessControlPolicyParameters
             AdditionalAuthenticationRules        = 'rule'
             AllowedAuthenticationClassReferences = @()
-            AllowedClientTypes                   = 'Public'
+            AllowedClientTypes                   = 'Public', 'Confidential'
             AlwaysRequireAuthentication          = $false
             ClaimsProviderName                   = @()
             DelegationAuthorizationRules         = 'rule'
@@ -266,7 +266,9 @@ try
                     AccessControlPolicyParameters        = $mockGroupAccessControlPolicyParameters
                     AdditionalAuthenticationRules        = $mockResource.AdditionalAuthenticationRules
                     AllowedAuthenticationClassReferences = $mockResource.AllowedAuthenticationClassReferences
-                    AllowedClientTypes                   = $mockResource.AllowedClientTypes
+                    AllowedClientTypes                   = (
+                        [Microsoft.IdentityServer.Protocols.PolicyStore.AllowedClientTypes]::Public -bor
+                        [Microsoft.IdentityServer.Protocols.PolicyStore.AllowedClientTypes]::Confidential)
                     AlwaysRequireAuthentication          = $mockResource.AlwaysRequireAuthentication
                     ClaimsProviderName                   = $mockResource.ClaimsProviderName
                     DelegationAuthorizationRules         = $mockResource.DelegationAuthorizationRules
@@ -349,9 +351,9 @@ try
                 }
 
                 It 'Should throw the correct exception' {
-                    { Get-TargetResource @getTargetResourceParameters } | `
+                    { Get-TargetResource @getTargetResourceParameters } |
                         Should -Throw ($script:localizedData.GettingResourceErrorMessage -f
-                        $getTargetResourceParameters.Name)
+                            $getTargetResourceParameters.Name)
                 }
             }
         }
@@ -428,9 +430,9 @@ try
                             }
 
                             It 'Should throw the correct exception' {
-                                { Set-TargetResource @setTargetResourcePresentAGIChangedParameters } | `
+                                { Set-TargetResource @setTargetResourcePresentAGIChangedParameters } |
                                     Should -Throw ($script:localizedData.RemovingResourceErrorMessage -f
-                                    $setTargetResourcePresentAGIChangedParameters.Name)
+                                        $setTargetResourcePresentAGIChangedParameters.Name)
                             }
                         }
 
@@ -440,9 +442,9 @@ try
                             }
 
                             It 'Should throw the correct exception' {
-                                { Set-TargetResource @setTargetResourcePresentAGIChangedParameters } | `
+                                { Set-TargetResource @setTargetResourcePresentAGIChangedParameters } |
                                     Should -Throw ($script:localizedData.AddingResourceErrorMessage -f
-                                    $setTargetResourcePresentAGIChangedParameters.Name)
+                                        $setTargetResourcePresentAGIChangedParameters.Name)
                             }
                         }
                     }
@@ -484,9 +486,9 @@ try
                             }
 
                             It 'Should throw the correct exception' {
-                                { Set-TargetResource @setTargetResourceParametersChangedProperty } | `
+                                { Set-TargetResource @setTargetResourceParametersChangedProperty } |
                                     Should -Throw ($script:localizedData.SettingResourceErrorMessage -f
-                                    $setTargetResourceParametersChangedProperty.Name)
+                                        $setTargetResourceParametersChangedProperty.Name)
                             }
                         }
                     }
@@ -515,9 +517,9 @@ try
                     }
 
                     It 'Should throw the correct exception' {
-                        { Set-TargetResource @setTargetResourceAbsentParameters } | `
+                        { Set-TargetResource @setTargetResourceAbsentParameters } |
                             Should -Throw ($script:localizedData.RemovingResourceErrorMessage -f
-                            $setTargetResourceAbsentParameters.Name)
+                                $setTargetResourceAbsentParameters.Name)
                     }
                 }
             }
@@ -549,9 +551,9 @@ try
                         }
 
                         It 'Should throw the correct exception' {
-                            { Set-TargetResource @setTargetResourcePresentParameters } | `
+                            { Set-TargetResource @setTargetResourcePresentParameters } |
                                 Should -Throw ($script:localizedData.AddingResourceErrorMessage -f
-                                $setTargetResourcePresentParameters.Name)
+                                    $setTargetResourcePresentParameters.Name)
                         }
                     }
                 }

diff --git a/source/DSCResources/MSFT_AdfsWebApiApplication/MSFT_AdfsWebApiApplication.psm1 b/source/DSCResources/MSFT_AdfsWebApiApplication/MSFT_AdfsWebApiApplication.psm1
@@ -197,7 +197,7 @@ function Get-TargetResource
             AccessControlPolicyParameters        = $AccessControlPolicyParameters
             AdditionalAuthenticationRules        = $targetResource.AdditionalAuthenticationRules
             AlwaysRequireAuthentication          = $targetResource.AlwaysRequireAuthentication
-            AllowedClientTypes                   = @($targetResource.AllowedClientTypes)
+            AllowedClientTypes                   = @($targetResource.AllowedClientTypes.ToString().Split(',').Trim(' '))
             AllowedAuthenticationClassReferences = @($targetResource.AllowedAuthenticationClassReferences)
             ClaimsProviderName                   = @($targetResource.ClaimsProviderName)
             DelegationAuthorizationRules         = $targetResource.DelegationAuthorizationRules