From 5e7f1d7eff060aea0010b32b8bf68b36b51635b2 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 6 Mar 2015 12:37:34 -0800 Subject: [PATCH] Add Configure overloads for Auth for config/name --- .../CookieServiceCollectionExtensions.cs | 18 +++++++++++++++- .../FacebookServiceCollectionExtensions.cs | 21 ++++++++++++++++--- .../GoogleServiceCollectionExtensions.cs | 18 +++++++++++++++- ...osoftAccountServiceCollectionExtensions.cs | 18 +++++++++++++++- .../OAuthBearerServiceCollectionExtensions.cs | 18 +++++++++++++++- .../NotNullAttribute.cs | 12 +++++++++++ ...penIdConnectServiceCollectionExtensions.cs | 20 ++++++++++++++++-- .../TwitterServiceCollectionExtensions.cs | 18 +++++++++++++++- 8 files changed, 133 insertions(+), 10 deletions(-) create mode 100644 src/Microsoft.AspNet.Authentication.OpenIdConnect/NotNullAttribute.cs diff --git a/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs index 476dc948fa..03632b1a6d 100644 --- a/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.Cookies/CookieServiceCollectionExtensions.cs @@ -3,6 +3,7 @@ using System; using Microsoft.AspNet.Authentication.Cookies; +using Microsoft.Framework.ConfigurationModel; using Microsoft.Framework.DependencyInjection; namespace Microsoft.Framework.DependencyInjection @@ -14,7 +15,22 @@ namespace Microsoft.Framework.DependencyInjection { public static IServiceCollection ConfigureCookieAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure) { - return services.Configure(configure); + return services.ConfigureCookieAuthentication(configure, optionsName: ""); + } + + public static IServiceCollection ConfigureCookieAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure, string optionsName) + { + return services.Configure(configure, optionsName); + } + + public static IServiceCollection ConfigureCookieAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config) + { + return services.ConfigureCookieAuthentication(config, optionsName: ""); + } + + public static IServiceCollection ConfigureCookieAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config, string optionsName) + { + return services.Configure(config, optionsName); } } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.Authentication.Facebook/FacebookServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.Facebook/FacebookServiceCollectionExtensions.cs index 8d044dd40a..f6117a10b9 100644 --- a/src/Microsoft.AspNet.Authentication.Facebook/FacebookServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.Facebook/FacebookServiceCollectionExtensions.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Authentication.Facebook; -using Microsoft.Framework.OptionsModel; using System; +using Microsoft.AspNet.Authentication.Facebook; +using Microsoft.Framework.ConfigurationModel; namespace Microsoft.Framework.DependencyInjection { @@ -14,7 +14,22 @@ namespace Microsoft.Framework.DependencyInjection { public static IServiceCollection ConfigureFacebookAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure) { - return services.Configure(configure); + return services.ConfigureFacebookAuthentication(configure, optionsName: ""); + } + + public static IServiceCollection ConfigureFacebookAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure, string optionsName) + { + return services.Configure(configure, optionsName); + } + + public static IServiceCollection ConfigureFacebookAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config) + { + return services.ConfigureFacebookAuthentication(config, optionsName: ""); + } + + public static IServiceCollection ConfigureFacebookAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config, string optionsName) + { + return services.Configure(config, optionsName); } } } diff --git a/src/Microsoft.AspNet.Authentication.Google/GoogleServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.Google/GoogleServiceCollectionExtensions.cs index a5a8b4b508..239dbea29c 100644 --- a/src/Microsoft.AspNet.Authentication.Google/GoogleServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.Google/GoogleServiceCollectionExtensions.cs @@ -3,6 +3,7 @@ using System; using Microsoft.AspNet.Authentication.Google; +using Microsoft.Framework.ConfigurationModel; namespace Microsoft.Framework.DependencyInjection { @@ -13,7 +14,22 @@ namespace Microsoft.Framework.DependencyInjection { public static IServiceCollection ConfigureGoogleAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure) { - return services.Configure(configure); + return services.ConfigureGoogleAuthentication(configure, optionsName: ""); + } + + public static IServiceCollection ConfigureGoogleAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure, string optionsName) + { + return services.Configure(configure, optionsName); + } + + public static IServiceCollection ConfigureGoogleAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config) + { + return services.ConfigureGoogleAuthentication(config, optionsName: ""); + } + + public static IServiceCollection ConfigureGoogleAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config, string optionsName) + { + return services.Configure(config, optionsName); } } } \ No newline at end of file diff --git a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountServiceCollectionExtensions.cs index b3e1e11103..4fe4f12272 100644 --- a/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.MicrosoftAccount/MicrosoftAccountServiceCollectionExtensions.cs @@ -3,6 +3,7 @@ using System; using Microsoft.AspNet.Authentication.MicrosoftAccount; +using Microsoft.Framework.ConfigurationModel; namespace Microsoft.Framework.DependencyInjection { @@ -13,7 +14,22 @@ namespace Microsoft.Framework.DependencyInjection { public static IServiceCollection ConfigureMicrosoftAccountAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure) { - return services.Configure(configure); + return services.ConfigureMicrosoftAccountAuthentication(configure, optionsName: ""); + } + + public static IServiceCollection ConfigureMicrosoftAccountAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure, string optionsName) + { + return services.Configure(configure, optionsName); + } + + public static IServiceCollection ConfigureMicrosoftAccountAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config) + { + return services.ConfigureMicrosoftAccountAuthentication(config, optionsName: ""); + } + + public static IServiceCollection ConfigureMicrosoftAccountAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config, string optionsName) + { + return services.Configure(config, optionsName); } } } diff --git a/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerServiceCollectionExtensions.cs index 5a878dcbb1..b195abff89 100644 --- a/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.OAuthBearer/OAuthBearerServiceCollectionExtensions.cs @@ -3,6 +3,7 @@ using System; using Microsoft.AspNet.Authentication.OAuthBearer; +using Microsoft.Framework.ConfigurationModel; namespace Microsoft.Framework.DependencyInjection { @@ -13,7 +14,22 @@ namespace Microsoft.Framework.DependencyInjection { public static IServiceCollection ConfigureOAuthBearerAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure) { - return services.ConfigureOptions(configure); + return services.ConfigureOAuthBearerAuthentication(configure, optionsName: ""); + } + + public static IServiceCollection ConfigureOAuthBearerAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure, string optionsName) + { + return services.Configure(configure, optionsName); + } + + public static IServiceCollection ConfigureOAuthBearerAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config) + { + return services.ConfigureOAuthBearerAuthentication(config, optionsName: ""); + } + + public static IServiceCollection ConfigureOAuthBearerAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config, string optionsName) + { + return services.Configure(config, optionsName); } } } diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/NotNullAttribute.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/NotNullAttribute.cs new file mode 100644 index 0000000000..6453923f5d --- /dev/null +++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/NotNullAttribute.cs @@ -0,0 +1,12 @@ +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; + +namespace Microsoft.AspNet.Authentication.OpenIdConnect +{ + [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)] + internal sealed class NotNullAttribute : Attribute + { + } +} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectServiceCollectionExtensions.cs index 390568fd3b..eca491cd5b 100644 --- a/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.OpenIdConnect/OpenIdConnectServiceCollectionExtensions.cs @@ -3,6 +3,7 @@ using System; using Microsoft.AspNet.Authentication.OpenIdConnect; +using Microsoft.Framework.ConfigurationModel; namespace Microsoft.Framework.DependencyInjection { @@ -11,9 +12,24 @@ namespace Microsoft.Framework.DependencyInjection /// public static class OpenIdConnectServiceCollectionExtensions { - public static IServiceCollection ConfigureOpenIdConnect(this IServiceCollection services, Action configure) + public static IServiceCollection ConfigureOpenIdConnectAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure) { - return services.ConfigureOptions(configure); + return services.ConfigureOpenIdConnectAuthentication(configure, optionsName: ""); + } + + public static IServiceCollection ConfigureOpenIdConnectAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure, string optionsName) + { + return services.Configure(configure, optionsName); + } + + public static IServiceCollection ConfigureOpenIdConnectAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config) + { + return services.ConfigureOpenIdConnectAuthentication(config, optionsName: ""); + } + + public static IServiceCollection ConfigureOpenIdConnectAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config, string optionsName) + { + return services.Configure(config, optionsName); } } } diff --git a/src/Microsoft.AspNet.Authentication.Twitter/TwitterServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Authentication.Twitter/TwitterServiceCollectionExtensions.cs index 7c25c17377..dad039952c 100644 --- a/src/Microsoft.AspNet.Authentication.Twitter/TwitterServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Authentication.Twitter/TwitterServiceCollectionExtensions.cs @@ -3,6 +3,7 @@ using System; using Microsoft.AspNet.Authentication.Twitter; +using Microsoft.Framework.ConfigurationModel; namespace Microsoft.Framework.DependencyInjection { @@ -13,7 +14,22 @@ namespace Microsoft.Framework.DependencyInjection { public static IServiceCollection ConfigureTwitterAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure) { - return services.Configure(configure); + return services.ConfigureTwitterAuthentication(configure, optionsName: ""); + } + + public static IServiceCollection ConfigureTwitterAuthentication([NotNull] this IServiceCollection services, [NotNull] Action configure, string optionsName) + { + return services.Configure(configure, optionsName); + } + + public static IServiceCollection ConfigureTwitterAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config) + { + return services.ConfigureTwitterAuthentication(config, optionsName: ""); + } + + public static IServiceCollection ConfigureTwitterAuthentication([NotNull] this IServiceCollection services, [NotNull] IConfiguration config, string optionsName) + { + return services.Configure(config, optionsName); } } }