Merge pull request #153 from CyberSource/may-release

May release

Author: gaubansa

Client/ApiClient.cs

@@ -24,6 +24,7 @@
 using AuthenticationSdk.util;
 using System.Security.Cryptography.X509Certificates;
 using NLog;
+using System.Security;
 
 namespace CyberSource.Client
 {
@@ -456,11 +457,16 @@ public object CallApi(
             {
                 string clientCertDirectory = Configuration.MerchantConfigDictionaryObj["clientCertDirectory"];
                 string clientCertFile = Configuration.MerchantConfigDictionaryObj["clientCertFile"];
-                string clientCertPassword = Configuration.MerchantConfigDictionaryObj["clientCertPassword"];
+                SecureString clientCertPassword = new SecureString();
+                foreach (char c in Configuration.MerchantConfigDictionaryObj["clientCertPassword"])
+                {
+                    clientCertPassword.AppendChar(c);
+                }
+                clientCertPassword.MakeReadOnly();
                 string fileName = Path.Combine(clientCertDirectory, clientCertFile);
                 // Importing Certificates
                 var certificate = new X509Certificate2(fileName, clientCertPassword);
-                clientCertPassword=string.Empty;
+                clientCertPassword.Dispose();
                 RestClient.Options.ClientCertificates = new X509CertificateCollection { certificate };
             }
 

Model/InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInformation.cs

@@ -40,8 +40,10 @@ public partial class InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInfo
         /// <param name="HeaderStyle">HeaderStyle.</param>
         /// <param name="DeliveryLanguage">The language of the email that we send to your customers. Possible values are &#x60;zh-CN&#x60;, &#x60;zh-TW&#x60;, &#x60;en-US&#x60;, &#x60;fr-FR&#x60;, &#x60;de-DE&#x60;, &#x60;ja-JP&#x60;, &#x60;pt-BR&#x60;, &#x60;ru-RU&#x60; and &#x60;es-419&#x60;..</param>
         /// <param name="DefaultCurrencyCode">Currency used for the order. Use the three-character [ISO Standard Currency Codes.](http://apps.cybersource.com/library/documentation/sbc/quickref/currencies.pdf)  #### Used by **Authorization** Required field.  **Authorization Reversal** For an authorization reversal (&#x60;reversalInformation&#x60;) or a capture (&#x60;processingOptions.capture&#x60; is set to &#x60;true&#x60;), you must use the same currency that you used in your payment authorization request.  #### PIN Debit Currency for the amount you requested for the PIN debit purchase. This value is returned for partial authorizations. The issuing bank can approve a partial amount if the balance on the debit card is less than the requested transaction amount. For the possible values, see the [ISO Standard Currency Codes](https://developer.cybersource.com/library/documentation/sbc/quickref/currencies.pdf). Returned by PIN debit purchase.  For PIN debit reversal requests, you must use the same currency that was used for the PIN debit purchase or PIN debit credit that you are reversing. For the possible values, see the [ISO Standard Currency Codes](https://developer.cybersource.com/library/documentation/sbc/quickref/currencies.pdf).  Required field for PIN Debit purchase and PIN Debit credit requests. Optional field for PIN Debit reversal requests.  #### GPX This field is optional for reversing an authorization or credit.  #### DCC for First Data Your local currency. For details, see the &#x60;currency&#x60; field description in [Dynamic Currency Conversion For First Data Using the SCMP API](http://apps.cybersource.com/library/documentation/dev_guides/DCC_FirstData_SCMP/DCC_FirstData_SCMP_API.pdf).  #### Tax Calculation Required for international tax and value added tax only. Optional for U.S. and Canadian taxes. Your local currency. .</param>
-        /// <param name="PayerAuthentication3DSVersion">The 3D Secure payer authentication version or status for a merchant&#39;s invoice payments. Possible values are: - &#x60;1&#x60; - &#x60;2&#x60; - &#x60;None&#x60; - &#x60;Disabled&#x60; .</param>
-        public InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInformation(string MerchantLogo = default(string), string MerchantDisplayName = default(string), string CustomEmailMessage = default(string), bool? EnableReminders = default(bool?), InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInformationHeaderStyle HeaderStyle = default(InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInformationHeaderStyle), string DeliveryLanguage = default(string), string DefaultCurrencyCode = default(string), string PayerAuthentication3DSVersion = default(string))
+        /// <param name="PayerAuthentication3DSVersion">The 3D Secure payer authentication status for a merchant&#39;s invoice payments. (default to false).</param>
+        /// <param name="ShowVatNumber">Display VAT number on Invoice. (default to false).</param>
+        /// <param name="VatRegistrationNumber">Your government-assigned tax identification number.  #### Tax Calculation Required field for value added tax only. Not applicable to U.S. and Canadian taxes.       .</param>
+        public InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInformation(string MerchantLogo = default(string), string MerchantDisplayName = default(string), string CustomEmailMessage = default(string), bool? EnableReminders = default(bool?), InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInformationHeaderStyle HeaderStyle = default(InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInformationHeaderStyle), string DeliveryLanguage = default(string), string DefaultCurrencyCode = default(string), bool? PayerAuthentication3DSVersion = false, bool? ShowVatNumber = false, string VatRegistrationNumber = default(string))
         {
             this.MerchantLogo = MerchantLogo;
             this.MerchantDisplayName = MerchantDisplayName;
@@ -50,7 +52,25 @@ public partial class InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInfo
             this.HeaderStyle = HeaderStyle;
             this.DeliveryLanguage = DeliveryLanguage;
             this.DefaultCurrencyCode = DefaultCurrencyCode;
-            this.PayerAuthentication3DSVersion = PayerAuthentication3DSVersion;
+            // use default value if no "PayerAuthentication3DSVersion" provided
+            if (PayerAuthentication3DSVersion == null)
+            {
+                this.PayerAuthentication3DSVersion = false;
+            }
+            else
+            {
+                this.PayerAuthentication3DSVersion = PayerAuthentication3DSVersion;
+            }
+            // use default value if no "ShowVatNumber" provided
+            if (ShowVatNumber == null)
+            {
+                this.ShowVatNumber = false;
+            }
+            else
+            {
+                this.ShowVatNumber = ShowVatNumber;
+            }
+            this.VatRegistrationNumber = VatRegistrationNumber;
         }
 
         /// <summary>
@@ -102,11 +122,25 @@ public partial class InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInfo
         public string DefaultCurrencyCode { get; set; }
 
         /// <summary>
-        /// The 3D Secure payer authentication version or status for a merchant&#39;s invoice payments. Possible values are: - &#x60;1&#x60; - &#x60;2&#x60; - &#x60;None&#x60; - &#x60;Disabled&#x60; 
+        /// The 3D Secure payer authentication status for a merchant&#39;s invoice payments.
         /// </summary>
-        /// <value>The 3D Secure payer authentication version or status for a merchant&#39;s invoice payments. Possible values are: - &#x60;1&#x60; - &#x60;2&#x60; - &#x60;None&#x60; - &#x60;Disabled&#x60; </value>
+        /// <value>The 3D Secure payer authentication status for a merchant&#39;s invoice payments.</value>
         [DataMember(Name="payerAuthentication3DSVersion", EmitDefaultValue=false)]
-        public string PayerAuthentication3DSVersion { get; set; }
+        public bool? PayerAuthentication3DSVersion { get; set; }
+
+        /// <summary>
+        /// Display VAT number on Invoice.
+        /// </summary>
+        /// <value>Display VAT number on Invoice.</value>
+        [DataMember(Name="showVatNumber", EmitDefaultValue=false)]
+        public bool? ShowVatNumber { get; set; }
+
+        /// <summary>
+        /// Your government-assigned tax identification number.  #### Tax Calculation Required field for value added tax only. Not applicable to U.S. and Canadian taxes.       
+        /// </summary>
+        /// <value>Your government-assigned tax identification number.  #### Tax Calculation Required field for value added tax only. Not applicable to U.S. and Canadian taxes.       </value>
+        [DataMember(Name="vatRegistrationNumber", EmitDefaultValue=false)]
+        public string VatRegistrationNumber { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
@@ -124,6 +158,8 @@ public override string ToString()
             sb.Append("  DeliveryLanguage: ").Append(DeliveryLanguage).Append("\n");
             sb.Append("  DefaultCurrencyCode: ").Append(DefaultCurrencyCode).Append("\n");
             sb.Append("  PayerAuthentication3DSVersion: ").Append(PayerAuthentication3DSVersion).Append("\n");
+            sb.Append("  ShowVatNumber: ").Append(ShowVatNumber).Append("\n");
+            sb.Append("  VatRegistrationNumber: ").Append(VatRegistrationNumber).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -199,6 +235,16 @@ public bool Equals(InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInform
                     this.PayerAuthentication3DSVersion == other.PayerAuthentication3DSVersion ||
                     this.PayerAuthentication3DSVersion != null &&
                     this.PayerAuthentication3DSVersion.Equals(other.PayerAuthentication3DSVersion)
+                ) && 
+                (
+                    this.ShowVatNumber == other.ShowVatNumber ||
+                    this.ShowVatNumber != null &&
+                    this.ShowVatNumber.Equals(other.ShowVatNumber)
+                ) && 
+                (
+                    this.VatRegistrationNumber == other.VatRegistrationNumber ||
+                    this.VatRegistrationNumber != null &&
+                    this.VatRegistrationNumber.Equals(other.VatRegistrationNumber)
                 );
         }
 
@@ -229,6 +275,10 @@ public override int GetHashCode()
                     hash = hash * 59 + this.DefaultCurrencyCode.GetHashCode();
                 if (this.PayerAuthentication3DSVersion != null)
                     hash = hash * 59 + this.PayerAuthentication3DSVersion.GetHashCode();
+                if (this.ShowVatNumber != null)
+                    hash = hash * 59 + this.ShowVatNumber.GetHashCode();
+                if (this.VatRegistrationNumber != null)
+                    hash = hash * 59 + this.VatRegistrationNumber.GetHashCode();
                 return hash;
             }
         }

