AddXyz() binds to default config section

samples/OpenIdConnect.AzureAdSample/Startup.cs

@@ -72,7 +72,7 @@ public void ConfigureServices(IServiceCollection services)
             });
 
             services.AddAuthentication(sharedOptions =>
-                sharedOptions.DefaultAuthenticationScheme = CookieAuthenticationDefaults.AuthenticationScheme);
+                sharedOptions.DefaultAuthenticateScheme = CookieAuthenticationDefaults.AuthenticationScheme);
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerfactory)

samples/OpenIdConnectSample/Startup.cs

@@ -71,7 +71,7 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddAuthentication(sharedOptions =>
             {
-                sharedOptions.DefaultAuthenticationScheme = CookieAuthenticationDefaults.AuthenticationScheme;
+                sharedOptions.DefaultAuthenticateScheme = CookieAuthenticationDefaults.AuthenticationScheme;
                 sharedOptions.DefaultSignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
             });
         }

samples/SocialSample/Startup.cs

@@ -201,7 +201,7 @@ public void ConfigureServices(IServiceCollection services)
                 };
             });
 
-            services.AddAuthentication(options => options.DefaultAuthenticationScheme = CookieAuthenticationDefaults.AuthenticationScheme);
+            services.AddAuthentication(options => options.DefaultAuthenticateScheme = CookieAuthenticationDefaults.AuthenticationScheme);
         }
 
         public void Configure(IApplicationBuilder app, ILoggerFactory loggerfactory)

src/Microsoft.AspNetCore.Authentication.Facebook/FacebookConfigureOptions.cs

@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Authentication.Facebook
+{
+    internal class FacebookConfigureOptions : ConfigureNamedOptions<FacebookOptions>
+    {
+        public FacebookConfigureOptions(IConfiguration config) :
+            base(FacebookDefaults.AuthenticationScheme,
+                options => config.GetSection(FacebookDefaults.AuthenticationScheme).Bind(options))
+        { }
+    }
+}

src/Microsoft.AspNetCore.Authentication.Facebook/FacebookExtensions.cs

@@ -3,15 +3,28 @@
 
 using System;
 using Microsoft.AspNetCore.Authentication.Facebook;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class FacebookAuthenticationOptionsExtensions
     {
+        /// <summary>
+        /// Adds facebook authentication with options bound against the "Facebook" section 
+        /// from the IConfiguration in the service container.
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddFacebookAuthentication(this IServiceCollection services)
+            => services.AddFacebookAuthentication(FacebookDefaults.AuthenticationScheme, _ => { });
+
         public static IServiceCollection AddFacebookAuthentication(this IServiceCollection services, Action<FacebookOptions> configureOptions) 
             => services.AddFacebookAuthentication(FacebookDefaults.AuthenticationScheme, configureOptions);
 
-        public static IServiceCollection AddFacebookAuthentication(this IServiceCollection services, string authenticationScheme, Action<FacebookOptions> configureOptions) 
-            => services.AddScheme<FacebookOptions, FacebookHandler>(authenticationScheme, configureOptions);
+        public static IServiceCollection AddFacebookAuthentication(this IServiceCollection services, string authenticationScheme, Action<FacebookOptions> configureOptions)
+        {
+            services.AddSingleton<IConfigureOptions<FacebookOptions>, FacebookConfigureOptions>();
+            return services.AddScheme<FacebookOptions, FacebookHandler>(authenticationScheme, configureOptions);
+        }
     }
 }

src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj

@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
 </Project>

src/Microsoft.AspNetCore.Authentication.Google/GoogleConfigureOptions.cs

