Merge pull request #7 from snavinch/master

+ March 2021 SDK Release

Author: snavinch

cybersource-rest-client-netstandard/cybersource-rest-client-netstandard.Test/Model/PtsV2PaymentsPost201ResponseProcessingInformationTests.cs

@@ -73,6 +73,14 @@ public void BankTransferOptionsTest()
             // TODO unit test for the property 'BankTransferOptions'
         }
         /// <summary>
+        /// Test the property 'PaymentSolution'
+        /// </summary>
+        [Test]
+        public void PaymentSolutionTest()
+        {
+            // TODO unit test for the property 'PaymentSolution'
+        }
+        /// <summary>
         /// Test the property 'EnhancedDataEnabled'
         /// </summary>
         [Test]

cybersource-rest-client-netstandard/cybersource-rest-client-netstandard.Test/Model/Ptsv2paymentsDeviceInformationTests.cs

@@ -97,6 +97,14 @@ public void FingerprintSessionIdTest()
             // TODO unit test for the property 'FingerprintSessionId'
         }
         /// <summary>
+        /// Test the property 'UseRawFingerprintSessionId'
+        /// </summary>
+        [Test]
+        public void UseRawFingerprintSessionIdTest()
+        {
+            // TODO unit test for the property 'UseRawFingerprintSessionId'
+        }
+        /// <summary>
         /// Test the property 'RawData'
         /// </summary>
         [Test]

cybersource-rest-client-netstandard/cybersource-rest-client-netstandard.Test/Model/Ptsv2paymentsTokenInformationTests.cs

@@ -96,6 +96,14 @@ public void ShippingAddressTest()
         {
             // TODO unit test for the property 'ShippingAddress'
         }
+        /// <summary>
+        /// Test the property 'NetworkTokenOption'
+        /// </summary>
+        [Test]
+        public void NetworkTokenOptionTest()
+        {
+            // TODO unit test for the property 'NetworkTokenOption'
+        }
 
     }
 

cybersource-rest-client-netstandard/cybersource-rest-client-netstandard.Test/Model/Riskv1authenticationsBuyerInformationTests.cs

@@ -64,6 +64,14 @@ public void Riskv1authenticationsBuyerInformationInstanceTest()
             //Assert.IsInstanceOfType<Riskv1authenticationsBuyerInformation> (instance, "variable 'instance' is a Riskv1authenticationsBuyerInformation");
         }
 
+        /// <summary>
+        /// Test the property 'MerchantCustomerId'
+        /// </summary>
+        [Test]
+        public void MerchantCustomerIdTest()
+        {
+            // TODO unit test for the property 'MerchantCustomerId'
+        }
         /// <summary>
         /// Test the property 'PersonalIdentification'
         /// </summary>

cybersource-rest-client-netstandard/cybersource-rest-client-netstandard.Test/Model/Riskv1decisionsDeviceInformationTests.cs

@@ -97,6 +97,14 @@ public void FingerprintSessionIdTest()
             // TODO unit test for the property 'FingerprintSessionId'
         }
         /// <summary>
+        /// Test the property 'UseRawFingerprintSessionId'
+        /// </summary>
+        [Test]
+        public void UseRawFingerprintSessionIdTest()
+        {
+            // TODO unit test for the property 'UseRawFingerprintSessionId'
+        }
+        /// <summary>
         /// Test the property 'HttpBrowserEmail'
         /// </summary>
         [Test]

cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/Client/ApiClient.cs

@@ -21,6 +21,7 @@
 using Newtonsoft.Json;
 using RestSharp;
 using AuthenticationSdk.core;
