nullable enabled and fixed styling inline with latest language version

Author: mihirdilip

src/AspNetCore.Authentication.Basic/AspNetCore.Authentication.Basic.csproj

@@ -17,8 +17,10 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Title>$(AssemblyName)</Title>
     <RepositoryType>git</RepositoryType>
-    <PackageIconUrl />
     <NeutralLanguage />
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+    <!--<ImplicitUsings>enable</ImplicitUsings>-->
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageReadmeFile>README.md</PackageReadmeFile>

src/AspNetCore.Authentication.Basic/BasicExtensions.cs

@@ -40,7 +40,7 @@ public static AuthenticationBuilder AddBasic(this AuthenticationBuilder builder,
 		/// <param name="builder"></param>
 		/// <param name="configureOptions">The configure options.</param>
 		/// <returns>The instance of <see cref="AuthenticationBuilder"/></returns>
-		public static AuthenticationBuilder AddBasic(this AuthenticationBuilder builder, Action<BasicOptions> configureOptions)
+		public static AuthenticationBuilder AddBasic(this AuthenticationBuilder builder, Action<BasicOptions>? configureOptions)
 			=> builder.AddBasic(BasicDefaults.AuthenticationScheme, configureOptions);
 
 		/// <summary>
@@ -51,7 +51,7 @@ public static AuthenticationBuilder AddBasic(this AuthenticationBuilder builder,
 		/// <param name="authenticationScheme">The authentication scheme.</param>
 		/// <param name="configureOptions">The configure options.</param>
 		/// <returns>The instance of <see cref="AuthenticationBuilder"/></returns>
-		public static AuthenticationBuilder AddBasic(this AuthenticationBuilder builder, string authenticationScheme, Action<BasicOptions> configureOptions)
+		public static AuthenticationBuilder AddBasic(this AuthenticationBuilder builder, string authenticationScheme, Action<BasicOptions>? configureOptions)
 			=> builder.AddBasic(authenticationScheme, displayName: null, configureOptions: configureOptions);
 
 		/// <summary>
@@ -63,7 +63,7 @@ public static AuthenticationBuilder AddBasic(this AuthenticationBuilder builder,
 		/// <param name="displayName">The display name.</param>
 		/// <param name="configureOptions">The configure options.</param>
 		/// <returns>The instance of <see cref="AuthenticationBuilder"/></returns>
-		public static AuthenticationBuilder AddBasic(this AuthenticationBuilder builder, string authenticationScheme, string displayName, Action<BasicOptions> configureOptions)
+		public static AuthenticationBuilder AddBasic(this AuthenticationBuilder builder, string authenticationScheme, string? displayName, Action<BasicOptions>? configureOptions)
 		{
 			// Adds post configure options to the pipeline.
 			builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IPostConfigureOptions<BasicOptions>, BasicPostConfigureOptions>());
@@ -107,7 +107,7 @@ public static AuthenticationBuilder AddBasic<TBasicUserValidationService>(this A
 		/// <param name="builder"></param>
 		/// <param name="configureOptions">The <see cref="BasicOptions"/>.</param>
 		/// <returns>The instance of <see cref="AuthenticationBuilder"/></returns>
-		public static AuthenticationBuilder AddBasic<TBasicUserValidationService>(this AuthenticationBuilder builder, Action<BasicOptions> configureOptions) where TBasicUserValidationService : class, IBasicUserValidationService
+		public static AuthenticationBuilder AddBasic<TBasicUserValidationService>(this AuthenticationBuilder builder, Action<BasicOptions>? configureOptions) where TBasicUserValidationService : class, IBasicUserValidationService
 			=> builder.AddBasic<TBasicUserValidationService>(BasicDefaults.AuthenticationScheme, configureOptions);
 
 		/// <summary>
@@ -119,7 +119,7 @@ public static AuthenticationBuilder AddBasic<TBasicUserValidationService>(this A
 		/// <param name="authenticationScheme">The authentication scheme.</param>
 		/// <param name="configureOptions">The <see cref="BasicOptions"/>.</param>
 		/// <returns>The instance of <see cref="AuthenticationBuilder"/></returns>
-		public static AuthenticationBuilder AddBasic<TBasicUserValidationService>(this AuthenticationBuilder builder, string authenticationScheme, Action<BasicOptions> configureOptions) where TBasicUserValidationService : class, IBasicUserValidationService
+		public static AuthenticationBuilder AddBasic<TBasicUserValidationService>(this AuthenticationBuilder builder, string authenticationScheme, Action<BasicOptions>? configureOptions) where TBasicUserValidationService : class, IBasicUserValidationService
 			=> builder.AddBasic<TBasicUserValidationService>(authenticationScheme, displayName: null, configureOptions: configureOptions);
 
 		/// <summary>
@@ -132,7 +132,7 @@ public static AuthenticationBuilder AddBasic<TBasicUserValidationService>(this A
 		/// <param name="displayName">The display name.</param>
 		/// <param name="configureOptions">The <see cref="BasicOptions"/>.</param>
 		/// <returns>The instance of <see cref="AuthenticationBuilder"/></returns>
-		public static AuthenticationBuilder AddBasic<TBasicUserValidationService>(this AuthenticationBuilder builder, string authenticationScheme, string displayName, Action<BasicOptions> configureOptions)
+		public static AuthenticationBuilder AddBasic<TBasicUserValidationService>(this AuthenticationBuilder builder, string authenticationScheme, string? displayName, Action<BasicOptions>? configureOptions)
 			where TBasicUserValidationService : class, IBasicUserValidationService
 		{
 			// Adds implementation of IBasicUserValidationService to the dependency container.

src/AspNetCore.Authentication.Basic/BasicHandler.cs

@@ -53,7 +53,7 @@ public BasicHandler(IOptionsMonitor<BasicOptions> options, ILoggerFactory logger
 		/// <summary>
 		/// Get or set <see cref="BasicEvents"/>.
 		/// </summary>
-		protected new BasicEvents Events { get => (BasicEvents)base.Events; set => base.Events = value; }
+		protected new BasicEvents Events { get => (BasicEvents)base.Events!; set => base.Events = value; }
 
 		/// <summary>
 		/// Create an instance of <see cref="BasicEvents"/>.
@@ -91,6 +91,12 @@ protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
 				return AuthenticateResult.NoResult();
 			}
 
+			if (string.IsNullOrWhiteSpace(headerValue.Parameter))
+			{
+				Logger.LogInformation($"'Authorization' header found but the scheme value/credentials is not present.");
+				return AuthenticateResult.NoResult();
+			}
+
 			BasicCredentials credentials;
 			try
 			{
@@ -172,7 +178,7 @@ protected override async Task HandleChallengeAsync(AuthenticationProperties prop
 			await base.HandleChallengeAsync(properties);
 		}
 
-		private async Task<AuthenticateResult> RaiseAndHandleEventValidateCredentialsAsync(BasicCredentials credentials)
+		private async Task<AuthenticateResult?> RaiseAndHandleEventValidateCredentialsAsync(BasicCredentials credentials)
 		{
 			var validateCredentialsContext = new BasicValidateCredentialsContext(Context, Scheme, Options, credentials.Username, credentials.Password);
 			await Events.ValidateCredentialsAsync(validateCredentialsContext).ConfigureAwait(false);
@@ -210,7 +216,10 @@ private async Task<AuthenticateResult> RaiseAndHandleAuthenticationSucceededAsyn
 			{
 				// If claims principal is set and is authenticated then build a ticket by calling and return success.
 				authenticationSucceededContext.Success();
-				return authenticationSucceededContext.Result;
+				if (authenticationSucceededContext.Result != null)
+				{
+					return authenticationSucceededContext.Result;
+				}
 			}
 
 			Logger.LogError("No authenticated prinicipal set.");
@@ -229,7 +238,7 @@ private bool IgnoreAuthenticationIfAllowAnonymous()
 
 		private async Task<bool> ValidateUsingBasicUserValidationServiceAsync(string username, string password)
 		{
-			IBasicUserValidationService basicUserValidationService = null;
+			IBasicUserValidationService? basicUserValidationService = null;
 			if (Options.BasicUserValidationServiceType != null)
 			{
 				basicUserValidationService = ActivatorUtilities.GetServiceOrCreateInstance(Context.RequestServices, Options.BasicUserValidationServiceType) as IBasicUserValidationService;
@@ -279,18 +288,15 @@ private static BasicCredentials DecodeBasicCredentials(string credentials)
 				throw new Exception("Username cannot be empty.");
 			}
 
-			if (password == null)
-			{
-				password = string.Empty;
-			}
+			password ??= string.Empty;
 
 			return new BasicCredentials(username, password);
 		}
 
 		private readonly struct BasicCredentials
 		{
 			public BasicCredentials(string username, string password)
-			{
+		{
 				Username = username;
 				Password = password;
 			}

src/AspNetCore.Authentication.Basic/BasicOptions.cs

@@ -24,7 +24,7 @@ public BasicOptions()
         /// Required to be set if SuppressWWWAuthenticateHeader is not set to true.
         /// <see href="https://tools.ietf.org/html/rfc7235#section-2.2"/>
         /// </summary>
-        public string Realm { get; set; }
+        public string? Realm { get; set; }
 
         /// <summary>
         /// Default value is false.
@@ -42,7 +42,7 @@ public BasicOptions()
         /// </summary>
         public new BasicEvents Events
         {
-            get => (BasicEvents)base.Events;
+            get => (BasicEvents)base.Events!;
             set => base.Events = value;
         }
 
@@ -54,6 +54,6 @@ public BasicOptions()
         public bool IgnoreAuthenticationIfAllowAnonymous { get; set; }
 #endif
 
-        internal Type BasicUserValidationServiceType { get; set; } = null;
+        internal Type? BasicUserValidationServiceType { get; set; } = null;
     }
 }

src/AspNetCore.Authentication.Basic/BasicPostConfigureOptions.cs

@@ -11,7 +11,7 @@ namespace AspNetCore.Authentication.Basic
 	/// </summary>
 	internal class BasicPostConfigureOptions : IPostConfigureOptions<BasicOptions>
 	{
-		public void PostConfigure(string name, BasicOptions options)
+		public void PostConfigure(string? name, BasicOptions options)
 		{
 			if (!options.SuppressWWWAuthenticateHeader && string.IsNullOrWhiteSpace(options.Realm))
 			{

src/AspNetCore.Authentication.Basic/BasicUtils.cs

@@ -23,7 +23,7 @@ internal static class BasicUtils
 		/// <param name="claimsIssuer">The claims issuer.</param>
 		/// <param name="claims">The list of claims.</param>
 		/// <returns></returns>
-		internal static ClaimsPrincipal BuildClaimsPrincipal(string username, string schemeName, string claimsIssuer, IEnumerable<Claim> claims = null)
+		internal static ClaimsPrincipal BuildClaimsPrincipal(string? username, string schemeName, string? claimsIssuer, IEnumerable<Claim>? claims = null)
 		{
 			if (string.IsNullOrWhiteSpace(schemeName)) throw new ArgumentNullException(nameof(schemeName));
 

src/AspNetCore.Authentication.Basic/Events/BasicAuthenticationSucceededContext.cs

@@ -30,7 +30,7 @@ public BasicAuthenticationSucceededContext(HttpContext context, AuthenticationSc
         /// <summary>
         /// Get the <see cref="ClaimsPrincipal"/> containing the user claims.
         /// </summary>
-        public new ClaimsPrincipal Principal => base.Principal;
+        public new ClaimsPrincipal Principal => base.Principal!;
 
         /// <summary>
         /// Called to replace the claims principal. The supplied principal will replace the value of the 
@@ -57,7 +57,7 @@ public void ReplacePrincipal(ClaimsPrincipal principal)
         public void AddClaim(Claim claim)
         {
             if (claim == null) throw new ArgumentNullException(nameof(claim));
-            (Principal?.Identity as ClaimsIdentity).AddClaim(claim);
+            (Principal.Identity as ClaimsIdentity)?.AddClaim(claim);
         }
 
         /// <summary>
@@ -68,7 +68,7 @@ public void AddClaim(Claim claim)
         public void AddClaims(IEnumerable<Claim> claims)
         {
             if (claims == null) throw new ArgumentNullException(nameof(claims));
-            (Principal?.Identity as ClaimsIdentity).AddClaims(claims);
+            (Principal.Identity as ClaimsIdentity)?.AddClaims(claims);
         }
     }
 }

src/AspNetCore.Authentication.Basic/Events/BasicEvents.cs

@@ -20,7 +20,7 @@ public class BasicEvents
         /// or construct an authentication principal from the user details & attach it to the context.Principal property and finally call context.Success() method.
         /// If only context.Principal property set without calling context.Success() method then, Success() method is automaticalled called.
         /// </remarks>
-        public Func<BasicValidateCredentialsContext, Task> OnValidateCredentials { get; set; }
+        public Func<BasicValidateCredentialsContext, Task>? OnValidateCredentials { get; set; }
 
         /// <summary>
         /// A delegate assigned to this property will be invoked when the authentication succeeds. It will not be called if OnValidateCredentials delegate is assigned.
@@ -29,12 +29,12 @@ public class BasicEvents
         /// <remarks>
         /// Only use this if you know what you are doing.
         /// </remarks>
-        public Func<BasicAuthenticationSucceededContext, Task> OnAuthenticationSucceeded { get; set; }
+        public Func<BasicAuthenticationSucceededContext, Task>? OnAuthenticationSucceeded { get; set; }
 
         /// <summary>
         /// A delegate assigned to this property will be invoked when the authentication fails.
         /// </summary>
-        public Func<BasicAuthenticationFailedContext, Task> OnAuthenticationFailed { get; set; }
+        public Func<BasicAuthenticationFailedContext, Task>? OnAuthenticationFailed { get; set; }
 
         /// <summary>
         /// A delegate assigned to this property will be invoked before a challenge is sent back to the caller when handling unauthorized response.
@@ -46,7 +46,7 @@ public class BasicEvents
         /// changing the 401 result to 302 of a login page or external sign-in location.)
         /// Call context.Handled() at the end so that any default logic for this challenge will be skipped.
         /// </remarks>
-        public Func<BasicHandleChallengeContext, Task> OnHandleChallenge { get; set; }
+        public Func<BasicHandleChallengeContext, Task>? OnHandleChallenge { get; set; }
 
         /// <summary>
         /// A delegate assigned to this property will be invoked if Authorization fails and results in a Forbidden response.
@@ -56,7 +56,7 @@ public class BasicEvents
         /// Set the delegate to handle Forbid.
         /// Call context.Handled() at the end so that any default logic will be skipped.
         /// </remarks>
-        public Func<BasicHandleForbiddenContext, Task> OnHandleForbidden { get; set; }
+        public Func<BasicHandleForbiddenContext, Task>? OnHandleForbidden { get; set; }
 
 
 

src/AspNetCore.Authentication.Basic/Events/BasicValidateCredentialsContext.cs

@@ -45,7 +45,7 @@ public BasicValidateCredentialsContext(HttpContext context, AuthenticationScheme
         /// and <see cref="ResultContext{TOptions}.Success"/> method will also be called.
         /// </summary>
         /// <param name="claims">Claims to be added to the identity.</param>
-        public void ValidationSucceeded(IEnumerable<Claim> claims = null)
+        public void ValidationSucceeded(IEnumerable<Claim>? claims = null)
         {
             Principal = BasicUtils.BuildClaimsPrincipal(Username, Scheme.Name, Options.ClaimsIssuer, claims);
             Success();
@@ -56,7 +56,7 @@ public void ValidationSucceeded(IEnumerable<Claim> claims = null)
         /// otherwise, <see cref="ResultContext{TOptions}.Fail(string)"/> method will be called.
         /// </summary>
         /// <param name="failureMessage">(Optional) The failure message.</param>
-        public void ValidationFailed(string failureMessage = null)
+        public void ValidationFailed(string? failureMessage = null)
         {
             if (string.IsNullOrWhiteSpace(failureMessage))
             {

src/AspNetCore.Authentication.Basic/GlobalSuppressions.cs

@@ -0,0 +1,10 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE0130:Namespace does not match folder structure", Justification = "Does not need to match, folder used for structural purpose only.", Scope = "namespace", Target = "~N:AspNetCore.Authentication.Basic")]
+[assembly: SuppressMessage("Style", "IDE0290:Use primary constructor", Justification = "Not a fan of this.")]
+[assembly: SuppressMessage("Maintainability", "CA1510:Use ArgumentNullException throw helper", Justification = "Not supported by older frameworks.")]

test/AspNetCore.Authentication.Basic.Tests/BasicExtensionsTests.cs

@@ -3,9 +3,6 @@
 
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace AspNetCore.Authentication.Basic.Tests

test/AspNetCore.Authentication.Basic.Tests/BasicHandlerTests.cs

@@ -7,15 +7,11 @@
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Security.Claims;
 using System.Text.Json;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace AspNetCore.Authentication.Basic.Tests
@@ -591,7 +587,7 @@ public async Task MultiScheme()
 
 		#endregion // Multi-Scheme
 
-		private async Task<ClaimsPrincipalDto> DeserializeClaimsPrincipalAsync(HttpResponseMessage response)
+		private static async Task<ClaimsPrincipalDto> DeserializeClaimsPrincipalAsync(HttpResponseMessage response)
 		{
 			return JsonSerializer.Deserialize<ClaimsPrincipalDto>(await response.Content.ReadAsStringAsync());
 		}

test/AspNetCore.Authentication.Basic.Tests/BasicOptionsTests.cs

@@ -4,10 +4,7 @@
 using AspNetCore.Authentication.Basic.Tests.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using System;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace AspNetCore.Authentication.Basic.Tests

test/AspNetCore.Authentication.Basic.Tests/BasicPostConfigureOptionsTests.cs

@@ -2,14 +2,12 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using AspNetCore.Authentication.Basic.Tests.Infrastructure;
-using System;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace AspNetCore.Authentication.Basic.Tests
 {
-    public class BasicPostConfigureOptionsTests
-    {
+	public class BasicPostConfigureOptionsTests
+	{
 		[Fact]
 		public async Task PostConfigure_no_option_set_throws_exception()
 		{
@@ -77,13 +75,13 @@ await RunAuthInitWithServiceAsync(options =>
 		}
 
 
-		private async Task RunAuthInitAsync(Action<BasicOptions> configureOptions)
+		private static async Task RunAuthInitAsync(Action<BasicOptions> configureOptions)
 		{
 			var server = TestServerBuilder.BuildTestServer(configureOptions);
 			await server.CreateClient().GetAsync(TestServerBuilder.BaseUrl);
 		}
 
-		private async Task RunAuthInitWithServiceAsync(Action<BasicOptions> configureOptions)
+		private static async Task RunAuthInitWithServiceAsync(Action<BasicOptions> configureOptions)
 		{
 			var server = TestServerBuilder.BuildTestServerWithService(configureOptions);
 			await server.CreateClient().GetAsync(TestServerBuilder.BaseUrl);