@@ -8,7 +8,6 @@ namespace Microsoft.AspNetCore.Authentication.Google
 {
     internal class GoogleConfigureOptions : ConfigureNamedOptions<GoogleOptions>
     {
-        // Bind to "Google" section by default
         public GoogleConfigureOptions(IConfiguration config) :
             base(GoogleDefaults.AuthenticationScheme,
                 options => config.GetSection(GoogleDefaults.AuthenticationScheme).Bind(options))

src/Microsoft.AspNetCore.Authentication.Google/GoogleExtensions.cs

@@ -16,15 +16,15 @@ public static class GoogleExtensions
         /// <param name="services"></param>
         /// <returns></returns>
         public static IServiceCollection AddGoogleAuthentication(this IServiceCollection services)
+            => services.AddGoogleAuthentication(GoogleDefaults.AuthenticationScheme, _ => { });
+
+        public static IServiceCollection AddGoogleAuthentication(this IServiceCollection services, Action<GoogleOptions> configureOptions) 
+            => services.AddGoogleAuthentication(GoogleDefaults.AuthenticationScheme, configureOptions);
+
+        public static IServiceCollection AddGoogleAuthentication(this IServiceCollection services, string authenticationScheme, Action<GoogleOptions> configureOptions)
         {
             services.AddSingleton<IConfigureOptions<GoogleOptions>, GoogleConfigureOptions>();
-            return services.AddGoogleAuthentication(o => { });
+            return services.AddScheme<GoogleOptions, GoogleHandler>(authenticationScheme, configureOptions);
         }
-
-        public static IServiceCollection AddGoogleAuthentication(this IServiceCollection services, Action<GoogleOptions> configureOptions) =>
-            services.AddGoogleAuthentication(GoogleDefaults.AuthenticationScheme, configureOptions);
-
-        public static IServiceCollection AddGoogleAuthentication(this IServiceCollection services, string authenticationScheme, Action<GoogleOptions> configureOptions) =>
-            services.AddScheme<GoogleOptions, GoogleHandler>(authenticationScheme, configureOptions);
     }
 }

src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerConfigureOptions.cs

@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Authentication.JwtBearer
+{
+    internal class JwtBearerConfigureOptions : ConfigureNamedOptions<JwtBearerOptions>
+    {
+        // Bind to "Bearer" section by default
+        public JwtBearerConfigureOptions(IConfiguration config) :
+            base(JwtBearerDefaults.AuthenticationScheme,
+                options => config.GetSection(JwtBearerDefaults.AuthenticationScheme).Bind(options))
+        { }
+    }
+}

src/Microsoft.AspNetCore.Authentication.JwtBearer/JwtBearerExtensions.cs

@@ -3,15 +3,28 @@
 
 using System;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class JwtBearerExtensions
     {
-        public static IServiceCollection AddJwtBearerAuthentication(this IServiceCollection services, Action<JwtBearerOptions> configureOptions) =>
-            services.AddJwtBearerAuthentication(JwtBearerDefaults.AuthenticationScheme, configureOptions);
+        /// <summary>
+        /// Adds JwtBearer authentication with options bound against the "Bearer" section 
+        /// from the IConfiguration in the service container.
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddJwtBearerAuthentication(this IServiceCollection services)
+            => services.AddJwtBearerAuthentication(JwtBearerDefaults.AuthenticationScheme, _ => { });
 
-        public static IServiceCollection AddJwtBearerAuthentication(this IServiceCollection services, string authenticationScheme, Action<JwtBearerOptions> configureOptions) =>
-            services.AddScheme<JwtBearerOptions, JwtBearerHandler>(authenticationScheme, configureOptions);
+        public static IServiceCollection AddJwtBearerAuthentication(this IServiceCollection services, Action<JwtBearerOptions> configureOptions) 
+            => services.AddJwtBearerAuthentication(JwtBearerDefaults.AuthenticationScheme, configureOptions);
+
+        public static IServiceCollection AddJwtBearerAuthentication(this IServiceCollection services, string authenticationScheme, Action<JwtBearerOptions> configureOptions)
+        {
+            services.AddSingleton<IConfigureOptions<JwtBearerOptions>, JwtBearerConfigureOptions>();
+            return services.AddScheme<JwtBearerOptions, JwtBearerHandler>(authenticationScheme, configureOptions);
+        }
     }
 }

