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

React to options

This commit is contained in:
Hao Kung 2015-08-26 16:05:01 -07:00
parent 35fd0403a6
commit a4144caedd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.DataProtection/DataProtectionProviderFactory.cs
View File

@ -43,7 +43,7 @@ namespace Microsoft.AspNet.DataProtection
{ {
var keyRingProvider = new KeyRingProvider( var keyRingProvider = new KeyRingProvider(
keyManager: services.GetRequiredService<IKeyManager>(), keyManager: services.GetRequiredService<IKeyManager>(),
keyManagementOptions: services.GetService<IOptions<KeyManagementOptions>>()?.Options, // might be null keyManagementOptions: services.GetService<IOptions<KeyManagementOptions>>()?.Value, // might be null
services: services); services: services);
dataProtectionProvider = new KeyRingBasedDataProtectionProvider(keyRingProvider, services); dataProtectionProvider = new KeyRingBasedDataProtectionProvider(keyRingProvider, services);
} }

2
src/Microsoft.AspNet.DataProtection/DataProtectionServiceDescriptors.cs
View File

@ -86,7 +86,7 @@ namespace Microsoft.Framework.DependencyInjection
{ {
return ServiceDescriptor.Singleton<IDataProtectionProvider>( return ServiceDescriptor.Singleton<IDataProtectionProvider>(
services => DataProtectionProviderFactory.GetProviderFromServices( services => DataProtectionProviderFactory.GetProviderFromServices(
options: services.GetRequiredService<IOptions<DataProtectionOptions>>().Options, options: services.GetRequiredService<IOptions<DataProtectionOptions>>().Value,
services: services, services: services,
mustCreateImmediately: true /* this is the ultimate fallback */)); mustCreateImmediately: true /* this is the ultimate fallback */));
} }

2
test/Microsoft.AspNet.DataProtection.Test/RegistryPolicyResolverTests.cs
View File

@ -63,7 +63,7 @@ namespace Microsoft.AspNet.DataProtection
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var keyManagementOptions = services.GetService<IOptions<KeyManagementOptions>>(); var keyManagementOptions = services.GetService<IOptions<KeyManagementOptions>>();
Assert.Equal(TimeSpan.FromDays(1024), keyManagementOptions.Options.NewKeyLifetime); Assert.Equal(TimeSpan.FromDays(1024), keyManagementOptions.Value.NewKeyLifetime);
} }
[ConditionalFact] [ConditionalFact]