New sample project for dot net core 3.1 added.

mihirdilip · mihirdilip · commit d7110d95a119 · 2020-06-29T13:35:00.000+01:00
diff --git a/README.md b/README.md
@@ -32,13 +32,6 @@ Also add an implementation of *IBasicUserValidationService* as shown below in [*
 using AspNetCore.Authentication.Basic;
 public class Startup
 {
-	public Startup(IConfiguration configuration)
-	{
-		Configuration = configuration;
-	}
-
-	public IConfiguration Configuration { get; }
-
 	public void ConfigureServices(IServiceCollection services)
 	{
 		// Add the Basic scheme authentication here..
@@ -81,13 +74,6 @@ public class Startup
 using AspNetCore.Authentication.Basic;
 public class Startup
 {
-	public Startup(IConfiguration configuration)
-	{
-		Configuration = configuration;
-	}
-
-	public IConfiguration Configuration { get; }
-
 	public void ConfigureServices(IServiceCollection services)
 	{
 		// Add the Basic scheme authentication here..
diff --git a/samples/SampleWebApi_2_0/Controllers/ValuesController.cs b/samples/SampleWebApi_2_0/Controllers/ValuesController.cs
@@ -1,10 +1,10 @@
 ﻿using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 
-namespace SampleWebApi.Controllers
+namespace SampleWebApi_2_2.Controllers
 {
-	[Route("api/[controller]")]
-	public class ValuesController : Controller
+    [Route("api/[controller]")]
+	public class ValuesController : ControllerBase
 	{
 		// GET api/values
 		[HttpGet]
@@ -22,13 +22,13 @@ public string Get(int id)
 
 		// POST api/values
 		[HttpPost]
-		public void Post([FromBody]string value)
+		public void Post([FromBody] string value)
 		{
 		}
 
 		// PUT api/values/5
 		[HttpPut("{id}")]
-		public void Put(int id, [FromBody]string value)
+		public void Put(int id, [FromBody] string value)
 		{
 		}
 
diff --git a/samples/SampleWebApi_2_0/Program.cs b/samples/SampleWebApi_2_0/Program.cs
diff --git a/samples/SampleWebApi_2_0/Properties/launchSettings.json b/samples/SampleWebApi_2_0/Properties/launchSettings.json
diff --git a/samples/SampleWebApi_2_0/SampleWebApi_2_0.csproj b/samples/SampleWebApi_2_0/SampleWebApi_2_0.csproj
@@ -5,11 +5,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="wwwroot\" />
+    <Compile Remove="wwwroot\**" />
+    <Content Remove="wwwroot\**" />
+    <EmbeddedResource Remove="wwwroot\**" />
+    <None Remove="wwwroot\**" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspNetCore.Authentication.Basic" Version="2.2.0" />
+    <PackageReference Include="AspNetCore.Authentication.Basic" Version="3.1.5-preview.1" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.9" />
   </ItemGroup>
 
diff --git a/samples/SampleWebApi_2_0/Startup.cs b/samples/SampleWebApi_2_0/Startup.cs
@@ -41,7 +41,7 @@ public void ConfigureServices(IServiceCollection services)
 					// Alternatively, add [Authorize] attribute to Controller or Action Method where necessary.
 					options.Filters.Add(new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build()));
 				}
-			).AddXmlSerializerFormatters();	// To enable XML along with JSON
+			); //.AddXmlSerializerFormatters();	// To enable XML along with JSON
 		}
 
 		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
diff --git a/samples/SampleWebApi_2_0/appsettings.Development.json b/samples/SampleWebApi_2_0/appsettings.Development.json
diff --git a/samples/SampleWebApi_2_0/appsettings.json b/samples/SampleWebApi_2_0/appsettings.json
diff --git a/samples/SampleWebApi_2_2/SampleWebApi_2_2.csproj b/samples/SampleWebApi_2_2/SampleWebApi_2_2.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AspNetCore.Authentication.Basic" Version="2.2.0" />
+    <PackageReference Include="AspNetCore.Authentication.Basic" Version="3.1.5-preview.1" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
   </ItemGroup>
diff --git a/samples/SampleWebApi_2_2/Startup.cs b/samples/SampleWebApi_2_2/Startup.cs
@@ -41,7 +41,7 @@ public void ConfigureServices(IServiceCollection services)
 				// Alternatively, add [Authorize] attribute to Controller or Action Method where necessary.
 				options.Filters.Add(new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build()));
 			})
