support .NET Framework

Author: Revsgaard

src/ITfoxtec.Identity.Saml2/Configuration/Saml2Configuration.cs

@@ -3,9 +3,7 @@
 using System.Collections.Generic;
 using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel.Security;
-#if !NETFULL
 using System.IdentityModel.Selectors;
-#endif
 
 namespace ITfoxtec.Identity.Saml2
 {
@@ -28,9 +26,7 @@ public class Saml2Configuration
         public List<X509Certificate2> SignatureValidationCertificates { get; protected set; } = new List<X509Certificate2>();
         public X509CertificateValidationMode CertificateValidationMode { get; set; } = X509CertificateValidationMode.ChainTrust;
         public X509RevocationMode RevocationMode { get; set; } = X509RevocationMode.Online;
-#if !NETFULL
         public X509CertificateValidator CustomCertificateValidator { get; set; }
-#endif
 
         public bool SaveBootstrapContext { get; set; } = false;
 

src/ITfoxtec.Identity.Saml2/Configuration/Saml2IdentityConfiguration.cs

@@ -1,4 +1,5 @@
-#if NETFULL
+using System.ServiceModel.Security;
+#if NETFULL
 using ITfoxtec.Identity.Saml2.Tokens;
 using System;
 using System.Collections.Generic;
@@ -9,7 +10,6 @@
 using ITfoxtec.Identity.Saml2.Util;
 using Microsoft.IdentityModel.Tokens;
 using System.Security.Claims;
-using System.ServiceModel.Security;
 using System.IdentityModel.Selectors;
 #endif
 
@@ -48,14 +48,19 @@ public static Saml2IdentityConfiguration GetIdentityConfiguration(Saml2Configura
 
             configuration.NameClaimType = ClaimTypes.NameIdentifier;
 
-            configuration.CertificateValidator = GetCertificateValidator(config);
+            configuration.CertificateValidator = new Saml2CertificateValidator
+            {
+                CertificateValidationMode = config.CertificateValidationMode,
+                RevocationMode = config.RevocationMode,
+            };
 #endif
 
+            SetCustomCertificateValidator(configuration, config);
+
             return configuration;
         }
 
-#if !NETFULL
-        private static X509CertificateValidator GetCertificateValidator(Saml2Configuration config)
+        private static void SetCustomCertificateValidator(Saml2IdentityConfiguration configuration, Saml2Configuration config)
         {
             if (config.CertificateValidationMode == X509CertificateValidationMode.Custom)
             {
@@ -64,18 +69,9 @@ private static X509CertificateValidator GetCertificateValidator(Saml2Configurati
                     throw new Saml2ConfigurationException("A CustomCertificateValidator is required when setting CertificateValidationMode = X509CertificateValidationMode.Custom");
                 }
 
-                return config.CustomCertificateValidator;
-            }
-            else
-            {
-                return new Saml2CertificateValidator
-                {
-                    CertificateValidationMode = config.CertificateValidationMode,
-                    RevocationMode = config.RevocationMode,
-                };
+                configuration.CertificateValidator = config.CustomCertificateValidator;
             }
         }
-#endif
 
 #if NETFULL
         private static AudienceRestriction GetAudienceRestriction(bool audienceRestricted, IEnumerable<string> allowedAudienceUris)