Small refactor of SamlSecurityTokenHandler

Refactor PopulateValidationParametersWithCurrentConfigurationAsync null check to guard with an early return. Rename cloned variable to make code easier to read.
AzureAD · Mar 13, 2024 · 24927af · 24927af
1 parent 10c7984
commit 24927af
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/Microsoft.IdentityModel.Tokens.Saml/Saml/SamlSecurityTokenHandler.cs b/src/Microsoft.IdentityModel.Tokens.Saml/Saml/SamlSecurityTokenHandler.cs
@@ -1251,17 +1251,19 @@ private ClaimsPrincipal ValidateToken(SamlSecurityToken samlToken, string token,
         private static async Task<TokenValidationParameters> PopulateValidationParametersWithCurrentConfigurationAsync(
             TokenValidationParameters validationParameters)
         {
-            if (validationParameters.ConfigurationManager != null)
+            if (validationParameters.ConfigurationManager == null)
             {
-                var currentConfiguration = await validationParameters.ConfigurationManager.GetBaseConfigurationAsync(CancellationToken.None).ConfigureAwait(false);
-                validationParameters = validationParameters.Clone();
-                var issuers = new[] { currentConfiguration.Issuer };
-
-                validationParameters.ValidIssuers = (validationParameters.ValidIssuers == null ? issuers : validationParameters.ValidIssuers.Concat(issuers));
-                validationParameters.IssuerSigningKeys = (validationParameters.IssuerSigningKeys == null ? currentConfiguration.SigningKeys : validationParameters.IssuerSigningKeys.Concat(currentConfiguration.SigningKeys));
+                return validationParameters;
             }
 
-            return validationParameters;
+            var currentConfiguration = await validationParameters.ConfigurationManager.GetBaseConfigurationAsync(CancellationToken.None).ConfigureAwait(false);
+            var validationParametersCloned = validationParameters.Clone();
+            var issuers = new[] { currentConfiguration.Issuer };
+
+            validationParametersCloned.ValidIssuers = (validationParametersCloned.ValidIssuers == null ? issuers : validationParametersCloned.ValidIssuers.Concat(issuers));
+            validationParametersCloned.IssuerSigningKeys = (validationParametersCloned.IssuerSigningKeys == null ? currentConfiguration.SigningKeys : validationParametersCloned.IssuerSigningKeys.Concat(currentConfiguration.SigningKeys));
+            return validationParametersCloned;
+
         }
 
         /// <summary>