React to Options and Hosting changes

HaoK · HaoK · commit 84dfcf5258b1 · 2014-10-14T19:14:54.000-07:00
diff --git a/samples/CookieSample/Startup.cs b/samples/CookieSample/Startup.cs
@@ -9,7 +9,7 @@ public class Startup
     {
         public void Configure(IApplicationBuilder app)
         {
-            app.UsePerRequestServices(services => { });
+            app.UseServices(services => { });
             app.UseCookieAuthentication(options =>
             {
             });
diff --git a/samples/CookieSessionSample/Startup.cs b/samples/CookieSessionSample/Startup.cs
@@ -10,7 +10,7 @@ public class Startup
     {
         public void Configure(IApplicationBuilder app)
         {
-            app.UsePerRequestServices(services => { });
+            app.UseServices(services => { });
             app.UseCookieAuthentication(options => 
             {
                 options.SessionStore = new MemoryCacheSessionStore();
diff --git a/samples/SocialSample/Startup.cs b/samples/SocialSample/Startup.cs
@@ -24,7 +24,7 @@ public void Configure(IApplicationBuilder app)
         {
             app.UseErrorPage();
 
-            app.UsePerRequestServices(services =>
+            app.UseServices(services =>
             {
                 services.ConfigureOptions<ExternalAuthenticationOptions>(options =>
                 {
diff --git a/src/Microsoft.AspNet.Security.Cookies/CookieAuthenticationExtensions.cs b/src/Microsoft.AspNet.Security.Cookies/CookieAuthenticationExtensions.cs
@@ -15,7 +15,7 @@ public static class CookieAuthenticationExtensions
     {
         public static IServiceCollection ConfigureCookieAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<CookieAuthenticationOptions> configure)
         {
-            return services.ConfigureOptions(configure);
+            return services.Configure(configure);
         }
 
         /// <summary>
@@ -28,7 +28,7 @@ public static IServiceCollection ConfigureCookieAuthentication([NotNull] this IS
         public static IApplicationBuilder UseCookieAuthentication([NotNull] this IApplicationBuilder app, Action<CookieAuthenticationOptions> configureOptions = null, string optionsName = "")
         {
             return app.UseMiddleware<CookieAuthenticationMiddleware>(
-                new OptionsAction<CookieAuthenticationOptions>(configureOptions ?? (o => { }))
+                new ConfigureOptions<CookieAuthenticationOptions>(configureOptions ?? (o => { }))
                 {
                     Name = optionsName
                 });
diff --git a/src/Microsoft.AspNet.Security.Cookies/CookieAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.Cookies/CookieAuthenticationMiddleware.cs
@@ -20,8 +20,8 @@ public class CookieAuthenticationMiddleware : AuthenticationMiddleware<CookieAut
         public CookieAuthenticationMiddleware(RequestDelegate next, 
             IDataProtectionProvider dataProtectionProvider, 
             ILoggerFactory loggerFactory, 
-            IOptionsAccessor<CookieAuthenticationOptions> options,
-            IOptionsAction<CookieAuthenticationOptions> configureOptions)
+            IOptions<CookieAuthenticationOptions> options,
+            ConfigureOptions<CookieAuthenticationOptions> configureOptions)
             : base(next, options, configureOptions)
         {
             if (Options.Notifications == null)
diff --git a/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationExtensions.cs b/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationExtensions.cs
@@ -15,7 +15,7 @@ public static class FacebookAuthenticationExtensions
     {
         public static IServiceCollection ConfigureFacebookAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<FacebookAuthenticationOptions> configure)
         {
-            return services.ConfigureOptions(configure);
+            return services.Configure(configure);
         }
 
         /// <summary>
@@ -26,7 +26,7 @@ public static IServiceCollection ConfigureFacebookAuthentication([NotNull] this
         public static IApplicationBuilder UseFacebookAuthentication([NotNull] this IApplicationBuilder app, Action<FacebookAuthenticationOptions> configureOptions = null, string optionsName = "")
         {
             return app.UseMiddleware<FacebookAuthenticationMiddleware>(
-                 new OptionsAction<FacebookAuthenticationOptions>(configureOptions ?? (o => { }))
+                 new ConfigureOptions<FacebookAuthenticationOptions>(configureOptions ?? (o => { }))
                  {
                      Name = optionsName
                  });
diff --git a/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.Facebook/FacebookAuthenticationMiddleware.cs
@@ -28,9 +28,9 @@ public FacebookAuthenticationMiddleware(
             RequestDelegate next,
             IDataProtectionProvider dataProtectionProvider,
             ILoggerFactory loggerFactory,
-            IOptionsAccessor<ExternalAuthenticationOptions> externalOptions,
-            IOptionsAccessor<FacebookAuthenticationOptions> options,
-            IOptionsAction<FacebookAuthenticationOptions> configureOptions = null)
+            IOptions<ExternalAuthenticationOptions> externalOptions,
+            IOptions<FacebookAuthenticationOptions> options,
+            ConfigureOptions<FacebookAuthenticationOptions> configureOptions = null)
             : base(next, dataProtectionProvider, loggerFactory, externalOptions, options, configureOptions)
         {
             if (string.IsNullOrWhiteSpace(Options.AppId))
diff --git a/src/Microsoft.AspNet.Security.Google/GoogleAuthenticationExtensions.cs b/src/Microsoft.AspNet.Security.Google/GoogleAuthenticationExtensions.cs
@@ -15,7 +15,7 @@ public static class GoogleAuthenticationExtensions
     {
         public static IServiceCollection ConfigureGoogleAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<GoogleAuthenticationOptions> configure)
         {
-            return services.ConfigureOptions(configure);
+            return services.Configure(configure);
         }
 
         /// <summary>
@@ -28,7 +28,7 @@ public static IServiceCollection ConfigureGoogleAuthentication([NotNull] this IS
         public static IApplicationBuilder UseGoogleAuthentication([NotNull] this IApplicationBuilder app, Action<GoogleAuthenticationOptions> configureOptions = null, string optionsName = "")
         {
             return app.UseMiddleware<GoogleAuthenticationMiddleware>(
-                 new OptionsAction<GoogleAuthenticationOptions>(configureOptions ?? (o => { }))
+                 new ConfigureOptions<GoogleAuthenticationOptions>(configureOptions ?? (o => { }))
                  {
                      Name = optionsName
                  });
diff --git a/src/Microsoft.AspNet.Security.Google/GoogleAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.Google/GoogleAuthenticationMiddleware.cs
@@ -32,9 +32,9 @@ public GoogleAuthenticationMiddleware(
             RequestDelegate next,
             IDataProtectionProvider dataProtectionProvider,
             ILoggerFactory loggerFactory,
-            IOptionsAccessor<ExternalAuthenticationOptions> externalOptions,
-            IOptionsAccessor<GoogleAuthenticationOptions> options,
-            IOptionsAction<GoogleAuthenticationOptions> configureOptions = null)
+            IOptions<ExternalAuthenticationOptions> externalOptions,
+            IOptions<GoogleAuthenticationOptions> options,
+            ConfigureOptions<GoogleAuthenticationOptions> configureOptions = null)
             : base(next, dataProtectionProvider, loggerFactory, externalOptions, options, configureOptions)
         {
             if (Options.Notifications == null)
diff --git a/src/Microsoft.AspNet.Security.MicrosoftAccount/MicrosoftAccountAuthenticationExtensions.cs b/src/Microsoft.AspNet.Security.MicrosoftAccount/MicrosoftAccountAuthenticationExtensions.cs
@@ -15,13 +15,13 @@ public static class MicrosoftAccountAuthenticationExtensions
     {
         public static IServiceCollection ConfigureMicrosoftAccountAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<MicrosoftAccountAuthenticationOptions> configure)
         {
-            return services.ConfigureOptions(configure);
+            return services.Configure(configure);
         }
 
         public static IApplicationBuilder UseMicrosoftAccountAuthentication([NotNull] this IApplicationBuilder app, Action<MicrosoftAccountAuthenticationOptions> configureOptions = null, string optionsName = "")
         {
             return app.UseMiddleware<MicrosoftAccountAuthenticationMiddleware>(
-                 new OptionsAction<MicrosoftAccountAuthenticationOptions>(configureOptions ?? (o => { }))
+                 new ConfigureOptions<MicrosoftAccountAuthenticationOptions>(configureOptions ?? (o => { }))
                  {
                      Name = optionsName
                  });
diff --git a/src/Microsoft.AspNet.Security.MicrosoftAccount/MicrosoftAccountAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.MicrosoftAccount/MicrosoftAccountAuthenticationMiddleware.cs
@@ -28,9 +28,9 @@ public MicrosoftAccountAuthenticationMiddleware(
             RequestDelegate next,
             IDataProtectionProvider dataProtectionProvider,
             ILoggerFactory loggerFactory,
-            IOptionsAccessor<ExternalAuthenticationOptions> externalOptions,
-            IOptionsAccessor<MicrosoftAccountAuthenticationOptions> options,
-            IOptionsAction<MicrosoftAccountAuthenticationOptions> configureOptions = null)
+            IOptions<ExternalAuthenticationOptions> externalOptions,
+            IOptions<MicrosoftAccountAuthenticationOptions> options,
+            ConfigureOptions<MicrosoftAccountAuthenticationOptions> configureOptions = null)
             : base(next, dataProtectionProvider, loggerFactory, externalOptions, options, configureOptions)
         {
             if (Options.Notifications == null)
diff --git a/src/Microsoft.AspNet.Security.OAuth/OAuthAuthenticationExtensions.cs b/src/Microsoft.AspNet.Security.OAuth/OAuthAuthenticationExtensions.cs
@@ -23,7 +23,7 @@ public static class OAuthAuthenticationExtensions
         public static IApplicationBuilder UseOAuthAuthentication([NotNull] this IApplicationBuilder app, [NotNull] string authenticationType, Action<OAuthAuthenticationOptions<IOAuthAuthenticationNotifications>> configureOptions = null)
         {
             return app.UseMiddleware<OAuthAuthenticationMiddleware<OAuthAuthenticationOptions<IOAuthAuthenticationNotifications>, IOAuthAuthenticationNotifications>>(
-                new OptionsAction<OAuthAuthenticationOptions<IOAuthAuthenticationNotifications>>(options =>
+                new ConfigureOptions<OAuthAuthenticationOptions<IOAuthAuthenticationNotifications>>(options =>
                 {
                     options.AuthenticationType = authenticationType;
                     options.Caption = authenticationType;
diff --git a/src/Microsoft.AspNet.Security.OAuth/OAuthAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.OAuth/OAuthAuthenticationMiddleware.cs
@@ -33,9 +33,9 @@ public OAuthAuthenticationMiddleware(
             RequestDelegate next,
             IDataProtectionProvider dataProtectionProvider,
             ILoggerFactory loggerFactory,
-            IOptionsAccessor<ExternalAuthenticationOptions> externalOptions,
-            IOptionsAccessor<TOptions> options,
-            IOptionsAction<TOptions> configureOptions = null)
+            IOptions<ExternalAuthenticationOptions> externalOptions,
+            IOptions<TOptions> options,
+            ConfigureOptions<TOptions> configureOptions = null)
             : base(next, options, configureOptions)
         {
             // todo: review error handling
diff --git a/src/Microsoft.AspNet.Security.OAuth/OAuthBearerAuthenticationExtensions.cs b/src/Microsoft.AspNet.Security.OAuth/OAuthBearerAuthenticationExtensions.cs
@@ -32,7 +32,7 @@ public static IServiceCollection ConfigureOAuthBearerAuthentication([NotNull] th
         public static IApplicationBuilder UseOAuthBearerAuthentication([NotNull] this IApplicationBuilder app, Action<OAuthBearerAuthenticationOptions> configureOptions = null, string optionsName = "")
         {
             return app.UseMiddleware<OAuthBearerAuthenticationMiddleware>(
-                new OptionsAction<OAuthBearerAuthenticationOptions>(configureOptions ?? (o => { }))
+                new ConfigureOptions<OAuthBearerAuthenticationOptions>(configureOptions ?? (o => { }))
                 {
                     Name = optionsName
                 });
diff --git a/src/Microsoft.AspNet.Security.OAuth/OAuthBearerAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.OAuth/OAuthBearerAuthenticationMiddleware.cs
@@ -30,8 +30,8 @@ public OAuthBearerAuthenticationMiddleware(
             RequestDelegate next,
             IDataProtectionProvider dataProtectionProvider,
             ILoggerFactory loggerFactory,
-            IOptionsAccessor<OAuthBearerAuthenticationOptions> options,
-            IOptionsAction<OAuthBearerAuthenticationOptions> configureOptions)
+            IOptions<OAuthBearerAuthenticationOptions> options,
+            ConfigureOptions<OAuthBearerAuthenticationOptions> configureOptions)
             : base(next, options, configureOptions)
         {
             _logger = loggerFactory.Create<OAuthBearerAuthenticationMiddleware>();
diff --git a/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationExtensions.cs b/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationExtensions.cs
@@ -16,13 +16,13 @@ public static class TwitterAuthenticationExtensions
     {
         public static IServiceCollection ConfigureTwitterAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<TwitterAuthenticationOptions> configure)
         {
-            return services.ConfigureOptions(configure);
+            return services.Configure(configure);
         }
 
         public static IApplicationBuilder UseTwitterAuthentication([NotNull] this IApplicationBuilder app, Action<TwitterAuthenticationOptions> configureOptions = null, string optionsName = "")
         {
             return app.UseMiddleware<TwitterAuthenticationMiddleware>(
-                 new OptionsAction<TwitterAuthenticationOptions>(configureOptions ?? (o => { }))
+                 new ConfigureOptions<TwitterAuthenticationOptions>(configureOptions ?? (o => { }))
                  {
                      Name = optionsName
                  });
diff --git a/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security.Twitter/TwitterAuthenticationMiddleware.cs
@@ -36,9 +36,9 @@ public TwitterAuthenticationMiddleware(
             RequestDelegate next,
             IDataProtectionProvider dataProtectionProvider,
             ILoggerFactory loggerFactory,
-            IOptionsAccessor<ExternalAuthenticationOptions> externalOptions,
-            IOptionsAccessor<TwitterAuthenticationOptions> options,
-            IOptionsAction<TwitterAuthenticationOptions> configureOptions = null)
+            IOptions<ExternalAuthenticationOptions> externalOptions,
+            IOptions<TwitterAuthenticationOptions> options,
+            ConfigureOptions<TwitterAuthenticationOptions> configureOptions = null)
             : base(next, options, configureOptions)
         {
             if (string.IsNullOrWhiteSpace(Options.ConsumerSecret))
diff --git a/src/Microsoft.AspNet.Security/Infrastructure/AuthenticationMiddleware.cs b/src/Microsoft.AspNet.Security/Infrastructure/AuthenticationMiddleware.cs
@@ -14,12 +14,12 @@ namespace Microsoft.AspNet.Security.Infrastructure
     {
         private readonly RequestDelegate _next;
 
-        protected AuthenticationMiddleware([NotNull] RequestDelegate next, [NotNull] IOptionsAccessor<TOptions> options, IOptionsAction<TOptions> configureOptions)
+        protected AuthenticationMiddleware([NotNull] RequestDelegate next, [NotNull] IOptions<TOptions> options, ConfigureOptions<TOptions> configureOptions)
         {
             if (configureOptions != null)
             {
                 Options = options.GetNamedOptions(configureOptions.Name);
-                configureOptions.Invoke(Options);
+                configureOptions.Configure(Options, configureOptions.Name);
             }
             else
             {
diff --git a/test/Microsoft.AspNet.Security.Test/Cookies/CookieMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Cookies/CookieMiddlewareTests.cs
@@ -369,7 +369,7 @@ private static TestServer CreateServer(Action<CookieAuthenticationOptions> confi
         {
             return TestServer.Create(app =>
             {
-                app.UsePerRequestServices(services => { });
+                app.UseServices(services => { });
                 app.UseCookieAuthentication(configureOptions);
                 app.Use(async (context, next) =>
                 {
diff --git a/test/Microsoft.AspNet.Security.Test/Facebook/FacebookMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Facebook/FacebookMiddlewareTests.cs
@@ -27,7 +27,7 @@ public async Task ChallengeWillTriggerApplyRedirectEvent()
             var server = CreateServer(
                 app =>
                 {
-                    app.UsePerRequestServices(services =>
+                    app.UseServices(services =>
                     {
                         services.ConfigureFacebookAuthentication(options =>
                         {
@@ -45,7 +45,7 @@ public async Task ChallengeWillTriggerApplyRedirectEvent()
                         {
                             options.AuthenticationType = "External";
                         });
-                        services.ConfigureOptions<ExternalAuthenticationOptions>(options =>
+                        services.Configure<ExternalAuthenticationOptions>(options =>
                         {
                             options.SignInAsAuthenticationType = "External";
                         });
@@ -70,7 +70,7 @@ public async Task ChallengeWillTriggerRedirection()
             var server = CreateServer(
                 app =>
                 {
-                    app.UsePerRequestServices(services =>
+                    app.UseServices(services =>
                     {
                         services.ConfigureFacebookAuthentication(options =>
                         {
@@ -81,7 +81,7 @@ public async Task ChallengeWillTriggerRedirection()
                         {
                             options.AuthenticationType = "External";
                         });
-                        services.ConfigureOptions<ExternalAuthenticationOptions>(options =>
+                        services.Configure<ExternalAuthenticationOptions>(options =>
                         {
                             options.SignInAsAuthenticationType = "External";
                         });
diff --git a/test/Microsoft.AspNet.Security.Test/Google/GoogleMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Google/GoogleMiddlewareTests.cs
@@ -465,9 +465,9 @@ private static TestServer CreateServer(Action<GoogleAuthenticationOptions> confi
         {
             return TestServer.Create(app =>
             {
-                app.UsePerRequestServices(services =>
+                app.UseServices(services =>
                 {
-                    services.ConfigureOptions<ExternalAuthenticationOptions>(options =>
+                    services.Configure<ExternalAuthenticationOptions>(options =>
                     {
                         options.SignInAsAuthenticationType = CookieAuthenticationType;
                     });
diff --git a/test/Microsoft.AspNet.Security.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/MicrosoftAccount/MicrosoftAccountMiddlewareTests.cs
@@ -163,9 +163,9 @@ private static TestServer CreateServer(Action<MicrosoftAccountAuthenticationOpti
         {
             return TestServer.Create(app =>
             {
-                app.UsePerRequestServices(services =>
+                app.UseServices(services =>
                 {
-                    services.ConfigureOptions<ExternalAuthenticationOptions>(options =>
+                    services.Configure<ExternalAuthenticationOptions>(options =>
                     {
                         options.SignInAsAuthenticationType = "External";
                     });
diff --git a/test/Microsoft.AspNet.Security.Test/Twitter/TwitterMiddlewareTests.cs b/test/Microsoft.AspNet.Security.Test/Twitter/TwitterMiddlewareTests.cs
@@ -109,9 +109,9 @@ private static TestServer CreateServer(Action<IApplicationBuilder> configure, Fu
         {
             return TestServer.Create(app =>
             {
-                app.UsePerRequestServices(services =>
+                app.UseServices(services =>
                 {
-                    services.ConfigureOptions<ExternalAuthenticationOptions>(options =>
+                    services.Configure<ExternalAuthenticationOptions>(options =>
                     {
                         options.SignInAsAuthenticationType = "External";
                     });

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public class Startup`
`9`	`9`	`{`
`10`	`10`	`public void Configure(IApplicationBuilder app)`
`11`	`11`	`{`
`12`		`- app.UsePerRequestServices(services => { });`
	`12`	`+ app.UseServices(services => { });`
`13`	`13`	`app.UseCookieAuthentication(options =>`
`14`	`14`	`{`
`15`	`15`	`});`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class Startup`
`10`	`10`	`{`
`11`	`11`	`public void Configure(IApplicationBuilder app)`
`12`	`12`	`{`
`13`		`- app.UsePerRequestServices(services => { });`
	`13`	`+ app.UseServices(services => { });`
`14`	`14`	`app.UseCookieAuthentication(options =>`
`15`	`15`	`{`
`16`	`16`	`options.SessionStore = new MemoryCacheSessionStore();`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public void Configure(IApplicationBuilder app)`
`24`	`24`	`{`
`25`	`25`	`app.UseErrorPage();`
`26`	`26`
`27`		`- app.UsePerRequestServices(services =>`
	`27`	`+ app.UseServices(services =>`
`28`	`28`	`{`
`29`	`29`	`services.ConfigureOptions<ExternalAuthenticationOptions>(options =>`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static class CookieAuthenticationExtensions`
`15`	`15`	`{`
`16`	`16`	`public static IServiceCollection ConfigureCookieAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<CookieAuthenticationOptions> configure)`
`17`	`17`	`{`
`18`		`- return services.ConfigureOptions(configure);`
	`18`	`+ return services.Configure(configure);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`/// <summary>`
`@@ -28,7 +28,7 @@ public static IServiceCollection ConfigureCookieAuthentication([NotNull] this IS`
`28`	`28`	`public static IApplicationBuilder UseCookieAuthentication([NotNull] this IApplicationBuilder app, Action<CookieAuthenticationOptions> configureOptions = null, string optionsName = "")`
`29`	`29`	`{`
`30`	`30`	`return app.UseMiddleware<CookieAuthenticationMiddleware>(`
`31`		`- new OptionsAction<CookieAuthenticationOptions>(configureOptions ?? (o => { }))`
	`31`	`+ new ConfigureOptions<CookieAuthenticationOptions>(configureOptions ?? (o => { }))`
`32`	`32`	`{`
`33`	`33`	`Name = optionsName`
`34`	`34`	`});`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static class FacebookAuthenticationExtensions`
`15`	`15`	`{`
`16`	`16`	`public static IServiceCollection ConfigureFacebookAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<FacebookAuthenticationOptions> configure)`
`17`	`17`	`{`
`18`		`- return services.ConfigureOptions(configure);`
	`18`	`+ return services.Configure(configure);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`/// <summary>`
`@@ -26,7 +26,7 @@ public static IServiceCollection ConfigureFacebookAuthentication([NotNull] this`
`26`	`26`	`public static IApplicationBuilder UseFacebookAuthentication([NotNull] this IApplicationBuilder app, Action<FacebookAuthenticationOptions> configureOptions = null, string optionsName = "")`
`27`	`27`	`{`
`28`	`28`	`return app.UseMiddleware<FacebookAuthenticationMiddleware>(`
`29`		`- new OptionsAction<FacebookAuthenticationOptions>(configureOptions ?? (o => { }))`
	`29`	`+ new ConfigureOptions<FacebookAuthenticationOptions>(configureOptions ?? (o => { }))`
`30`	`30`	`{`
`31`	`31`	`Name = optionsName`
`32`	`32`	`});`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static class GoogleAuthenticationExtensions`
`15`	`15`	`{`
`16`	`16`	`public static IServiceCollection ConfigureGoogleAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<GoogleAuthenticationOptions> configure)`
`17`	`17`	`{`
`18`		`- return services.ConfigureOptions(configure);`
	`18`	`+ return services.Configure(configure);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`/// <summary>`
`@@ -28,7 +28,7 @@ public static IServiceCollection ConfigureGoogleAuthentication([NotNull] this IS`
`28`	`28`	`public static IApplicationBuilder UseGoogleAuthentication([NotNull] this IApplicationBuilder app, Action<GoogleAuthenticationOptions> configureOptions = null, string optionsName = "")`
`29`	`29`	`{`
`30`	`30`	`return app.UseMiddleware<GoogleAuthenticationMiddleware>(`
`31`		`- new OptionsAction<GoogleAuthenticationOptions>(configureOptions ?? (o => { }))`
	`31`	`+ new ConfigureOptions<GoogleAuthenticationOptions>(configureOptions ?? (o => { }))`
`32`	`32`	`{`
`33`	`33`	`Name = optionsName`
`34`	`34`	`});`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,13 @@ public static class MicrosoftAccountAuthenticationExtensions`
`15`	`15`	`{`
`16`	`16`	`public static IServiceCollection ConfigureMicrosoftAccountAuthentication([NotNull] this IServiceCollection services, [NotNull] Action<MicrosoftAccountAuthenticationOptions> configure)`
`17`	`17`	`{`
`18`		`- return services.ConfigureOptions(configure);`
	`18`	`+ return services.Configure(configure);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public static IApplicationBuilder UseMicrosoftAccountAuthentication([NotNull] this IApplicationBuilder app, Action<MicrosoftAccountAuthenticationOptions> configureOptions = null, string optionsName = "")`
`22`	`22`	`{`
`23`	`23`	`return app.UseMiddleware<MicrosoftAccountAuthenticationMiddleware>(`
`24`		`- new OptionsAction<MicrosoftAccountAuthenticationOptions>(configureOptions ?? (o => { }))`
	`24`	`+ new ConfigureOptions<MicrosoftAccountAuthenticationOptions>(configureOptions ?? (o => { }))`
`25`	`25`	`{`
`26`	`26`	`Name = optionsName`
`27`	`27`	`});`