Model/Invoicingv2invoiceSettingsInvoiceSettingsInformation.cs

@@ -41,7 +41,9 @@ public partial class Invoicingv2invoiceSettingsInvoiceSettingsInformation :  IEq
         /// <param name="DeliveryLanguage">The language of the email that we send to your customers. Possible values are &#x60;zh-CN&#x60;, &#x60;zh-TW&#x60;, &#x60;en-US&#x60;, &#x60;fr-FR&#x60;, &#x60;de-DE&#x60;, &#x60;ja-JP&#x60;, &#x60;pt-BR&#x60;, &#x60;ru-RU&#x60; and &#x60;es-419&#x60;..</param>
         /// <param name="DefaultCurrencyCode">Currency used for the order. Use the three-character [ISO Standard Currency Codes.](http://apps.cybersource.com/library/documentation/sbc/quickref/currencies.pdf)  #### Used by **Authorization** Required field.  **Authorization Reversal** For an authorization reversal (&#x60;reversalInformation&#x60;) or a capture (&#x60;processingOptions.capture&#x60; is set to &#x60;true&#x60;), you must use the same currency that you used in your payment authorization request.  #### PIN Debit Currency for the amount you requested for the PIN debit purchase. This value is returned for partial authorizations. The issuing bank can approve a partial amount if the balance on the debit card is less than the requested transaction amount. For the possible values, see the [ISO Standard Currency Codes](https://developer.cybersource.com/library/documentation/sbc/quickref/currencies.pdf). Returned by PIN debit purchase.  For PIN debit reversal requests, you must use the same currency that was used for the PIN debit purchase or PIN debit credit that you are reversing. For the possible values, see the [ISO Standard Currency Codes](https://developer.cybersource.com/library/documentation/sbc/quickref/currencies.pdf).  Required field for PIN Debit purchase and PIN Debit credit requests. Optional field for PIN Debit reversal requests.  #### GPX This field is optional for reversing an authorization or credit.  #### DCC for First Data Your local currency. For details, see the &#x60;currency&#x60; field description in [Dynamic Currency Conversion For First Data Using the SCMP API](http://apps.cybersource.com/library/documentation/dev_guides/DCC_FirstData_SCMP/DCC_FirstData_SCMP_API.pdf).  #### Tax Calculation Required for international tax and value added tax only. Optional for U.S. and Canadian taxes. Your local currency. .</param>
         /// <param name="PayerAuthenticationInInvoicing">For a merchant&#39;s invoice payments, enable 3D Secure payer authentication version 1, update to 3D Secure version 2, or disable 3D Secure. Possible values are:  - &#x60;enable&#x60; - &#x60;update&#x60; - &#x60;disable&#x60;  .</param>
