Fix SimpleTokenAuthentication fo ASP.NET Core v1

Author: andresmoschini

src/MakingSense.AspNetCore.Authentication.SimpleToken/SimpleTokenAppBuilderExtensions.cs

@@ -3,29 +3,45 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Framework.Internal;
 using Microsoft.IdentityModel.Tokens;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Builder
 {
 	public static class SimpleTokenAppBuilderExtensions
 	{
-		public static IApplicationBuilder UseSimpleTokenAuthentication([NotNull] this IApplicationBuilder app, Action<SimpleTokenAuthenticationOptions> configureOptions = null, string authenticationScheme = "Bearer")
+		public static IApplicationBuilder UseSimpleTokenAuthentication(this IApplicationBuilder app)
 		{
-			var options = new SimpleTokenAuthenticationOptions()
+			if (app == null)
 			{
-				AuthenticationScheme = authenticationScheme
-			};
+				throw new ArgumentNullException(nameof(app));
+			}
+
+			return UseSimpleTokenAuthentication(app, new SimpleTokenAuthenticationOptions());
+		}
+
+		public static IApplicationBuilder UseSimpleTokenAuthentication(this IApplicationBuilder app, SimpleTokenAuthenticationOptions options)
+		{
+			if (app == null)
+			{
+				throw new ArgumentNullException(nameof(app));
+			}
+
+			if (options == null)
+			{
+				throw new ArgumentNullException(nameof(options));
+			}
 
-			if (configureOptions != null)
+			if (string.IsNullOrEmpty(options.AuthenticationScheme))
 			{
-				configureOptions(options);
+				options.AuthenticationScheme = "Bearer";
 			}
 
 			if (options.SecurityTokenValidatorsFactory == null)
 			{
 				options.SecurityTokenValidatorsFactory = () => app.ApplicationServices.GetServices<ISecurityTokenValidator>();
 			}
 
-			return app.UseMiddleware<SimpleTokenAuthenticationMiddleware>(options);
+			return app.UseMiddleware<SimpleTokenAuthenticationMiddleware>(Options.Create(options));
 		}
 	}
 }

src/MakingSense.AspNetCore.Authentication.SimpleToken/SimpleTokenAuthenticationHandler.cs

@@ -21,8 +21,11 @@ public class SimpleTokenAuthenticationHandler : AuthenticationHandler<SimpleToke
 		/// It does not search in Form-Encoded Body Parameter (http://tools.ietf.org/html/rfc6750#section-2.2).
 		/// </remarks>
 		/// <returns>
-		/// Returns Token if found, null otherwise
+		/// Returns Token if found, null otherwise.
 		/// </returns>
+		/// <exception>
+		/// Throws AuthenticationException when Authentication header is found, but id does not contains valid data format.
+		/// </exception>
 		public static string ExtractToken(HttpRequest request)
 		{
 			var authorizationHeader = (string)request.Headers[HeaderNames.Authorization];
@@ -55,7 +58,6 @@ public static string ExtractToken(HttpRequest request)
 				throw new AuthenticationException("Authorization header exists but does not contains valid information.");
 			}
 
-			// Search in URI Query Parameter (http://tools.ietf.org/html/rfc6750#section-2.3)
 			var tokenFromQuery = (string)request.Query["access_token"] ?? request.Query["api_key"];
 			if (tokenFromQuery != null)
 			{
@@ -73,16 +75,12 @@ public static string ExtractToken(HttpRequest request)
 		/// <returns></returns>
 		protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
 		{
-			// Ugly patch to make this method should to be async in order to allow result caching by caller
-			await DoneTask;
-
-			string token = ExtractToken(Request);
+			var token = ExtractToken(Request);
 
 			// If no token found, no further work possible
 			if (string.IsNullOrEmpty(token))
 			{
-				// Not so nice, but AuthenticateResult.Fail has the same behavior
-				return null;
+				return AuthenticateResult.Skip();
 			}
 
 			var validationParameters = Options.TokenValidationParameters.Clone();
@@ -99,6 +97,9 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
 				}
 			}
 
+			// Ugly patch to make this method should to be async in order to allow result caching by caller
+			await DoneTask;
+
 			// Not so nice, but AuthenticateResult.Fail does not allow us to show the error
 			throw new AuthenticationException("Authorization token has been detected but it cannot be read.");
 		}

src/MakingSense.AspNetCore.Authentication.SimpleToken/SimpleTokenAuthenticationMiddleware.cs

@@ -23,11 +23,41 @@ public class SimpleTokenAuthenticationMiddleware : AuthenticationMiddleware<Simp
 		/// </summary>
 		public SimpleTokenAuthenticationMiddleware(
 			[NotNull] RequestDelegate next,
-			[NotNull] IOptions<SimpleTokenAuthenticationOptions> options,
 			[NotNull] ILoggerFactory loggerFactory,
-			[NotNull] UrlEncoder encoder)
+			[NotNull] UrlEncoder encoder,
+			[NotNull] IOptions<SimpleTokenAuthenticationOptions> options)
 			: base(next, options, loggerFactory, encoder)
 		{
+			if (next == null)
+			{
+				throw new ArgumentNullException(nameof(next));
+			}
+
+			if (loggerFactory == null)
+			{
+				throw new ArgumentNullException(nameof(loggerFactory));
+			}
+
+			if (encoder == null)
+			{
+				throw new ArgumentNullException(nameof(encoder));
+			}
+
+			if (options == null)
+			{
+				throw new ArgumentNullException(nameof(options));
+			}
+
+
+			if (string.IsNullOrEmpty(Options.AuthenticationScheme))
+			{
+				throw new ArgumentException(nameof(Options.AuthenticationScheme));
+			}
+
+			if (Options.SecurityTokenValidatorsFactory == null)
+			{
+				throw new ArgumentException(nameof(Options.SecurityTokenValidatorsFactory));
+			}
 		}
 
 		/// <summary>

src/MakingSense.AspNetCore.Authentication.SimpleToken/SimpleTokenAuthenticationOptions.cs

@@ -23,11 +23,6 @@ public class SimpleTokenAuthenticationOptions : AuthenticationOptions
 		/// <exception cref="ArgumentNullException">if 'value' is null.</exception>
 		public TokenValidationParameters TokenValidationParameters { get; [param: NotNull] set; } = new TokenValidationParameters();
 
-		/// <summary>
-		/// Gets or sets the challenge to put in the "WWW-Authenticate" header.
-		/// </summary>
-		public string Challenge { get; set; } = "Bearer";
-
 		/// <summary>
 		/// Creates an instance of SimpleToken authentication options with default values.
 		/// </summary>