src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj

@@ -11,6 +11,7 @@
     <ProjectReference Include="..\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(IdentityModelOpenIdVersion)" />
     <PackageReference Include="System.Security.Claims" Version="$(CoreFxVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
   </ItemGroup>
 </Project>

src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj

@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
 </Project>

src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/MicrosoftAccountConfigureOptions.cs

@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Authentication.MicrosoftAccount
+{
+    internal class MicrosoftAccountConfigureOptions : ConfigureNamedOptions<MicrosoftAccountOptions>
+    {
+        // Bind to "Microsoft" section by default
+        public MicrosoftAccountConfigureOptions(IConfiguration config) :
+            base(MicrosoftAccountDefaults.AuthenticationScheme,
+                options => config.GetSection(MicrosoftAccountDefaults.AuthenticationScheme).Bind(options))
+        { }
+    }
+}

src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/MicrosoftAccountExtensions.cs

@@ -3,16 +3,28 @@
 
 using System;
 using Microsoft.AspNetCore.Authentication.MicrosoftAccount;
-using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class MicrosoftAccountExtensions
     {
+        /// <summary>
+        /// Adds MicrosoftAccount authentication with options bound against the "Microsoft" section 
+        /// from the IConfiguration in the service container.
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddMicrosoftAccountAuthentication(this IServiceCollection services)
+            => services.AddMicrosoftAccountAuthentication(MicrosoftAccountDefaults.AuthenticationScheme, o => { });
+
         public static IServiceCollection AddMicrosoftAccountAuthentication(this IServiceCollection services, Action<MicrosoftAccountOptions> configureOptions) =>
             services.AddMicrosoftAccountAuthentication(MicrosoftAccountDefaults.AuthenticationScheme, configureOptions);
 
-        public static IServiceCollection AddMicrosoftAccountAuthentication(this IServiceCollection services, string authenticationScheme, Action<MicrosoftAccountOptions> configureOptions) =>
-            services.AddScheme<MicrosoftAccountOptions, MicrosoftAccountHandler>(authenticationScheme, configureOptions);
+        public static IServiceCollection AddMicrosoftAccountAuthentication(this IServiceCollection services, string authenticationScheme, Action<MicrosoftAccountOptions> configureOptions)
+        {
+            services.AddSingleton<IConfigureOptions<MicrosoftAccountOptions>, MicrosoftAccountConfigureOptions>();
+            return services.AddScheme<MicrosoftAccountOptions, MicrosoftAccountHandler>(authenticationScheme, configureOptions);
+        }
     }
 }

src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj

