Allow to configure authentication with multiple schemes

arnaudauroux · arnaudauroux · commit ce697beafced · 2018-01-04T11:22:03.000+01:00
diff --git a/sample/Sample.Test.Splecflow/Sample.Test.Splecflow.csproj b/sample/Sample.Test.Splecflow/Sample.Test.Splecflow.csproj
@@ -13,12 +13,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />
-    <PackageReference Include="SpecFlow" Version="2.2.0" />
-    <PackageReference Include="SpecFlow.NetCore" Version="1.0.0-rc8" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
+    <PackageReference Include="SpecFlow" Version="2.2.1" />
+    <PackageReference Include="SpecFlow.NetCore" Version="1.2.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sample/Sample.Test/Sample.Test.csproj b/sample/Sample.Test/Sample.Test.csproj
@@ -10,9 +10,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.1.18" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.1.18" />     
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="1.2.0" />     
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sample/Sample.Web/Sample.Web.csproj b/sample/Sample.Web/Sample.Web.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />    
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />    
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/GeekLearning.Testavior.Configuration/GeekLearning.Testavior.Configuration.csproj b/src/GeekLearning.Testavior.Configuration/GeekLearning.Testavior.Configuration.csproj
@@ -15,8 +15,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/GeekLearning.Testavior/Authentication/TestAuthenticationExtensions.cs b/src/GeekLearning.Testavior/Authentication/TestAuthenticationExtensions.cs
@@ -1,9 +1,6 @@
 ﻿namespace GeekLearning.Testavior.Authentication
 {
     using Microsoft.AspNetCore.Authentication;
-    using Microsoft.Extensions.DependencyInjection;
-    using Microsoft.Extensions.DependencyInjection.Extensions;
-    using Microsoft.Extensions.Options;
     using System;
 
     public static class TestAuthenticationExtensions
@@ -12,5 +9,15 @@ public static AuthenticationBuilder AddTestAuthentication(this AuthenticationBui
         {
             return builder.AddScheme<TestAuthenticationOptions, TestAuthenticationHandler>(authenticationScheme, displayName, configureOptions);
         }
+
+        public static AuthenticationBuilder AddTestAuthentication(this AuthenticationBuilder builder, string[] authenticationSchemes, string displayName, Action<TestAuthenticationOptions> configureOptions)
+        {
+            foreach (var authenticationScheme in authenticationSchemes)
+            {
+                builder = builder.AddScheme<TestAuthenticationOptions, TestAuthenticationHandler>(authenticationScheme, displayName, configureOptions);
+            }
+
+            return builder;
+        }
     }
 }
diff --git a/src/GeekLearning.Testavior/Environment/TestStartupConfigurationService.cs b/src/GeekLearning.Testavior/Environment/TestStartupConfigurationService.cs
@@ -9,9 +9,9 @@
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Logging;
-    using Microsoft.Extensions.Options;
     using Mvc;
     using System;
+    using System.Linq;
     using System.Security.Claims;
 
     public class TestStartupConfigurationService<TDbContext> : IStartupConfigurationService
@@ -69,14 +69,18 @@ protected virtual void ConfigureStore(IServiceCollection services)
             services.AddDbContext<TDbContext>(options => options.UseSqlite(connection));
         }
 
-        protected virtual void ConfigureAuthentication(IServiceCollection services, string authenticationDefaultScheme = "Test")
+        protected virtual void ConfigureAuthentication(IServiceCollection services, params string[] authenticationDefaultSchemes)
         {
+            if (authenticationDefaultSchemes?.Any() != true)
+            {
+                authenticationDefaultSchemes = new string[] { "Test" };
+            }
+
             services.AddAuthentication(o =>
             {
-                o.DefaultAuthenticateScheme = authenticationDefaultScheme;
-                o.DefaultChallengeScheme = authenticationDefaultScheme;
+                o.DefaultScheme = authenticationDefaultSchemes.First();
             })
-            .AddTestAuthentication(authenticationDefaultScheme, "Test Authentication Scheme", o =>
+            .AddTestAuthentication(authenticationDefaultSchemes, "Test Authentication Scheme", o =>
             {
                 o.Identity = ConfigureIdentity();
             });
diff --git a/src/GeekLearning.Testavior/GeekLearning.Testavior.csproj b/src/GeekLearning.Testavior/GeekLearning.Testavior.csproj
@@ -19,11 +19,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,6 @@`
`1`	`1`	`namespace GeekLearning.Testavior.Authentication`
`2`	`2`	`{`
`3`	`3`	`using Microsoft.AspNetCore.Authentication;`
`4`		`- using Microsoft.Extensions.DependencyInjection;`
`5`		`- using Microsoft.Extensions.DependencyInjection.Extensions;`
`6`		`- using Microsoft.Extensions.Options;`
`7`	`4`	`using System;`
`8`	`5`
`9`	`6`	`public static class TestAuthenticationExtensions`
`@@ -12,5 +9,15 @@ public static AuthenticationBuilder AddTestAuthentication(this AuthenticationBui`
`12`	`9`	`{`
`13`	`10`	`return builder.AddScheme<TestAuthenticationOptions, TestAuthenticationHandler>(authenticationScheme, displayName, configureOptions);`
`14`	`11`	`}`
	`12`	`+`
	`13`	`+ public static AuthenticationBuilder AddTestAuthentication(this AuthenticationBuilder builder, string[] authenticationSchemes, string displayName, Action<TestAuthenticationOptions> configureOptions)`
	`14`	`+ {`
	`15`	`+ foreach (var authenticationScheme in authenticationSchemes)`
	`16`	`+ {`
	`17`	`+ builder = builder.AddScheme<TestAuthenticationOptions, TestAuthenticationHandler>(authenticationScheme, displayName, configureOptions);`
	`18`	`+ }`
	`19`	`+`
	`20`	`+ return builder;`
	`21`	`+ }`
`15`	`22`	`}`
`16`	`23`	`}`