From 88eb10dcfe46a2036fa57f96214ad1244efcb4a2 Mon Sep 17 00:00:00 2001
From: Brennan <brecon@microsoft.com>
Date: Thu, 5 Mar 2015 14:21:35 -0800
Subject: [PATCH] DI API changes

---
 .../CngCbcAuthenticatedEncryptorConfigurationXmlReader.cs  | 7 ++-----
 .../CngGcmAuthenticatedEncryptorConfigurationXmlReader.cs  | 7 ++-----
 .../ManagedAuthenticatedEncryptorConfigurationXmlReader.cs | 7 ++-----
 .../DataProtectionServiceCollectionExtensions.cs           | 1 -
 .../KeyManagement/XmlKeyManager.cs                         | 5 +----
 5 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationXmlReader.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationXmlReader.cs
index 575f9da317..c799c3823c 100644
--- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationXmlReader.cs
+++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorConfigurationXmlReader.cs
@@ -13,14 +13,11 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption
     internal sealed class CngCbcAuthenticatedEncryptorConfigurationXmlReader : IAuthenticatedEncryptorConfigurationXmlReader
     {
         private readonly IServiceProvider _serviceProvider;
-        private readonly ITypeActivator _typeActivator;
 
         public CngCbcAuthenticatedEncryptorConfigurationXmlReader(
-            [NotNull] IServiceProvider serviceProvider,
-            [NotNull] ITypeActivator typeActivator)
+            [NotNull] IServiceProvider serviceProvider)
         {
             _serviceProvider = serviceProvider;
-            _typeActivator = typeActivator;
         }
 
         public IAuthenticatedEncryptorConfiguration FromXml([NotNull] XElement element)
@@ -51,7 +48,7 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption
             var encryptedSecretElement = element.Element(CngCbcAuthenticatedEncryptorConfiguration.SecretElementName).Elements().Single();
             var secretElementDecryptorTypeName = (string)encryptedSecretElement.Attribute("decryptor");
             var secretElementDecryptorType = Type.GetType(secretElementDecryptorTypeName, throwOnError: true);
-            var secretElementDecryptor = (IXmlDecryptor)_typeActivator.CreateInstance(_serviceProvider, secretElementDecryptorType);
+            var secretElementDecryptor = (IXmlDecryptor)ActivatorUtilities.CreateInstance(_serviceProvider, secretElementDecryptorType);
             var decryptedSecretElement = secretElementDecryptor.Decrypt(encryptedSecretElement);
             CryptoUtil.Assert(decryptedSecretElement.Name == CngCbcAuthenticatedEncryptorConfiguration.SecretElementName,
                 @"TODO: Bad element.");
diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationXmlReader.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationXmlReader.cs
index a8abe60a34..de6a1bc707 100644
--- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationXmlReader.cs
+++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorConfigurationXmlReader.cs
@@ -13,14 +13,11 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption
     internal sealed class CngGcmAuthenticatedEncryptorConfigurationXmlReader : IAuthenticatedEncryptorConfigurationXmlReader
     {
         private readonly IServiceProvider _serviceProvider;
-        private readonly ITypeActivator _typeActivator;
 
         public CngGcmAuthenticatedEncryptorConfigurationXmlReader(
-            [NotNull] IServiceProvider serviceProvider,
-            [NotNull] ITypeActivator typeActivator)
+            [NotNull] IServiceProvider serviceProvider)
         {
             _serviceProvider = serviceProvider;
-            _typeActivator = typeActivator;
         }
 
         public IAuthenticatedEncryptorConfiguration FromXml([NotNull] XElement element)
@@ -45,7 +42,7 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption
             var encryptedSecretElement = element.Element(CngGcmAuthenticatedEncryptorConfiguration.SecretElementName).Elements().Single();
             var secretElementDecryptorTypeName = (string)encryptedSecretElement.Attribute("decryptor");
             var secretElementDecryptorType = Type.GetType(secretElementDecryptorTypeName, throwOnError: true);
-            var secretElementDecryptor = (IXmlDecryptor)_typeActivator.CreateInstance(_serviceProvider, secretElementDecryptorType);
+            var secretElementDecryptor = (IXmlDecryptor)ActivatorUtilities.CreateInstance(_serviceProvider, secretElementDecryptorType);
             var decryptedSecretElement = secretElementDecryptor.Decrypt(encryptedSecretElement);
             CryptoUtil.Assert(decryptedSecretElement.Name == CngGcmAuthenticatedEncryptorConfiguration.SecretElementName,
                 @"TODO: Bad element.");
diff --git a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationXmlReader.cs b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationXmlReader.cs
index d199a7e621..b9b8821a40 100644
--- a/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationXmlReader.cs
+++ b/src/Microsoft.AspNet.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorConfigurationXmlReader.cs
@@ -13,14 +13,11 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption
     internal sealed class ManagedAuthenticatedEncryptorConfigurationXmlReader : IAuthenticatedEncryptorConfigurationXmlReader
     {
         private readonly IServiceProvider _serviceProvider;
-        private readonly ITypeActivator _typeActivator;
 
         public ManagedAuthenticatedEncryptorConfigurationXmlReader(
-            [NotNull] IServiceProvider serviceProvider,
-            [NotNull] ITypeActivator typeActivator)
+            [NotNull] IServiceProvider serviceProvider)
         {
             _serviceProvider = serviceProvider;
-            _typeActivator = typeActivator;
         }
 
         public IAuthenticatedEncryptorConfiguration FromXml([NotNull] XElement element)