-        public Invoicingv2invoiceSettingsInvoiceSettingsInformation(string MerchantLogo = default(string), string MerchantDisplayName = default(string), string CustomEmailMessage = default(string), bool? EnableReminders = default(bool?), InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInformationHeaderStyle HeaderStyle = default(InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInformationHeaderStyle), string DeliveryLanguage = default(string), string DefaultCurrencyCode = default(string), string PayerAuthenticationInInvoicing = default(string))
+        /// <param name="ShowVatNumber">Display VAT number on Invoice. (default to false).</param>
+        /// <param name="VatRegistrationNumber">Your government-assigned tax identification number.  #### Tax Calculation Required field for value added tax only. Not applicable to U.S. and Canadian taxes. .</param>
+        public Invoicingv2invoiceSettingsInvoiceSettingsInformation(string MerchantLogo = default(string), string MerchantDisplayName = default(string), string CustomEmailMessage = default(string), bool? EnableReminders = default(bool?), InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInformationHeaderStyle HeaderStyle = default(InvoicingV2InvoiceSettingsGet200ResponseInvoiceSettingsInformationHeaderStyle), string DeliveryLanguage = default(string), string DefaultCurrencyCode = default(string), string PayerAuthenticationInInvoicing = default(string), bool? ShowVatNumber = false, string VatRegistrationNumber = default(string))
         {
             this.MerchantLogo = MerchantLogo;
             this.MerchantDisplayName = MerchantDisplayName;
@@ -51,6 +53,16 @@ public partial class Invoicingv2invoiceSettingsInvoiceSettingsInformation :  IEq
             this.DeliveryLanguage = DeliveryLanguage;
             this.DefaultCurrencyCode = DefaultCurrencyCode;
             this.PayerAuthenticationInInvoicing = PayerAuthenticationInInvoicing;
+            // use default value if no "ShowVatNumber" provided
+            if (ShowVatNumber == null)
+            {
+                this.ShowVatNumber = false;
+            }
+            else
+            {
+                this.ShowVatNumber = ShowVatNumber;
+            }
+            this.VatRegistrationNumber = VatRegistrationNumber;
         }
 
         /// <summary>
