Merge pull request #44 from geeklearningio/release/1.1.0

arnaudauroux · web-flow · commit 8a8f43317e75 · 2017-08-29T14:55:32.000+02:00
Release/1.1.0
diff --git a/src/GeekLearning.Testavior/Authentication/TestAuthenticationExtensions.cs b/src/GeekLearning.Testavior/Authentication/TestAuthenticationExtensions.cs
@@ -10,7 +10,6 @@ public static class TestAuthenticationExtensions
     {
         public static AuthenticationBuilder AddTestAuthentication(this AuthenticationBuilder builder, string authenticationScheme, string displayName, Action<TestAuthenticationOptions> configureOptions)
         {
-            builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IPostConfigureOptions<TestAuthenticationOptions>, TestAuthenticationPostConfigureOptions>());
             return builder.AddScheme<TestAuthenticationOptions, TestAuthenticationHandler>(authenticationScheme, displayName, configureOptions);
         }
     }
diff --git a/src/GeekLearning.Testavior/Authentication/TestAuthenticationPostConfigureOptions.cs b/src/GeekLearning.Testavior/Authentication/TestAuthenticationPostConfigureOptions.cs
diff --git a/src/GeekLearning.Testavior/Environment/TestStartupConfigurationService.cs b/src/GeekLearning.Testavior/Environment/TestStartupConfigurationService.cs
@@ -52,12 +52,12 @@ protected virtual void SetupStore(IApplicationBuilder app)
 
                 dbContext.Database.OpenConnection();
                 dbContext.Database.EnsureCreated();
-            }
+            } 
         }
 
         protected virtual void SetupBuilder(IApplicationBuilder app)
         {
-            app.UseAuthentication();            
+            app.UseAuthentication();
         }
 
         protected virtual void ConfigureStore(IServiceCollection services)
@@ -71,11 +71,14 @@ protected virtual void ConfigureStore(IServiceCollection services)
 
         protected virtual void ConfigureAuthentication(IServiceCollection services, string authenticationDefaultScheme = "Test")
         {
-            services.AddAuthentication(authenticationDefaultScheme)
-                    .AddTestAuthentication(authenticationDefaultScheme, "Test Authentication Scheme", o =>
-                    {
-                        o.Identity = ConfigureIdentity();
-                    });
+            services.AddAuthentication(o =>
+            {
+                o.DefaultAuthenticateScheme = authenticationDefaultScheme;
+            })
+            .AddTestAuthentication(authenticationDefaultScheme, "Test Authentication Scheme", o =>
+            {
+                o.Identity = ConfigureIdentity();
+            });
         }
 
         protected virtual ClaimsIdentity ConfigureIdentity()

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ public static class TestAuthenticationExtensions`
`10`	`10`	`{`
`11`	`11`	`public static AuthenticationBuilder AddTestAuthentication(this AuthenticationBuilder builder, string authenticationScheme, string displayName, Action<TestAuthenticationOptions> configureOptions)`
`12`	`12`	`{`
`13`		`- builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<IPostConfigureOptions<TestAuthenticationOptions>, TestAuthenticationPostConfigureOptions>());`
`14`	`13`	`return builder.AddScheme<TestAuthenticationOptions, TestAuthenticationHandler>(authenticationScheme, displayName, configureOptions);`
`15`	`14`	`}`
`16`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,12 +52,12 @@ protected virtual void SetupStore(IApplicationBuilder app)`
`52`	`52`
`53`	`53`	`dbContext.Database.OpenConnection();`
`54`	`54`	`dbContext.Database.EnsureCreated();`
`55`		`- }`
	`55`	`+ }`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`protected virtual void SetupBuilder(IApplicationBuilder app)`
`59`	`59`	`{`
`60`		`- app.UseAuthentication();`
	`60`	`+ app.UseAuthentication();`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`protected virtual void ConfigureStore(IServiceCollection services)`
`@@ -71,11 +71,14 @@ protected virtual void ConfigureStore(IServiceCollection services)`
`71`	`71`
`72`	`72`	`protected virtual void ConfigureAuthentication(IServiceCollection services, string authenticationDefaultScheme = "Test")`
`73`	`73`	`{`
`74`		`- services.AddAuthentication(authenticationDefaultScheme)`
`75`		`- .AddTestAuthentication(authenticationDefaultScheme, "Test Authentication Scheme", o =>`
`76`		`- {`
`77`		`- o.Identity = ConfigureIdentity();`
`78`		`- });`
	`74`	`+ services.AddAuthentication(o =>`
	`75`	`+ {`
	`76`	`+ o.DefaultAuthenticateScheme = authenticationDefaultScheme;`
	`77`	`+ })`
	`78`	`+ .AddTestAuthentication(authenticationDefaultScheme, "Test Authentication Scheme", o =>`
	`79`	`+ {`
	`80`	`+ o.Identity = ConfigureIdentity();`
	`81`	`+ });`
`79`	`82`	`}`
`80`	`83`
`81`	`84`	`protected virtual ClaimsIdentity ConfigureIdentity()`