@@ -49,7 +46,7 @@ namespace Microsoft.AspNet.DataProtection.AuthenticatedEncryption
             var encryptedSecretElement = element.Element(ManagedAuthenticatedEncryptorConfiguration.SecretElementName).Elements().Single();
             var secretElementDecryptorTypeName = (string)encryptedSecretElement.Attribute("decryptor");
             var secretElementDecryptorType = Type.GetType(secretElementDecryptorTypeName, throwOnError: true);
-            var secretElementDecryptor = (IXmlDecryptor)_typeActivator.CreateInstance(_serviceProvider, secretElementDecryptorType);
+            var secretElementDecryptor = (IXmlDecryptor)ActivatorUtilities.CreateInstance(_serviceProvider, secretElementDecryptorType);
             var decryptedSecretElement = secretElementDecryptor.Decrypt(encryptedSecretElement);
             CryptoUtil.Assert(decryptedSecretElement.Name == ManagedAuthenticatedEncryptorConfiguration.SecretElementName,
                 @"TODO: Bad element.");
diff --git a/src/Microsoft.AspNet.DataProtection/DataProtectionServiceCollectionExtensions.cs b/src/Microsoft.AspNet.DataProtection/DataProtectionServiceCollectionExtensions.cs
index 76df9b201c..384e4bbc2e 100644
--- a/src/Microsoft.AspNet.DataProtection/DataProtectionServiceCollectionExtensions.cs
+++ b/src/Microsoft.AspNet.DataProtection/DataProtectionServiceCollectionExtensions.cs
@@ -96,7 +96,6 @@ namespace Microsoft.Framework.DependencyInjection
             descriptors.AddRange(new[]
             {
                 ServiceDescriptor.Singleton<IAuthenticatedEncryptorConfigurationFactory, CngCbcAuthenticatedEncryptorConfigurationFactory>(),
-                ServiceDescriptor.Singleton<ITypeActivator, TypeActivator>(),
                 ServiceDescriptor.Singleton<IKeyManager, XmlKeyManager>(),
                 ServiceDescriptor.Singleton<IDataProtectionProvider, DefaultDataProtectionProvider>()
             });
diff --git a/src/Microsoft.AspNet.DataProtection/KeyManagement/XmlKeyManager.cs b/src/Microsoft.AspNet.DataProtection/KeyManagement/XmlKeyManager.cs
index 2eebe38f43..e31cd5353a 100644
--- a/src/Microsoft.AspNet.DataProtection/KeyManagement/XmlKeyManager.cs
+++ b/src/Microsoft.AspNet.DataProtection/KeyManagement/XmlKeyManager.cs
@@ -35,20 +35,17 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
 
         private readonly IAuthenticatedEncryptorConfigurationFactory _authenticatedEncryptorConfigurationFactory;
         private readonly IServiceProvider _serviceProvider;
-        private readonly ITypeActivator _typeActivator;
         private readonly IXmlRepository _xmlRepository;
         private readonly IXmlEncryptor _xmlEncryptor;
 
         public XmlKeyManager(
             [NotNull] IServiceProvider serviceProvider,
             [NotNull] IAuthenticatedEncryptorConfigurationFactory authenticatedEncryptorConfigurationFactory,
-            [NotNull] ITypeActivator typeActivator,
             [NotNull] IXmlRepository xmlRepository,
             [NotNull] IXmlEncryptor xmlEncryptor)
         {
             _serviceProvider = serviceProvider;
             _authenticatedEncryptorConfigurationFactory = authenticatedEncryptorConfigurationFactory;
-            _typeActivator = typeActivator;
             _xmlRepository = xmlRepository;
             _xmlEncryptor = xmlEncryptor;
         }
@@ -175,7 +172,7 @@ namespace Microsoft.AspNet.DataProtection.KeyManagement
             CryptoUtil.Assert(typeof(IAuthenticatedEncryptorConfigurationXmlReader).IsAssignableFrom(encryptorConfigurationParserType),
                 "TODO: typeof(IAuthenticatedEncryptorConfigurationXmlReader).IsAssignableFrom(encryptorConfigurationParserType)");
 
-            var parser = (IAuthenticatedEncryptorConfigurationXmlReader)_typeActivator.CreateInstance(_serviceProvider, encryptorConfigurationParserType);
+            var parser = (IAuthenticatedEncryptorConfigurationXmlReader)ActivatorUtilities.CreateInstance(_serviceProvider, encryptorConfigurationParserType);
             var encryptorConfiguration = parser.FromXml(encryptorConfigurationAsXml);
 
             Guid keyId = (Guid)keyElement.Attribute(IdAttributeName);