Merge pull request #1343 from ykuijs/master

[SPTrustedIdentityTokenIssuer] Fixes issue with checking incorrect IdentifierClaim
dsccommunity · Aug 31, 2021 · 5e150df · 5e150df
2 parents 8214236 + 478c65f
commit 5e150df
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - SPSite
   - Implemented workaround to prevent issue with creating site collections immediately after
     farm creation (Error "Invalid field name. {cbb92da4-fd46-4c7d-af6c-3128c2a5576e}")
+- SPTrustedIdentityTokenIssuer
+  - Fixed issue where the IdentifierClaim was not properly detected in the Set method
 - SPWorkManagementServiceApp
   - Updated links to Docs instead of old TechNet
 

diff --git a/...Dsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuer/MSFT_SPTrustedIdentityTokenIssuer.psm1 b/...Dsc/DSCResources/MSFT_SPTrustedIdentityTokenIssuer/MSFT_SPTrustedIdentityTokenIssuer.psm1
@@ -76,7 +76,7 @@ function Get-TargetResource
             $description = $spTrust.Description
             $realm = $spTrust.DefaultProviderRealm
             $signInUrl = $spTrust.ProviderUri.OriginalString
-            $identifierClaim = $spTrust.IdentityClaimTypeInformation.MappedClaimType
+            $identifierClaim = $spTrust.IdentityClaimTypeInformation.InputClaimType
             $SigningCertificateThumbprint = $spTrust.SigningCertificate.Thumbprint
             $currentState = "Present"
             $claimProviderName = $sptrust.ClaimProviderName
@@ -299,7 +299,7 @@ function Set-TargetResource
                 }
 
                 $mappings = ($claimsMappingsArray | Where-Object -FilterScript {
-                        $_.MappedClaimType -like $params.IdentifierClaim
+                        $_.InputClaimType -like $params.IdentifierClaim
                     })
                 if ($null -eq $mappings)
                 {

diff --git a/tests/Unit/SharePointDsc/SharePointDsc.SPTrustedIdentityTokenIssuer.Tests.ps1 b/tests/Unit/SharePointDsc/SharePointDsc.SPTrustedIdentityTokenIssuer.Tests.ps1
@@ -50,7 +50,7 @@ try
     InModuleScope -ModuleName $script:DSCResourceFullName -ScriptBlock {
         Describe -Name $Global:SPDscHelper.DescribeHeader -Fixture {
             BeforeAll {
-                Invoke-Command -Scriptblock $Global:SPDscHelper.InitializeScript -NoNewScope
+                Invoke-Command -ScriptBlock $Global:SPDscHelper.InitializeScript -NoNewScope
 
                 # Mocks for all contexts
                 Mock -CommandName Get-ChildItem -MockWith {
@@ -73,7 +73,7 @@ try
 
                 Mock -CommandName New-SPClaimTypeMapping -MockWith {
                     return [pscustomobject]@{
-                        MappedClaimType = $testParams.IdentifierClaim
+                        InputClaimType = $testParams.IdentifierClaim
                     }
                 }
 
@@ -543,7 +543,7 @@ try
 
                     Mock -CommandName New-SPClaimTypeMapping -MockWith {
                         return [pscustomobject]@{
-                            MappedClaimType = "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+                            InputClaimType = "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
                         }
                     }
                 }