Support ASP.NET Core 3.0

.gitignore

@@ -1,4 +1,4 @@
-## Ignore Visual Studio temporary files, build results, and 
+## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
 # VS 14 temporary folder
@@ -16,6 +16,7 @@ project.lock.json
 
 # Build results
 
+.dotnet
 artifacts/
 coverage.*
 [Dd]ebug/
@@ -30,6 +31,7 @@ x64/
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
+*.coverage
 
 *_i.c
 *_p.c

Directory.Build.props

@@ -30,7 +30,7 @@
     <Product>aspnet-contrib</Product>
     <Company>$(Authors)</Company>
     <_ProjectCopyright>© AspNet.Security.OAuth.Providers contributors. All rights reserved.</_ProjectCopyright>
-    <PackageIconUrl>https://avatars3.githubusercontent.com/u/7998081?s=64</PackageIconUrl>
+    <PackageIcon>package-icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/aspnet-contrib/AspNet.Security.OpenId.Providers</PackageProjectUrl>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
@@ -47,6 +47,9 @@
     <IsPackable>true</IsPackable>
     <IsShipping>true</IsShipping>
   </PropertyGroup>
+  <ItemGroup Condition=" '$(IsPackable)' == 'true' ">
+    <None Include="$(MSBuildThisFileDirectory)\package-icon.png" Pack="True" PackagePath="" />
+  </ItemGroup>
   <ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" />
   </ItemGroup>

NuGet.config

@@ -6,4 +6,4 @@
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="azureadwebstacknightly" value="https://www.myget.org/F/azureadwebstacknightly/api/v3/index.json" />
   </packageSources>
-</configuration>
+</configuration>

appveyor.yml

@@ -17,7 +17,7 @@ test: off
 
 after_build:
   - ps: $wc = New-Object 'System.Net.WebClient'
-  - ps: $wc.UploadFile("https://ci.appveyor.com/api/testresults/xunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\artifacts\TestResults\Release\AspNet.Security.OpenId.Providers.Tests_netcoreapp2.2_x64.xml))
+  - ps: $wc.UploadFile("https://ci.appveyor.com/api/testresults/xunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\artifacts\TestResults\Release\AspNet.Security.OpenId.Providers.Tests_netcoreapp3.0_x64.xml))
 
 deploy:
 - provider: NuGet

eng/Versions.props

@@ -1,13 +1,13 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.1.1</VersionPrefix>
-    <PreReleaseVersionLabel>alpha1</PreReleaseVersionLabel>
+    <VersionPrefix>3.0.0</VersionPrefix>
+    <PreReleaseVersionLabel>release</PreReleaseVersionLabel>
   </PropertyGroup>
   <PropertyGroup>
     <AngleSharpVersion>0.9.9</AngleSharpVersion>
-    <AspNetCoreVersion>2.0.0</AspNetCoreVersion>
+    <AspNetCoreVersion>3.0.0</AspNetCoreVersion>
     <IdentityModelCoreVersion>2.1.4</IdentityModelCoreVersion>
-    <JetBrainsVersion>2019.1.1</JetBrainsVersion>
+    <JetBrainsVersion>2019.1.3</JetBrainsVersion>
     <JsonNetVersion>10.0.3</JsonNetVersion>
     <JustEatHttpClientInterceptionVersion>2.0.2</JustEatHttpClientInterceptionVersion>
     <MartinCostelloLoggingXUnitVersion>0.1.0</MartinCostelloLoggingXUnitVersion>

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "2.2.401"
+    "dotnet": "3.0.100"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19405.1",

samples/Mvc.Client/Mvc.Client.csproj

@@ -1,15 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\AspNet.Security.OpenId.Steam\AspNet.Security.OpenId.Steam.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>
-
 </Project>

samples/Mvc.Client/Program.cs

@@ -1,17 +1,16 @@
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace Mvc.Client
 {
     public static class Program
     {
         public static void Main(string[] args)
-        {
-            CreateWebHostBuilder(args).Build().Run();
-        }
+          => CreateHostBuilder(args).Build().Run();
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                   .UseStartup<Startup>();
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(
+                    (webBuilder) => webBuilder.UseStartup<Startup>());
     }
 }

samples/Mvc.Client/Startup.cs

@@ -51,16 +51,22 @@ public void ConfigureServices(IServiceCollection services)
 
             .AddSteam();
 
-            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
         }
 
         public void Configure(IApplicationBuilder app)
         {
             app.UseStaticFiles();
 
+            app.UseRouting();
+
             app.UseAuthentication();
+            app.UseAuthorization();
 
-            app.UseMvc();
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapDefaultControllerRoute();
+            });
         }
     }
 }

