huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

React to DI changes

This commit is contained in:
Hao Kung 2015-03-04 18:07:34 -08:00 committed by Brennan
parent 329d826857
commit 1459ca1edb
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Microsoft.AspNet.Authorization/ServiceCollectionExtensions.cs
View File

@ -22,12 +22,11 @@ namespace Microsoft.Framework.DependencyInjection
// Review: Need UseDefaultSubkey parameter? // Review: Need UseDefaultSubkey parameter?
public static IServiceCollection AddAuthorization([NotNull] this IServiceCollection services, IConfiguration config = null, Action<AuthorizationOptions> configureOptions = null) public static IServiceCollection AddAuthorization([NotNull] this IServiceCollection services, IConfiguration config = null, Action<AuthorizationOptions> configureOptions = null)
{ {
var describe = new ServiceDescriber(config); services.AddOptions();
services.AddOptions(config); services.TryAdd(ServiceDescriptor.Transient<IAuthorizationService, DefaultAuthorizationService>());
services.TryAdd(describe.Transient<IAuthorizationService, DefaultAuthorizationService>()); services.AddTransient<IAuthorizationHandler, ClaimsAuthorizationHandler>();
services.Add(describe.Transient<IAuthorizationHandler, ClaimsAuthorizationHandler>()); services.AddTransient<IAuthorizationHandler, DenyAnonymousAuthorizationHandler>();
services.Add(describe.Transient<IAuthorizationHandler, DenyAnonymousAuthorizationHandler>()); services.AddTransient<IAuthorizationHandler, PassThroughAuthorizationHandler>();
services.Add(describe.Transient<IAuthorizationHandler, PassThroughAuthorizationHandler>());
if (configureOptions != null) if (configureOptions != null)
{ {
services.Configure(configureOptions); services.Configure(configureOptions);

1
test/Microsoft.AspNet.Authorization.Test/DefaultAuthorizationServiceTests.cs
View File

@ -7,7 +7,6 @@ using System.Linq;
using System.Security.Claims; using System.Security.Claims;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection;
using Microsoft.Framework.DependencyInjection.Fallback;
using Xunit; using Xunit;
namespace Microsoft.AspNet.Authorization.Test namespace Microsoft.AspNet.Authorization.Test