Merge pull request #59 from mahendya1002/future

adding meta key feature support

Author: mahendya1002

CyberSource/Base/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.4.3")]
-[assembly: AssemblyFileVersion("1.4.3")]
+[assembly: AssemblyVersion("1.4.4")]
+[assembly: AssemblyFileVersion("1.4.4")]

CyberSource/Client/BaseClient.cs

@@ -19,7 +19,7 @@ public abstract class BaseClient
         /// <summary>
         /// Version of this client.
         /// </summary>
-        public const string CLIENT_LIBRARY_VERSION = "1.4.3";
+        public const string CLIENT_LIBRARY_VERSION = "1.4.4";
         public const string CYBS_SUBJECT_NAME = "CyberSource_SJC_US";
 
         /// <summary>
@@ -196,6 +196,10 @@ int boolVal
                 = AppSettings.GetSetting(
                     merchantID, Configuration.KEY_FILENAME);
 
+            config.KeyAlias
+               = AppSettings.GetSetting(
+                   merchantID, Configuration.KEY_ALIAS);
+
             config.Password
                 = AppSettings.GetSetting(
                     merchantID, Configuration.PASSWORD);

CyberSource/Client/Configuration.cs

@@ -19,6 +19,7 @@ public class Configuration
         internal const string SERVER_URL = "serverURL";
         internal const string CYBERSOURCE_URL = "cybersourceURL";
         internal const string KEY_FILENAME = "keyFilename";
+        internal const string KEY_ALIAS = "keyAlias";
         internal const string PASSWORD = "password";
         internal const string LOG_FILENAME = "logFilename";
         internal const string LOG_MAXIMUM_SIZE = "logMaximumSize";
@@ -63,6 +64,7 @@ public class Configuration
         private string logDirectory = null;
         private string serverURL = null;
         private string keyFilename = null;
+        private string keyAlias = null;
         private string password = null;
         private string logFilename = null;
         private int logMaximumSize = -1;
@@ -175,6 +177,18 @@ public string KeyFilename
             set { keyFilename = value; }
         }
 
+        public string KeyAlias
+        {
+            get
+            {
+                return (
+                    keyAlias != null
+                        ? keyAlias
+                        : merchantID);
+            }
+            set { keyAlias = value; }
+        }
+
         /// <summary>
         /// Corresponds to [cybs.][merchantID].password
         /// 
@@ -325,6 +339,11 @@ public string LogString
                     buf += NVP_SEPARATOR + KEY_FILENAME + NV_SEPARATOR + keyFilename;
                 }
 
+                if (keyAlias != null)
+                {
+                    buf += NVP_SEPARATOR + KEY_ALIAS + NV_SEPARATOR + keyAlias;
+                }
+
                 if (timeout != -1)
                 {
                     buf += NVP_SEPARATOR + TIMEOUT + NV_SEPARATOR + timeout;

CyberSource/Client/NVPClient.cs

@@ -80,12 +80,12 @@ public static Hashtable RunTransaction(
                     X509Certificate2 cybsCert = null;
                     DateTime dateFile = File.GetLastWriteTime(keyFilePath);
                     if (config.CertificateCacheEnabled)
-                    {
-                        if (!merchantIdentities.ContainsKey(config.MerchantID) || IsMerchantCertExpired(logger, config.MerchantID, dateFile, merchantIdentities))
+                    {
+                        if (!merchantIdentities.ContainsKey(config.KeyAlias) || IsMerchantCertExpired(logger, config.KeyAlias, dateFile, merchantIdentities))
                         {
                             if (logger != null)
-                            {
-                                logger.LogInfo("Loading certificate for merchantID " + config.MerchantID);
+                            {
+                                logger.LogInfo("Loading certificate for " + config.KeyAlias);
                             }
                             X509Certificate2Collection collection = new X509Certificate2Collection();
                             collection.Import(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
@@ -94,8 +94,8 @@ public static Hashtable RunTransaction(
                             X509Certificate2 newCybsCert = null;
 
                             foreach (X509Certificate2 cert1 in collection)
-                            {
-                                if (cert1.Subject.Contains(config.MerchantID))
+                            {
+                                if (cert1.Subject.Contains(config.KeyAlias))
                                 {
                                     newMerchantCert = cert1;
                                 }
@@ -111,12 +111,12 @@ public static Hashtable RunTransaction(
                                 CybsCert = newCybsCert,
                                 MerchantCert = newMerchantCert
                             };
-                            merchantIdentities.AddOrUpdate(config.MerchantID, newCert, (x, y) => newCert);
+                            merchantIdentities.AddOrUpdate(config.KeyAlias, newCert, (x, y) => newCert);
                         }
-                        merchantCert = GetOrFindValidMerchantCertFromStore(config.MerchantID, merchantIdentities);
+                        merchantCert = GetOrFindValidMerchantCertFromStore(config.KeyAlias, merchantIdentities);
                         if (config.UseSignedAndEncrypted)
                         {
-                            cybsCert = GetOrFindValidCybsCertFromStore(config.MerchantID, merchantIdentities);
+                            cybsCert = GetOrFindValidCybsCertFromStore(config.KeyAlias, merchantIdentities);
                         }
                     }
                     else
@@ -127,7 +127,7 @@ public static Hashtable RunTransaction(
 
                         foreach (X509Certificate2 cert1 in collection)
                         {
-                            if (cert1.Subject.Contains(config.MerchantID))
+                            if (cert1.Subject.Contains(config.KeyAlias))
                             {
                                 merchantCert = cert1;
                                 break;
@@ -138,7 +138,6 @@ public static Hashtable RunTransaction(
                         {
                             foreach (X509Certificate2 cert2 in collection)
                             {
-                                //Console.WriteLine(cert1.Subject);
                                 if (cert2.Subject.Contains(CYBERSOURCE_PUBLIC_KEY))
                                 {
                                     cybsCert = cert2;
@@ -281,7 +280,7 @@ private static void SetVersionInformation(Hashtable request)
             request["clientLibrary"] = ".NET NVP";
             request["clientLibraryVersion"] = CLIENT_LIBRARY_VERSION;
             request["clientEnvironment"] = mEnvironmentInfo;
-            request["clientSecurityLibraryVersion"] =".Net 1.4.3";
+            request["clientSecurityLibraryVersion"] =".Net 1.4.4";
         }
     }
 }

CyberSource/Client/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.4.3")]
-[assembly: AssemblyFileVersion("1.4.3")]
+[assembly: AssemblyVersion("1.4.4")]
+[assembly: AssemblyFileVersion("1.4.4")]