src/AspNet.Security.OpenId.Steam/AspNet.Security.OpenId.Steam.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -15,6 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
   </ItemGroup>
 

src/AspNet.Security.OpenId.Steam/SteamAuthenticationHandler.cs

@@ -84,7 +84,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
             request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(OpenIdAuthenticationConstants.Media.Json));
 
             // Return the authentication ticket as-is if the userinfo request failed.
-            var response = await Options.HttpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Context.RequestAborted);
+            var response = await Options.Backchannel.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Context.RequestAborted);
             if (!response.IsSuccessStatusCode)
             {
                 Logger.LogWarning("The userinfo request failed because an invalid response was received: the identity provider " +

src/AspNet.Security.OpenId/AspNet.Security.OpenId.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -11,9 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="AngleSharp" Version="$(AngleSharpVersion)" />
     <PackageReference Include="JetBrains.Annotations" Version="$(JetBrainsVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols" Version="$(IdentityModelCoreVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
   </ItemGroup>

src/AspNet.Security.OpenId/OpenIdAuthenticationHandler.cs

@@ -380,7 +380,7 @@ private async Task<bool> VerifyAssertionAsync([NotNull] OpenIdAuthenticationMess
                 Content = new FormUrlEncodedContent(payload)
             };
 
-            var response = await Options.HttpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Context.RequestAborted);
+            var response = await Options.Backchannel.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Context.RequestAborted);
             if (!response.IsSuccessStatusCode)
             {
                 Logger.LogWarning("The authentication failed because an invalid check_authentication response was received: " +

src/AspNet.Security.OpenId/OpenIdAuthenticationInitializer.cs

@@ -77,15 +77,12 @@ public void PostConfigure([NotNull] string name, [NotNull] TOptions options)
                 options.HtmlParser = new HtmlParser();
             }
 
-            if (options.HttpClient == null)
+            if (options.Backchannel == null)
             {
-                options.HttpClient = new HttpClient
-                {
-                    Timeout = TimeSpan.FromSeconds(30),
-                    MaxResponseContentBufferSize = 1024 * 1024 * 10
-                };
-
-                options.HttpClient.DefaultRequestHeaders.UserAgent.ParseAdd("ASP.NET Core OpenID 2.0 middleware");
+                options.Backchannel = new HttpClient(options.BackchannelHttpHandler ?? new HttpClientHandler());
+                options.Backchannel.DefaultRequestHeaders.UserAgent.ParseAdd("ASP.NET Core OpenID 2.0 middleware");
+                options.Backchannel.Timeout = options.BackchannelTimeout;
+                options.Backchannel.MaxResponseContentBufferSize = 1024 * 1024 * 10; // 10 MB
             }
 
             if (options.ConfigurationManager == null)
@@ -140,13 +137,13 @@ public void PostConfigure([NotNull] string name, [NotNull] TOptions options)
 
                     options.ConfigurationManager = new ConfigurationManager<OpenIdAuthenticationConfiguration>(
                         options.MetadataAddress?.AbsoluteUri ?? options.Authority.AbsoluteUri,
-                        new OpenIdAuthenticationConfiguration.Retriever(options.HttpClient, options.HtmlParser)
+                        new OpenIdAuthenticationConfiguration.Retriever(options.Backchannel, options.HtmlParser)
                         {
                             MaximumRedirections = options.MaximumRedirections
                         },
-                        new HttpDocumentRetriever(options.HttpClient) { RequireHttps = options.RequireHttpsMetadata });
+                        new HttpDocumentRetriever(options.Backchannel) { RequireHttps = options.RequireHttpsMetadata });
                 }
             }
         }
     }