-				.AddXmlSerializerFormatters()   // To enable XML along with JSON
+				//.AddXmlSerializerFormatters()   // To enable XML along with JSON
 				.SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
 		}
 
diff --git a/samples/SampleWebApi_3_1/Controllers/ValuesController.cs b/samples/SampleWebApi_3_1/Controllers/ValuesController.cs
@@ -0,0 +1,42 @@
+﻿using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+
+namespace SampleWebApi_2_2.Controllers
+{
+    [Route("api/[controller]")]
+	[ApiController]
+	public class ValuesController : ControllerBase
+	{
+		// GET api/values
+		[HttpGet]
+		public ActionResult<IEnumerable<string>> Get()
+		{
+			return new string[] { "value1", "value2" };
+		}
+
+		// GET api/values/5
+		[HttpGet("{id}")]
+		public ActionResult<string> Get(int id)
+		{
+			return "value";
+		}
+
+		// POST api/values
+		[HttpPost]
+		public void Post([FromBody] string value)
+		{
+		}
+
+		// PUT api/values/5
+		[HttpPut("{id}")]
+		public void Put(int id, [FromBody] string value)
+		{
+		}
+
+		// DELETE api/values/5
+		[HttpDelete("{id}")]
+		public void Delete(int id)
+		{
+		}
+	}
+}
diff --git a/samples/SampleWebApi_3_1/Program.cs b/samples/SampleWebApi_3_1/Program.cs
@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
+
+namespace SampleWebApi_3_1
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            CreateHostBuilder(args).Build().Run();
+        }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.UseStartup<Startup>();
+                });
+    }
+}
diff --git a/samples/SampleWebApi_3_1/Properties/launchSettings.json b/samples/SampleWebApi_3_1/Properties/launchSettings.json
@@ -0,0 +1,30 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:2756",
+      "sslPort": 44301
+    }
+  },
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "api/values",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "SampleWebApi_3_1": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "weatherforecast",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+    }
+  }
+}
diff --git a/samples/SampleWebApi_3_1/SampleWebApi_3_1.csproj b/samples/SampleWebApi_3_1/SampleWebApi_3_1.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+  <Import Project="..\SampleWebApi.Shared\SampleWebApi.Shared.projitems" Label="Shared" />
+
+  <ItemGroup>
+    <PackageReference Include="AspNetCore.Authentication.Basic" Version="3.1.5-preview.1" />
+  </ItemGroup>
+
+
+</Project>
diff --git a/samples/SampleWebApi_3_1/Startup.cs b/samples/SampleWebApi_3_1/Startup.cs
@@ -0,0 +1,68 @@
+using AspNetCore.Authentication.Basic;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Authorization;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using SampleWebApi.Repositories;
+using SampleWebApi.Services;
+
+namespace SampleWebApi_3_1
+{
+    public class Startup
+    {
+        public Startup(IConfiguration configuration)
+        {
+            Configuration = configuration;
+        }
+
+        public IConfiguration Configuration { get; }
+
+        // This method gets called by the runtime. Use this method to add services to the container.
+        public void ConfigureServices(IServiceCollection services)
+        {
+            // Add User repository to the dependency container.
+            services.AddTransient<IUserRepository, InMemoryUserRepository>();
+
+            // Add the Basic scheme authentication here..
+            // AddBasic extension takes an implementation of IBasicUserValidationService for validating the username and password. 
+            // It also requires Realm to be set in the options.
+            services.AddAuthentication(BasicDefaults.AuthenticationScheme)
+                .AddBasic<BasicUserValidationService>(options => { options.Realm = "Sample Web API"; });
+
+            services.AddControllers(options =>
+            {
+                // ALWAYS USE HTTPS (SSL) protocol in production when using Basic authentication.
+                //options.Filters.Add<RequireHttpsAttribute>();
+
+                // All the requests will need to be authorized. 
+                // Alternatively, add [Authorize] attribute to Controller or Action Method where necessary.
+                options.Filters.Add(new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build()));
+            }); //.AddXmlSerializerFormatters()   // To enable XML along with JSON;
+        }
+
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+        {
+            if (env.IsDevelopment())
+            {
+                app.UseDeveloperExceptionPage();
+            }
+
+            // The below order of pipeline chain is important!
+
+            app.UseHttpsRedirection();
+            app.UseRouting();
+            
+            app.UseAuthentication();    // NOTE: DEFAULT TEMPLATE DOES NOT HAVE THIS, THIS LINE IS REQUIRED AND HAS TO BE ADDED!!!
+
+            app.UseAuthorization();
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapControllers();
+            });
+        }
+    }
+}
diff --git a/samples/SampleWebApi_3_1/appsettings.Development.json b/samples/SampleWebApi_3_1/appsettings.Development.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  }
+}
diff --git a/samples/SampleWebApi_3_1/appsettings.json b/samples/SampleWebApi_3_1/appsettings.json
@@ -0,0 +1,10 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/src/AspNetCore.Authentication.Basic.sln b/src/AspNetCore.Authentication.Basic.sln
@@ -7,8 +7,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{CF13
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SampleWebApi.Shared", "..\samples\SampleWebApi.Shared\SampleWebApi.Shared.shproj", "{E544FB20-29F3-41F5-A78E-6164F9C43B3C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebApi", "..\samples\SampleWebApi\SampleWebApi.csproj", "{07C59E2A-3E40-4FC0-A8CF-0656AB00E8A7}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebApi_2_2", "..\samples\SampleWebApi_2_2\SampleWebApi_2_2.csproj", "{0801AED9-EA38-4E7E-AF4D-26E9B67E5254}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCore.Authentication.Basic", "AspNetCore.Authentication.Basic\AspNetCore.Authentication.Basic.csproj", "{B2492C13-5F4E-4002-9E66-0ACF73045668}"
@@ -20,21 +18,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebApi_2_0", "..\samples\SampleWebApi_2_0\SampleWebApi_2_0.csproj", "{897E5C9C-8C0A-4FB6-960C-4D11AAFD4491}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleWebApi_3_1", "..\samples\SampleWebApi_3_1\SampleWebApi_3_1.csproj", "{2705DB4C-3BCE-4CFC-9A30-B4BFD1F28C56}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		..\samples\SampleWebApi.Shared\SampleWebApi.Shared.projitems*{07c59e2a-3e40-4fc0-a8cf-0656ab00e8a7}*SharedItemsImports = 5
 		..\samples\SampleWebApi.Shared\SampleWebApi.Shared.projitems*{0801aed9-ea38-4e7e-af4d-26e9b67e5254}*SharedItemsImports = 5
+		..\samples\SampleWebApi.Shared\SampleWebApi.Shared.projitems*{2705db4c-3bce-4cfc-9a30-b4bfd1f28c56}*SharedItemsImports = 5
+		..\samples\SampleWebApi.Shared\SampleWebApi.Shared.projitems*{897e5c9c-8c0a-4fb6-960c-4d11aafd4491}*SharedItemsImports = 5
 		..\samples\SampleWebApi.Shared\SampleWebApi.Shared.projitems*{e544fb20-29f3-41f5-a78e-6164f9c43b3c}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{07C59E2A-3E40-4FC0-A8CF-0656AB00E8A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07C59E2A-3E40-4FC0-A8CF-0656AB00E8A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07C59E2A-3E40-4FC0-A8CF-0656AB00E8A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07C59E2A-3E40-4FC0-A8CF-0656AB00E8A7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0801AED9-EA38-4E7E-AF4D-26E9B67E5254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0801AED9-EA38-4E7E-AF4D-26E9B67E5254}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0801AED9-EA38-4E7E-AF4D-26E9B67E5254}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -43,14 +42,23 @@ Global
 		{B2492C13-5F4E-4002-9E66-0ACF73045668}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B2492C13-5F4E-4002-9E66-0ACF73045668}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B2492C13-5F4E-4002-9E66-0ACF73045668}.Release|Any CPU.Build.0 = Release|Any CPU