+using System.Security.Cryptography.X509Certificates;
 
 namespace CyberSource.Client
 {
@@ -202,7 +203,18 @@ private RestRequest PrepareRequest(
             {
                 if (postBody.GetType() == typeof(String))
                 {
-                    request.AddParameter("application/json", postBody, ParameterType.RequestBody);
+                    if (contentType == "application/x-www-form-urlencoded")
+                    {
+                        var bodyParams = JsonConvert.DeserializeObject<Dictionary<string, string>>((string)postBody);
+                        foreach (KeyValuePair<string, string> param in bodyParams)
+                        {
+                            request.AddParameter(param.Key, param.Value, ParameterType.GetOrPost);
+                        }
+                    }
+                    else
+                    {
+                        request.AddParameter("application/json", postBody, ParameterType.RequestBody);
+                    }                    
                 }
                 else if (postBody.GetType() == typeof(byte[]))
                 {
@@ -342,6 +354,18 @@ public Object CallApi(
                     RestClient.Proxy = Configuration.Proxy;
                 }            
 
+                // Adding Client Cert
+                if(Equals(bool.Parse(Configuration.MerchantConfigDictionaryObj["enableClientCert"]), true))
+                {
+                    string clientCertDirectory = Configuration.MerchantConfigDictionaryObj["clientCertDirectory"];
+                    string clientCertFile = Configuration.MerchantConfigDictionaryObj["clientCertFile"];
+                    string clientCertPassword = Configuration.MerchantConfigDictionaryObj["clientCertPassword"];
+                    string fileName = Path.Combine(clientCertDirectory, clientCertFile);
+                    // Importing Certificates
+                    var certificate = new X509Certificate2(fileName, clientCertPassword);
+                    RestClient.ClientCertificates = new X509CertificateCollection { certificate };
+                }
+
                 InterceptRequest(request);
                 response = (RestResponse) RestClient.Execute(request);
                 InterceptResponse(request, response);
@@ -764,6 +788,11 @@ public void CallAuthenticationHeaders(string requestType, string requestTarget,
                 if (merchantConfig.IsPostRequest || merchantConfig.IsPutRequest || merchantConfig.IsPatchRequest)
                     authenticationHeaders.Add("Digest", httpSign.Digest);
             }
+            else if (merchantConfig.IsOAuthTokenAuthType)
+            {
+                var oAuthToken = authorize.GetOAuthToken();
+                authenticationHeaders.Add("Authorization", oAuthToken.AccessToken);
+            }
 
             if (!string.IsNullOrEmpty(Configuration.ClientId))
             {

cybersource-rest-client-netstandard/cybersource-rest-client-netstandard/Model/PtsV2PaymentsPost201ResponseProcessingInformation.cs

@@ -34,10 +34,12 @@ public partial class PtsV2PaymentsPost201ResponseProcessingInformation :  IEquat
         /// Initializes a new instance of the <see cref="PtsV2PaymentsPost201ResponseProcessingInformation" /> class.
         /// </summary>
         /// <param name="BankTransferOptions">BankTransferOptions.</param>
+        /// <param name="PaymentSolution">Type of digital payment solution for the transaction. Possible Values:   - &#x60;visacheckout&#x60;: Visa Checkout. This value is required for Visa Checkout transactions. For details, see &#x60;payment_solution&#x60; field description in [Visa Checkout Using the SCMP API.](https://apps.cybersource.com/library/documentation/dev_guides/VCO_SCMP_API/html/)  - &#x60;001&#x60;: Apple Pay.  - &#x60;004&#x60;: Cybersource In-App Solution.  - &#x60;005&#x60;: Masterpass. This value is required for Masterpass transactions on OmniPay Direct. For details, see \&quot;Masterpass\&quot; in the [Credit Card Services Using the SCMP API Guide.](https://apps.cybersource.com/library/documentation/dev_guides/CC_Svcs_SCMP_API/html/)  - &#x60;006&#x60;: Android Pay.  - &#x60;007&#x60;: Chase Pay.  - &#x60;008&#x60;: Samsung Pay.  - &#x60;012&#x60;: Google Pay.  - &#x60;014&#x60;: Mastercard credential on file (COF) payment network token. Returned in authorizations that use a payment network token associated with a TMS token.  - &#x60;015&#x60;: Visa credential on file (COF) payment network token. Returned in authorizations that use a payment network token associated with a TMS token. .</param>
         /// <param name="EnhancedDataEnabled">The possible values for the reply field are: - &#x60;true&#x60; : the airline data was included in the request to the processor. - &#x60;false&#x60; : the airline data was not included in the request to the processor.  Returned by authorization, capture, or credit services. .</param>
-        public PtsV2PaymentsPost201ResponseProcessingInformation(PtsV2PaymentsPost201ResponseProcessingInformationBankTransferOptions BankTransferOptions = default(PtsV2PaymentsPost201ResponseProcessingInformationBankTransferOptions), bool? EnhancedDataEnabled = default(bool?))
+        public PtsV2PaymentsPost201ResponseProcessingInformation(PtsV2PaymentsPost201ResponseProcessingInformationBankTransferOptions BankTransferOptions = default(PtsV2PaymentsPost201ResponseProcessingInformationBankTransferOptions), string PaymentSolution = default(string), bool? EnhancedDataEnabled = default(bool?))
         {
             this.BankTransferOptions = BankTransferOptions;
+            this.PaymentSolution = PaymentSolution;
             this.EnhancedDataEnabled = EnhancedDataEnabled;
         }
 
@@ -47,6 +49,13 @@ public partial class PtsV2PaymentsPost201ResponseProcessingInformation :  IEquat
         [DataMember(Name="bankTransferOptions", EmitDefaultValue=false)]
         public PtsV2PaymentsPost201ResponseProcessingInformationBankTransferOptions BankTransferOptions { get; set; }
 
+        /// <summary>
+        /// Type of digital payment solution for the transaction. Possible Values:   - &#x60;visacheckout&#x60;: Visa Checkout. This value is required for Visa Checkout transactions. For details, see &#x60;payment_solution&#x60; field description in [Visa Checkout Using the SCMP API.](https://apps.cybersource.com/library/documentation/dev_guides/VCO_SCMP_API/html/)  - &#x60;001&#x60;: Apple Pay.  - &#x60;004&#x60;: Cybersource In-App Solution.  - &#x60;005&#x60;: Masterpass. This value is required for Masterpass transactions on OmniPay Direct. For details, see \&quot;Masterpass\&quot; in the [Credit Card Services Using the SCMP API Guide.](https://apps.cybersource.com/library/documentation/dev_guides/CC_Svcs_SCMP_API/html/)  - &#x60;006&#x60;: Android Pay.  - &#x60;007&#x60;: Chase Pay.  - &#x60;008&#x60;: Samsung Pay.  - &#x60;012&#x60;: Google Pay.  - &#x60;014&#x60;: Mastercard credential on file (COF) payment network token. Returned in authorizations that use a payment network token associated with a TMS token.  - &#x60;015&#x60;: Visa credential on file (COF) payment network token. Returned in authorizations that use a payment network token associated with a TMS token. 
+        /// </summary>
+        /// <value>Type of digital payment solution for the transaction. Possible Values:   - &#x60;visacheckout&#x60;: Visa Checkout. This value is required for Visa Checkout transactions. For details, see &#x60;payment_solution&#x60; field description in [Visa Checkout Using the SCMP API.](https://apps.cybersource.com/library/documentation/dev_guides/VCO_SCMP_API/html/)  - &#x60;001&#x60;: Apple Pay.  - &#x60;004&#x60;: Cybersource In-App Solution.  - &#x60;005&#x60;: Masterpass. This value is required for Masterpass transactions on OmniPay Direct. For details, see \&quot;Masterpass\&quot; in the [Credit Card Services Using the SCMP API Guide.](https://apps.cybersource.com/library/documentation/dev_guides/CC_Svcs_SCMP_API/html/)  - &#x60;006&#x60;: Android Pay.  - &#x60;007&#x60;: Chase Pay.  - &#x60;008&#x60;: Samsung Pay.  - &#x60;012&#x60;: Google Pay.  - &#x60;014&#x60;: Mastercard credential on file (COF) payment network token. Returned in authorizations that use a payment network token associated with a TMS token.  - &#x60;015&#x60;: Visa credential on file (COF) payment network token. Returned in authorizations that use a payment network token associated with a TMS token. </value>
+        [DataMember(Name="paymentSolution", EmitDefaultValue=false)]
+        public string PaymentSolution { get; set; }
+
         /// <summary>
         /// The possible values for the reply field are: - &#x60;true&#x60; : the airline data was included in the request to the processor. - &#x60;false&#x60; : the airline data was not included in the request to the processor.  Returned by authorization, capture, or credit services. 
         /// </summary>
@@ -63,6 +72,7 @@ public override string ToString()
             var sb = new StringBuilder();
             sb.Append("class PtsV2PaymentsPost201ResponseProcessingInformation {\n");
             sb.Append("  BankTransferOptions: ").Append(BankTransferOptions).Append("\n");
+            sb.Append("  PaymentSolution: ").Append(PaymentSolution).Append("\n");
             sb.Append("  EnhancedDataEnabled: ").Append(EnhancedDataEnabled).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
@@ -105,6 +115,11 @@ public bool Equals(PtsV2PaymentsPost201ResponseProcessingInformation other)
                     this.BankTransferOptions != null &&
                     this.BankTransferOptions.Equals(other.BankTransferOptions)
                 ) && 
+                (
+                    this.PaymentSolution == other.PaymentSolution ||
+                    this.PaymentSolution != null &&
+                    this.PaymentSolution.Equals(other.PaymentSolution)
+                ) && 
                 (
                     this.EnhancedDataEnabled == other.EnhancedDataEnabled ||
                     this.EnhancedDataEnabled != null &&
@@ -125,6 +140,8 @@ public override int GetHashCode()
                 // Suitable nullity checks etc, of course :)
                 if (this.BankTransferOptions != null)
                     hash = hash * 59 + this.BankTransferOptions.GetHashCode();
+                if (this.PaymentSolution != null)
+                    hash = hash * 59 + this.PaymentSolution.GetHashCode();
                 if (this.EnhancedDataEnabled != null)
                     hash = hash * 59 + this.EnhancedDataEnabled.GetHashCode();
                 return hash;
@@ -138,6 +155,12 @@ public override int GetHashCode()
         /// <returns>Validation Result</returns>
         IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
         {
+            // PaymentSolution (string) maxLength
+            if(this.PaymentSolution != null && this.PaymentSolution.Length >= 12)
+            {
+                yield return new System.ComponentModel.DataAnnotations.ValidationResult("Invalid value for PaymentSolution, length must be less than or equal to 12.", new [] { "PaymentSolution" });
+            }
+
             yield break;
         }
     }