-}
+}

src/AspNet.Security.OpenId/OpenIdAuthenticationOptions.cs

@@ -95,7 +95,12 @@ public OpenIdAuthenticationOptions()
         /// <summary>
         /// Gets or sets the HTTP client used to communicate with the OpenID provider.
         /// </summary>
-        public HttpClient HttpClient { get; set; }
+        [Obsolete("Use the Backchannel property instead.")]
+        public HttpClient HttpClient
+        {
+            get => Backchannel;
+            set => Backchannel = value;
+        }
 
         /// <summary>
         /// Gets or sets the HTML parser used to parse discovery documents.

test/AspNet.Security.OpenId.Providers.Tests/AspNet.Security.OpenId.Providers.Tests.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <AspNetCoreVersion>2.2.0</AspNetCoreVersion>
     <RootNamespace>AspNet.Security.OpenId</RootNamespace>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
@@ -13,7 +12,7 @@
     <ProjectReference Include="..\..\src\**\*.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="JustEat.HttpClientInterception" Version="$(JustEatHttpClientInterceptionVersion)" />
     <PackageReference Include="MartinCostello.Logging.XUnit" Version="$(MartinCostelloLoggingXUnitVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />

test/AspNet.Security.OpenId.Providers.Tests/Infrastructure/ApplicationFactory.cs

@@ -85,26 +85,31 @@ private static void ConfigureApplication(IApplicationBuilder app)
         {
             // Configure a single HTTP resource that challenges the client if unauthenticated
             // or returns the logged in user's claims as XML if the request is authenticated.
-            app.UseAuthentication();
-
-            app.Map("/me", childApp => childApp.Run(
-                async context =>
-                {
-                    if (context.User.Identity.IsAuthenticated)
-                    {
-                        string xml = IdentityToXmlString(context.User);
-                        byte[] buffer = Encoding.UTF8.GetBytes(xml.ToString());
-
-                        context.Response.StatusCode = 200;
-                        context.Response.ContentType = "text/xml";
-
-                        await context.Response.Body.WriteAsync(buffer, 0, buffer.Length);
-                    }
-                    else
-                    {
-                        await context.ChallengeAsync();
-                    }
-                }));
+            app.UseRouting();
+
+            app.UseAuthentication()
+               .UseEndpoints(endpoints =>
+               {
+                   endpoints.MapGet(
+                       "/me",
+                       async context =>
+                       {
+                           if (context.User.Identity.IsAuthenticated)
+                           {
+                               var xml = IdentityToXmlString(context.User);
+                               var buffer = Encoding.UTF8.GetBytes(xml.ToString());
+
+                               context.Response.StatusCode = 200;
+                               context.Response.ContentType = "text/xml";
+
+                               await context.Response.Body.WriteAsync(buffer, 0, buffer.Length);
+                           }
+                           else
+                           {
+                               await context.ChallengeAsync();
+                           }
+                        });
+               });
         }
 
         private static string IdentityToXmlString(ClaimsPrincipal user)

test/AspNet.Security.OpenId.Providers.Tests/OpenIdTests`1.cs

@@ -85,7 +85,6 @@ protected OpenIdTests()
         protected virtual void ConfigureDefaults(AuthenticationBuilder builder, TOptions options)
         {
             options.Backchannel = CreateBackchannel(builder);
-            options.HttpClient = options.Backchannel;
         }
 
         /// <summary>