+		{897E5C9C-8C0A-4FB6-960C-4D11AAFD4491}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{897E5C9C-8C0A-4FB6-960C-4D11AAFD4491}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{897E5C9C-8C0A-4FB6-960C-4D11AAFD4491}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{897E5C9C-8C0A-4FB6-960C-4D11AAFD4491}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2705DB4C-3BCE-4CFC-9A30-B4BFD1F28C56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2705DB4C-3BCE-4CFC-9A30-B4BFD1F28C56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2705DB4C-3BCE-4CFC-9A30-B4BFD1F28C56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2705DB4C-3BCE-4CFC-9A30-B4BFD1F28C56}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{E544FB20-29F3-41F5-A78E-6164F9C43B3C} = {CF13271D-BF3F-4167-BEBA-DD02D33992F2}
-		{07C59E2A-3E40-4FC0-A8CF-0656AB00E8A7} = {CF13271D-BF3F-4167-BEBA-DD02D33992F2}
 		{0801AED9-EA38-4E7E-AF4D-26E9B67E5254} = {CF13271D-BF3F-4167-BEBA-DD02D33992F2}
+		{897E5C9C-8C0A-4FB6-960C-4D11AAFD4491} = {CF13271D-BF3F-4167-BEBA-DD02D33992F2}
+		{2705DB4C-3BCE-4CFC-9A30-B4BFD1F28C56} = {CF13271D-BF3F-4167-BEBA-DD02D33992F2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {70815049-1680-480A-BF5A-00536D6C9C20}
diff --git a/src/AspNetCore.Authentication.Basic/AspNetCore.Authentication.Basic.csproj b/src/AspNetCore.Authentication.Basic/AspNetCore.Authentication.Basic.csproj
@@ -6,11 +6,9 @@
     <RepositoryUrl>https://github.com/mihirdilip/aspnetcore-authentication-basic/tree/3.1.5</RepositoryUrl>
     <PackageProjectUrl>https://github.com/mihirdilip/aspnetcore-authentication-basic/tree/3.1.5</PackageProjectUrl>
     <PackageTags>aspnetcore, security, authentication, microsoft, microsoft.aspnetcore.authentication, microsoft-aspnetcore-authentication, microsoft.aspnetcore.authentication.basic, microsoft-aspnetcore-authentication-basic, asp-net-core, netstandard, netstandard20, basic-authentication, basicauthentication, dotnetcore, dotnetcore3.1, asp-net-core-basic-authentication, aspnetcore-basic-authentication, asp-net-core-authentication, aspnetcore-authentication, asp, aspnet, basic, authentication-scheme</PackageTags>
-    <PackageReleaseNotes>
-      - Multitarget framework support added
-      - Source Link support added
-      - Strong Name Key support added (breaking change!)
-    </PackageReleaseNotes>
+    <PackageReleaseNotes>- Multitarget framework support added
+- Source Link support added
+- Strong Name Key support added (BREAKING CHANGE FOR SOME OF THE EXISTING USERS!)</PackageReleaseNotes>
     <Description>Easy to use and very light weight Microsoft style Basic Scheme Authentication implementation for ASP.NET Core.</Description>
     <Authors>Mihir Dilip</Authors>
     <Company>Mihir Dilip</Company>

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`using Microsoft.AspNetCore.Mvc;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`
`4`		`-namespace SampleWebApi.Controllers`
	`4`	`+namespace SampleWebApi_2_2.Controllers`
`5`	`5`	`{`
`6`		`- [Route("api/[controller]")]`
`7`		`- public class ValuesController : Controller`
	`6`	`+ [Route("api/[controller]")]`
	`7`	`+ public class ValuesController : ControllerBase`
`8`	`8`	`{`
`9`	`9`	`// GET api/values`
`10`	`10`	`[HttpGet]`
`@@ -22,13 +22,13 @@ public string Get(int id)`
`22`	`22`
`23`	`23`	`// POST api/values`
`24`	`24`	`[HttpPost]`
`25`		`- public void Post([FromBody]string value)`
	`25`	`+ public void Post([FromBody] string value)`
`26`	`26`	`{`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`// PUT api/values/5`
`30`	`30`	`[HttpPut("{id}")]`
`31`		`- public void Put(int id, [FromBody]string value)`
	`31`	`+ public void Put(int id, [FromBody] string value)`
`32`	`32`	`{`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public void ConfigureServices(IServiceCollection services)`
`41`	`41`	`// Alternatively, add [Authorize] attribute to Controller or Action Method where necessary.`
`42`	`42`	`options.Filters.Add(new AuthorizeFilter(new AuthorizationPolicyBuilder().RequireAuthenticatedUser().Build()));`
`43`	`43`	`}`
`44`		`- ).AddXmlSerializerFormatters(); // To enable XML along with JSON`
	`44`	`+ ); //.AddXmlSerializerFormatters(); // To enable XML along with JSON`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`