Merge pull request #56 from mahendya1002/future

mahendya1002 · web-flow · commit 056bec7c5fc7 · 2020-07-02T18:57:30.000+05:30
changed creation date check for p12 to modified date
diff --git a/CyberSource/Client/BaseClient.cs b/CyberSource/Client/BaseClient.cs
@@ -402,12 +402,12 @@ protected static X509Certificate2 GetOrFindValidCybsCertFromStore(string merchan
         /// <param name="logger"></param>
         /// <param name="merchantId"></param>
         /// <param name="creationTime"></param>
-        /// <returns></returns>
-        public static bool IsMerchantCertExpired(Logger logger, string merchantId, DateTime creationTime, ConcurrentDictionary<string, CertificateEntry> merchantIdentities)
+        /// <returns></returns>
+        public static bool IsMerchantCertExpired(Logger logger, string merchantId, DateTime modifiedTime, ConcurrentDictionary<string, CertificateEntry> merchantIdentities)
         {
             if (merchantIdentities[merchantId] != null)
             {
-                if (merchantIdentities[merchantId].CreationTime != creationTime)
+                if (merchantIdentities[merchantId].ModifiedTime != modifiedTime)
                 {
                     if (logger != null)
                     {
diff --git a/CyberSource/Client/CertificateEntry.cs b/CyberSource/Client/CertificateEntry.cs
@@ -10,7 +10,7 @@ namespace CyberSource.Clients
     /// </summary>
     public class CertificateEntry
     {
-        public DateTime CreationTime { get; set; }
+        public DateTime ModifiedTime { get; set; }
         public X509Certificate2 MerchantCert { get; set; }
         public X509Certificate2 CybsCert { get; set; }
     }
diff --git a/CyberSource/Client/NVPClient.cs b/CyberSource/Client/NVPClient.cs
@@ -78,7 +78,7 @@ public static Hashtable RunTransaction(
                     string keyFilePath = Path.Combine(config.KeysDirectory, config.EffectiveKeyFilename);
                     X509Certificate2 merchantCert = null;
                     X509Certificate2 cybsCert = null;
-                    DateTime dateFile = File.GetCreationTime(keyFilePath);
+                    DateTime dateFile = File.GetLastWriteTime(keyFilePath);
                     if (config.CertificateCacheEnabled)
                     {
                         if (!merchantIdentities.ContainsKey(config.MerchantID) || IsMerchantCertExpired(logger, config.MerchantID, dateFile, merchantIdentities))
@@ -107,7 +107,7 @@ public static Hashtable RunTransaction(
                             }
                             CertificateEntry newCert = new CertificateEntry
                             {
-                                CreationTime = dateFile,
+                                ModifiedTime = dateFile,
                                 CybsCert = newCybsCert,
                                 MerchantCert = newMerchantCert
                             };
diff --git a/CyberSource/Client/SoapClient.cs b/CyberSource/Client/SoapClient.cs
@@ -80,7 +80,7 @@ public static ReplyMessage RunTransaction(
 
                     X509Certificate2 merchantCert = null;
                     X509Certificate2 cybsCert = null;
-                    DateTime dateFile = File.GetCreationTime(keyFilePath);
+                    DateTime dateFile = File.GetLastWriteTime(keyFilePath);
                     if (config.CertificateCacheEnabled)
                     {
                         if (!merchantIdentities.ContainsKey(config.MerchantID) || IsMerchantCertExpired(logger, config.MerchantID, dateFile, merchantIdentities))
@@ -110,7 +110,7 @@ public static ReplyMessage RunTransaction(
                             }
                             CertificateEntry newCert = new CertificateEntry
                             {
-                                CreationTime = dateFile,
+                                ModifiedTime = dateFile,
                                 CybsCert = newCybsCert,
                                 MerchantCert = newMerchantCert
                             };
diff --git a/CyberSource/Client/XmlClient.cs b/CyberSource/Client/XmlClient.cs
@@ -92,7 +92,7 @@ public static XmlDocument RunTransaction(
                 string keyFilePath = Path.Combine(config.KeysDirectory, config.EffectiveKeyFilename);
                 X509Certificate2 merchantCert = null;
                 X509Certificate2 cybsCert = null;
-                DateTime dateFile = File.GetCreationTime(keyFilePath);
+                DateTime dateFile = File.GetLastWriteTime(keyFilePath);
                 if (config.CertificateCacheEnabled) 
                 {
                     if (!merchantIdentities.ContainsKey(config.MerchantID) || IsMerchantCertExpired(logger, config.MerchantID, dateFile, merchantIdentities))
@@ -122,7 +122,7 @@ public static XmlDocument RunTransaction(
                         }
                         CertificateEntry newCert = new CertificateEntry
                         {
-                            CreationTime = dateFile,
+                            ModifiedTime = dateFile,
                             CybsCert = newCybsCert,
                             MerchantCert = newMerchantCert
                         };

Original file line number	Diff line number	Diff line change
`@@ -402,12 +402,12 @@ protected static X509Certificate2 GetOrFindValidCybsCertFromStore(string merchan`
`402`	`402`	`/// <param name="logger"></param>`
`403`	`403`	`/// <param name="merchantId"></param>`
`404`	`404`	`/// <param name="creationTime"></param>`
`405`		`- /// <returns></returns>`
`406`		`- public static bool IsMerchantCertExpired(Logger logger, string merchantId, DateTime creationTime, ConcurrentDictionary<string, CertificateEntry> merchantIdentities)`
	`405`	`+ /// <returns></returns>`
	`406`	`+ public static bool IsMerchantCertExpired(Logger logger, string merchantId, DateTime modifiedTime, ConcurrentDictionary<string, CertificateEntry> merchantIdentities)`
`407`	`407`	`{`
`408`	`408`	`if (merchantIdentities[merchantId] != null)`
`409`	`409`	`{`
`410`		`- if (merchantIdentities[merchantId].CreationTime != creationTime)`
	`410`	`+ if (merchantIdentities[merchantId].ModifiedTime != modifiedTime)`
`411`	`411`	`{`
`412`	`412`	`if (logger != null)`
`413`	`413`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace CyberSource.Clients`
`10`	`10`	`/// </summary>`
`11`	`11`	`public class CertificateEntry`
`12`	`12`	`{`
`13`		`- public DateTime CreationTime { get; set; }`
	`13`	`+ public DateTime ModifiedTime { get; set; }`
`14`	`14`	`public X509Certificate2 MerchantCert { get; set; }`
`15`	`15`	`public X509Certificate2 CybsCert { get; set; }`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public static Hashtable RunTransaction(`
`78`	`78`	`string keyFilePath = Path.Combine(config.KeysDirectory, config.EffectiveKeyFilename);`
`79`	`79`	`X509Certificate2 merchantCert = null;`
`80`	`80`	`X509Certificate2 cybsCert = null;`
`81`		`- DateTime dateFile = File.GetCreationTime(keyFilePath);`
	`81`	`+ DateTime dateFile = File.GetLastWriteTime(keyFilePath);`
`82`	`82`	`if (config.CertificateCacheEnabled)`
`83`	`83`	`{`
`84`	`84`	`if (!merchantIdentities.ContainsKey(config.MerchantID) \|\| IsMerchantCertExpired(logger, config.MerchantID, dateFile, merchantIdentities))`
`@@ -107,7 +107,7 @@ public static Hashtable RunTransaction(`
`107`	`107`	`}`
`108`	`108`	`CertificateEntry newCert = new CertificateEntry`
`109`	`109`	`{`
`110`		`- CreationTime = dateFile,`
	`110`	`+ ModifiedTime = dateFile,`
`111`	`111`	`CybsCert = newCybsCert,`
`112`	`112`	`MerchantCert = newMerchantCert`
`113`	`113`	`};`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public static ReplyMessage RunTransaction(`
`80`	`80`
`81`	`81`	`X509Certificate2 merchantCert = null;`
`82`	`82`	`X509Certificate2 cybsCert = null;`
`83`		`- DateTime dateFile = File.GetCreationTime(keyFilePath);`
	`83`	`+ DateTime dateFile = File.GetLastWriteTime(keyFilePath);`
`84`	`84`	`if (config.CertificateCacheEnabled)`
`85`	`85`	`{`
`86`	`86`	`if (!merchantIdentities.ContainsKey(config.MerchantID) \|\| IsMerchantCertExpired(logger, config.MerchantID, dateFile, merchantIdentities))`
`@@ -110,7 +110,7 @@ public static ReplyMessage RunTransaction(`
`110`	`110`	`}`
`111`	`111`	`CertificateEntry newCert = new CertificateEntry`
`112`	`112`	`{`
`113`		`- CreationTime = dateFile,`
	`113`	`+ ModifiedTime = dateFile,`
`114`	`114`	`CybsCert = newCybsCert,`
`115`	`115`	`MerchantCert = newMerchantCert`
`116`	`116`	`};`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public static XmlDocument RunTransaction(`
`92`	`92`	`string keyFilePath = Path.Combine(config.KeysDirectory, config.EffectiveKeyFilename);`
`93`	`93`	`X509Certificate2 merchantCert = null;`
`94`	`94`	`X509Certificate2 cybsCert = null;`
`95`		`- DateTime dateFile = File.GetCreationTime(keyFilePath);`
	`95`	`+ DateTime dateFile = File.GetLastWriteTime(keyFilePath);`
`96`	`96`	`if (config.CertificateCacheEnabled)`
`97`	`97`	`{`
`98`	`98`	`if (!merchantIdentities.ContainsKey(config.MerchantID) \|\| IsMerchantCertExpired(logger, config.MerchantID, dateFile, merchantIdentities))`
`@@ -122,7 +122,7 @@ public static XmlDocument RunTransaction(`
`122`	`122`	`}`
`123`	`123`	`CertificateEntry newCert = new CertificateEntry`
`124`	`124`	`{`
`125`		`- CreationTime = dateFile,`
	`125`	`+ ModifiedTime = dateFile,`
`126`	`126`	`CybsCert = newCybsCert,`
`127`	`127`	`MerchantCert = newMerchantCert`
`128`	`128`	`};`