Cleanup

Author: Tratcher

src/Microsoft.Owin.Security.OpenIdConnect/OpenIdConnectAuthenticationOptions.cs

@@ -20,6 +20,7 @@ public class OpenIdConnectAuthenticationOptions : AuthenticationOptions
         private OpenIdConnectProtocolValidator _protocolValidator;
         private TokenValidationParameters _tokenValidationParameters;
         private TimeSpan _backchannelTimeout;
+        private ISecurityTokenValidator _securityTokenValidator;
 
         /// <summary>
         /// Initializes a new <see cref="OpenIdConnectAuthenticationOptions"/>
@@ -242,7 +243,19 @@ public string SignInAsAuthenticationType
         /// <summary>
         /// Gets or sets the <see cref="ISecurityTokenValidator"/> used to validate identity tokens.
         /// </summary>
-        public ISecurityTokenValidator SecurityTokenValidator { get; set; }
+        public ISecurityTokenValidator SecurityTokenValidator
+        {
+            get { return _securityTokenValidator; }
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException("value");
+                }
+
+                _securityTokenValidator = value;
+            }
+        }
 
         /// <summary>
         /// Gets or sets the TokenValidationParameters

src/Microsoft.Owin.Security.WsFederation/WsFederationAuthenticationHandler.cs

@@ -309,7 +309,6 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
                     }
                 }
 
-                // what to do here?
                 if (principal == null)
                 {
                     throw new SecurityTokenException("no validator found");

src/Microsoft.Owin.Security.WsFederation/WsFederationAuthenticationMiddleware.cs

@@ -51,16 +51,6 @@ public WsFederationAuthenticationMiddleware(OwinMiddleware next, IAppBuilder app
                 Options.StateDataFormat = new PropertiesDataFormat(dataProtector);
             }
 
-            if (Options.SecurityTokenHandlers == null)
-            {
-                Options.SecurityTokenHandlers = new Collection<ISecurityTokenValidator>
-                {
-                    new Saml2SecurityTokenHandler(),
-                    // new SamlSecurityTokenHandler(),
-                    new JwtSecurityTokenHandler()
-                };
-            }
-
             if (Options.Notifications == null)
             {
                 Options.Notifications = new WsFederationAuthenticationNotifications();

src/Microsoft.Owin.Security.WsFederation/WsFederationAuthenticationOptions.cs

@@ -23,7 +23,7 @@ public class WsFederationAuthenticationOptions : AuthenticationOptions
         private ICollection<ISecurityTokenValidator> _securityTokenHandlers = new Collection<ISecurityTokenValidator>()
         {
             new Saml2SecurityTokenHandler(),
-            // new SamlSecurityTokenHandler(),
+            new SamlSecurityTokenHandler(),
             new JwtSecurityTokenHandler()
         };
         private TokenValidationParameters _tokenValidationParameters;