Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.

Commit ae3dfcd

Browse files
committed
Remote ConfigureDefaultOptions
1 parent db9ae62 commit ae3dfcd

24 files changed

+3
-460
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
using System;
55
using Microsoft.AspNetCore.Authentication.Facebook;
6-
using Microsoft.AspNetCore.Authentication.Facebook.Internal;
7-
using Microsoft.Extensions.Options.Infrastructure;
86

97
namespace Microsoft.Extensions.DependencyInjection
108
{
@@ -17,9 +15,6 @@ public static IServiceCollection AddFacebookAuthentication(this IServiceCollecti
1715
=> services.AddFacebookAuthentication(FacebookDefaults.AuthenticationScheme, configureOptions);
1816

1917
public static IServiceCollection AddFacebookAuthentication(this IServiceCollection services, string authenticationScheme, Action<FacebookOptions> configureOptions)
20-
{
21-
services.AddSingleton<ConfigureDefaultOptions<FacebookOptions>, FacebookConfigureOptions>();
22-
return services.AddOAuthAuthentication<FacebookOptions, FacebookHandler>(authenticationScheme, configureOptions);
23-
}
18+
=> services.AddOAuthAuthentication<FacebookOptions, FacebookHandler>(authenticationScheme, configureOptions);
2419
}
2520
}

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

Lines changed: 0 additions & 16 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
<ItemGroup>
1515
<ProjectReference Include="..\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(AspNetCoreVersion)" />
1716
</ItemGroup>
1817

1918
</Project>

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
using System;
55
using Microsoft.AspNetCore.Authentication.Google;
6-
using Microsoft.AspNetCore.Authentication.Google.Internal;
7-
using Microsoft.Extensions.Options.Infrastructure;
86

97
namespace Microsoft.Extensions.DependencyInjection
108
{
@@ -17,9 +15,6 @@ public static IServiceCollection AddGoogleAuthentication(this IServiceCollection
1715
=> services.AddGoogleAuthentication(GoogleDefaults.AuthenticationScheme, configureOptions);
1816

1917
public static IServiceCollection AddGoogleAuthentication(this IServiceCollection services, string authenticationScheme, Action<GoogleOptions> configureOptions)
20-
{
21-
services.AddSingleton<ConfigureDefaultOptions<GoogleOptions>, GoogleConfigureOptions>();
22-
return services.AddOAuthAuthentication<GoogleOptions, GoogleHandler>(authenticationScheme, configureOptions);
23-
}
18+
=> services.AddOAuthAuthentication<GoogleOptions, GoogleHandler>(authenticationScheme, configureOptions);
2419
}
2520
}

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

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
<ItemGroup>
1515
<ProjectReference Include="..\Microsoft.AspNetCore.Authentication.OAuth\Microsoft.AspNetCore.Authentication.OAuth.csproj" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(AspNetCoreVersion)" />
1716
</ItemGroup>
1817

1918
</Project>

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33

44
using System;
55
using Microsoft.AspNetCore.Authentication.JwtBearer;
6-
using Microsoft.AspNetCore.Authentication.JwtBearer.Internal;
76
using Microsoft.Extensions.DependencyInjection.Extensions;
87
using Microsoft.Extensions.Options;
9-
using Microsoft.Extensions.Options.Infrastructure;
108

119
namespace Microsoft.Extensions.DependencyInjection
1210
{
@@ -21,7 +19,6 @@ public static IServiceCollection AddJwtBearerAuthentication(this IServiceCollect
2119
public static IServiceCollection AddJwtBearerAuthentication(this IServiceCollection services, string authenticationScheme, Action<JwtBearerOptions> configureOptions)
2220
{
2321
services.TryAddEnumerable(ServiceDescriptor.Singleton<IPostConfigureOptions<JwtBearerOptions>, JwtBearerPostConfigureOptions>());
24-
services.AddSingleton<ConfigureDefaultOptions<JwtBearerOptions>, JwtBearerConfigureOptions>();
2522
return services.AddScheme<JwtBearerOptions, JwtBearerHandler>(authenticationScheme, configureOptions);
2623
}
2724
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<ItemGroup>
1212
<ProjectReference Include="..\Microsoft.AspNetCore.Authentication\Microsoft.AspNetCore.Authentication.csproj" />
1313
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(IdentityModelOpenIdVersion)" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(AspNetCoreVersion)" />
1514
<PackageReference Include="Microsoft.Extensions.TaskCache.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
1615
</ItemGroup>
1716
</Project>

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)