@@ -108,6 +120,20 @@ public partial class Invoicingv2invoiceSettingsInvoiceSettingsInformation :  IEq
         [DataMember(Name="payerAuthenticationInInvoicing", EmitDefaultValue=false)]
         public string PayerAuthenticationInInvoicing { get; set; }
 
+        /// <summary>
+        /// Display VAT number on Invoice.
+        /// </summary>
+        /// <value>Display VAT number on Invoice.</value>
+        [DataMember(Name="showVatNumber", EmitDefaultValue=false)]
+        public bool? ShowVatNumber { get; set; }
+
+        /// <summary>
+        /// Your government-assigned tax identification number.  #### Tax Calculation Required field for value added tax only. Not applicable to U.S. and Canadian taxes. 
+        /// </summary>
+        /// <value>Your government-assigned tax identification number.  #### Tax Calculation Required field for value added tax only. Not applicable to U.S. and Canadian taxes. </value>
+        [DataMember(Name="vatRegistrationNumber", EmitDefaultValue=false)]
+        public string VatRegistrationNumber { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -124,6 +150,8 @@ public override string ToString()
             sb.Append("  DeliveryLanguage: ").Append(DeliveryLanguage).Append("\n");
             sb.Append("  DefaultCurrencyCode: ").Append(DefaultCurrencyCode).Append("\n");
             sb.Append("  PayerAuthenticationInInvoicing: ").Append(PayerAuthenticationInInvoicing).Append("\n");
+            sb.Append("  ShowVatNumber: ").Append(ShowVatNumber).Append("\n");
+            sb.Append("  VatRegistrationNumber: ").Append(VatRegistrationNumber).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -199,6 +227,16 @@ public bool Equals(Invoicingv2invoiceSettingsInvoiceSettingsInformation other)
                     this.PayerAuthenticationInInvoicing == other.PayerAuthenticationInInvoicing ||
                     this.PayerAuthenticationInInvoicing != null &&
                     this.PayerAuthenticationInInvoicing.Equals(other.PayerAuthenticationInInvoicing)
+                ) && 
+                (
+                    this.ShowVatNumber == other.ShowVatNumber ||
+                    this.ShowVatNumber != null &&
+                    this.ShowVatNumber.Equals(other.ShowVatNumber)
+                ) && 
+                (
+                    this.VatRegistrationNumber == other.VatRegistrationNumber ||
+                    this.VatRegistrationNumber != null &&
+                    this.VatRegistrationNumber.Equals(other.VatRegistrationNumber)
                 );
         }
 
@@ -229,6 +267,10 @@ public override int GetHashCode()
                     hash = hash * 59 + this.DefaultCurrencyCode.GetHashCode();
                 if (this.PayerAuthenticationInInvoicing != null)
                     hash = hash * 59 + this.PayerAuthenticationInInvoicing.GetHashCode();
+                if (this.ShowVatNumber != null)
+                    hash = hash * 59 + this.ShowVatNumber.GetHashCode();
+                if (this.VatRegistrationNumber != null)
+                    hash = hash * 59 + this.VatRegistrationNumber.GetHashCode();
                 return hash;
             }
         }