@@ -11,6 +11,7 @@
     <ProjectReference Include="..\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
     <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(IdentityModelOpenIdVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="System.Security.Claims" Version="$(CoreFxVersion)" />
   </ItemGroup>
 </Project>

src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectConfigureOptions.cs

@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Authentication.OpenIdConnect
+{
+    internal class OpenIdConnectConfigureOptions : ConfigureNamedOptions<OpenIdConnectOptions>
+    {
+        // Bind to "OpenIdConnect" section by default
+        public OpenIdConnectConfigureOptions(IConfiguration config) :
+            base(OpenIdConnectDefaults.AuthenticationScheme,
+                options => config.GetSection(OpenIdConnectDefaults.AuthenticationScheme).Bind(options))
+        { }
+    }
+}

src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectExtensions.cs

@@ -3,19 +3,28 @@
 
 using System;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class OpenIdConnectExtensions
     {
-        public static IServiceCollection AddOpenIdConnectAuthentication(this IServiceCollection services, Action<OpenIdConnectOptions> configureOptions) =>
-            services.AddOpenIdConnectAuthentication(OpenIdConnectDefaults.AuthenticationScheme, configureOptions);
+        /// <summary>
+        /// Adds OpenIdConnect authentication with options bound against the "OpenIdConnect" section 
+        /// from the IConfiguration in the service container.
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddOpenIdConnectAuthentication(this IServiceCollection services)
+            => services.AddOpenIdConnectAuthentication(OpenIdConnectDefaults.AuthenticationScheme, _ => { });
+
+        public static IServiceCollection AddOpenIdConnectAuthentication(this IServiceCollection services, Action<OpenIdConnectOptions> configureOptions) 
+            => services.AddOpenIdConnectAuthentication(OpenIdConnectDefaults.AuthenticationScheme, configureOptions);
 
         public static IServiceCollection AddOpenIdConnectAuthentication(this IServiceCollection services, string authenticationScheme, Action<OpenIdConnectOptions> configureOptions)
         {
-            //services.AddRemoteScheme<OpenIdConnectOptions, OpenIdConnectHandler>(authenticationScheme, configureOptions, o => new PathString[] { o.CallbackPath, o.SignedOutCallbackPath, o.RemoteSignOutPath });
-            services.AddScheme<OpenIdConnectOptions, OpenIdConnectHandler>(authenticationScheme, configureOptions);
-            return services;
+            services.AddSingleton<IConfigureOptions<OpenIdConnectOptions>, OpenIdConnectConfigureOptions>();
+            return services.AddScheme<OpenIdConnectOptions, OpenIdConnectHandler>(authenticationScheme, configureOptions);
         }
     }
 }

src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj

@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
   </ItemGroup>
 

src/Microsoft.AspNetCore.Authentication.Twitter/TwitterConfigureOptions.cs

@@ -0,0 +1,17 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace Microsoft.AspNetCore.Authentication.Twitter
+{
+    internal class TwitterConfigureOptions : ConfigureNamedOptions<TwitterOptions>
+    {
+        // Bind to "Twitter" section by default
+        public TwitterConfigureOptions(IConfiguration config) :
+            base(TwitterDefaults.AuthenticationScheme,
+                options => config.GetSection(TwitterDefaults.AuthenticationScheme).Bind(options))
+        { }
+    }
+}

src/Microsoft.AspNetCore.Authentication.Twitter/TwitterExtensions.cs

@@ -3,15 +3,28 @@
 
 using System;
 using Microsoft.AspNetCore.Authentication.Twitter;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class TwitterExtensions
     {
-        public static IServiceCollection AddTwitterAuthentication(this IServiceCollection services, Action<TwitterOptions> configureOptions) =>
-            services.AddTwitterAuthentication(TwitterDefaults.AuthenticationScheme, configureOptions);
+        /// <summary>
+        /// Adds Twitter authentication with options bound against the "Twitter" section 
+        /// from the IConfiguration in the service container.
+        /// </summary>
+        /// <param name="services"></param>
+        /// <returns></returns>
+        public static IServiceCollection AddTwitterAuthentication(this IServiceCollection services)
+            => services.AddTwitterAuthentication(TwitterDefaults.AuthenticationScheme, _ => { });
 
-        public static IServiceCollection AddTwitterAuthentication(this IServiceCollection services, string authenticationScheme, Action<TwitterOptions> configureOptions) =>
-            services.AddScheme<TwitterOptions, TwitterHandler>(authenticationScheme, configureOptions);
+        public static IServiceCollection AddTwitterAuthentication(this IServiceCollection services, Action<TwitterOptions> configureOptions)
+            => services.AddTwitterAuthentication(TwitterDefaults.AuthenticationScheme, configureOptions);
+
+        public static IServiceCollection AddTwitterAuthentication(this IServiceCollection services, string authenticationScheme, Action<TwitterOptions> configureOptions)
+        {
+            services.AddSingleton<IConfigureOptions<TwitterOptions>, TwitterConfigureOptions>();
+            return services.AddScheme<TwitterOptions, TwitterHandler>(authenticationScheme, configureOptions);
+        }
     }
 }