OctopusDeploy release: 5.2.2

securesubmit-buildmaster · securesubmit-buildmaster · commit 107da5a46891 · 2023-07-13T08:02:09.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 #### Enhancements
 
+- GP-ECOM: Add refund for transaction with open banking
+
+## v5.2.1 (06/07/23)
+
+#### Enhancements
+
 - GP-API: Added integration examples using Hosted Fields (GP JS library), 3DS library
 
 #### Bug fixes:
diff --git a/examples/gpapi/end-to-end/end-to-end/Check3dsVersion.ashx.cs b/examples/gpapi/end-to-end/end-to-end/Check3dsVersion.ashx.cs
@@ -1,5 +1,6 @@
 ﻿using GlobalPayments.Api;
 using GlobalPayments.Api.Entities;
+using GlobalPayments.Api.Entities.Enums;
 using GlobalPayments.Api.PaymentMethods;
 using GlobalPayments.Api.Services;
 using GlobalPayments.Api.Utils.Logging;
@@ -87,7 +88,7 @@ public void ProcessRequest(HttpContext context)
                 messageVersion = messageVersion
             }); 
 
-            if (enrolled == "ENROLLED" && messageVersion == Secure3dVersion.Two) {
+            if (enrolled == Secure3dStatus.ENROLLED.ToString() && messageVersion == Secure3dVersion.Two) {
                 responseJson = JsonConvert.SerializeObject(new
                 {
                     enrolled = enrolled,
diff --git a/examples/gpapi/end-to-end/end-to-end/InitiateAuthentication.ashx.cs b/examples/gpapi/end-to-end/end-to-end/InitiateAuthentication.ashx.cs
@@ -1,5 +1,6 @@
 ﻿using GlobalPayments.Api;
 using GlobalPayments.Api.Entities;
+using GlobalPayments.Api.Entities.Enums;
 using GlobalPayments.Api.PaymentMethods;
 using GlobalPayments.Api.Services;
 using GlobalPayments.Api.Utils.Logging;
@@ -149,7 +150,7 @@ public void ProcessRequest(HttpContext context)
             });
 
 
-            if (status != "CHALLENGE_REQUIRED")
+            if (status != Secure3dStatus.CHALLENGE_REQUIRED.ToString())
             {
                 // Frictionless flow
                 response = JsonConvert.SerializeObject(new
diff --git a/examples/gpapi/end-to-end/end-to-end/end-to-end.csproj b/examples/gpapi/end-to-end/end-to-end/end-to-end.csproj
@@ -44,8 +44,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GlobalPayments.Api, Version=5.1.9.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\GlobalPayments.Api.5.1.9\lib\netstandard1.3\GlobalPayments.Api.dll</HintPath>
+    <Reference Include="GlobalPayments.Api, Version=5.2.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GlobalPayments.Api.5.2.1\lib\netstandard1.3\GlobalPayments.Api.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
diff --git a/examples/gpapi/end-to-end/end-to-end/packages.config b/examples/gpapi/end-to-end/end-to-end/packages.config
@@ -4,7 +4,7 @@
   <package id="AspNet.ScriptManager.bootstrap" version="3.4.1" targetFramework="net472" />
   <package id="AspNet.ScriptManager.jQuery" version="3.4.1" targetFramework="net472" />
   <package id="bootstrap" version="3.4.1" targetFramework="net472" />
-  <package id="GlobalPayments.Api" version="5.1.9" targetFramework="net472" />
+  <package id="GlobalPayments.Api" version="5.2.1" targetFramework="net472" />
   <package id="jQuery" version="3.4.1" targetFramework="net472" />
   <package id="Microsoft.AspNet.FriendlyUrls" version="1.0.2" targetFramework="net472" />
   <package id="Microsoft.AspNet.FriendlyUrls.Core" version="1.0.2" targetFramework="net472" />
diff --git a/src/GlobalPayments.Api/Builders/ManagementBuilder.cs b/src/GlobalPayments.Api/Builders/ManagementBuilder.cs
@@ -488,6 +488,14 @@ public override Transaction Execute(string configName = "default") {
             base.Execute(configName);
 
             var client = ServicesContainer.Instance.GetClient(configName);
+            if (client.SupportsOpenBanking &&
+                PaymentMethod is TransactionReference &&
+            PaymentMethod.PaymentMethodType == PaymentMethodType.BankPayment) {
+            var obClient = ServicesContainer.Instance.GetOpenBanking(configName);
+                if (obClient != client) {
+                    return obClient.ManageOpenBanking(this);
+                }
+            }
             return client.ManageTransaction(this);
         }
 
diff --git a/src/GlobalPayments.Api/Entities/BankPaymentResponse.cs b/src/GlobalPayments.Api/Entities/BankPaymentResponse.cs
@@ -17,5 +17,7 @@ public class BankPaymentResponse {
         public string Iban { get; set; }
         public string RemittanceReferenceValue { get; set; }
         public string RemittanceReferenceType { get; set; }
+        public decimal? Amount { get; set; }
+        public string Currency { get; set; }
     }
 }
diff --git a/src/GlobalPayments.Api/Entities/Enums/BankPaymentStatus.cs b/src/GlobalPayments.Api/Entities/Enums/BankPaymentStatus.cs
@@ -24,5 +24,8 @@ public enum BankPaymentStatus {
         FAILURE_DECLINED,
         STATUS_NOT_AVAILABLE,
         PAYMENT_NOT_COMPLETED,
+        INITIATION_PROCESSING,
+        INITIATION_REJECTED,
+        INITIATION_FAILED
     }
 }
diff --git a/src/GlobalPayments.Api/Gateways/Interfaces/IOpenBankingProvider.cs b/src/GlobalPayments.Api/Gateways/Interfaces/IOpenBankingProvider.cs
@@ -9,6 +9,7 @@ namespace GlobalPayments.Api.Gateways
     public interface IOpenBankingProvider
     {
         bool SupportsHostedPayments { get; }
-        Transaction ProcessOpenBanking(AuthorizationBuilder builder);        
+        Transaction ProcessOpenBanking(AuthorizationBuilder builder);
+        Transaction ManageOpenBanking(ManagementBuilder builder);
     }
 }
diff --git a/src/GlobalPayments.Api/Gateways/OpenBankingProvider.cs b/src/GlobalPayments.Api/Gateways/OpenBankingProvider.cs
@@ -158,7 +158,6 @@ private void SetAuthorizationHeader(string value) {
             }
         }
 
-
         public static BankPaymentType? GetBankPaymentType(string currency) {
             switch (currency) {
                 case "EUR":
@@ -181,5 +180,43 @@ protected override string HandleResponse(GatewayResponse response)
             return response.RawResponse;
         }
 
+        public Transaction ManageOpenBanking(ManagementBuilder builder)
+        {
+            string timestamp = builder.Timestamp ?? GenerationUtils.GenerateTimestamp();            
+            var amount = builder.Amount != null ? builder.Amount.ToNumericCurrencyString() : null;
+
+            JsonDoc request = new JsonDoc();                 
+        
+            switch (builder.TransactionType) {
+            case TransactionType.Refund:
+                   
+               string hash = GenerationUtils.GenerateHash(SharedSecret, ShaHashType, MerchantId, AccountId, timestamp, builder.TransactionId, builder.ClientTransactionId, amount);
+               
+                SetAuthorizationHeader(hash);
+                    request.Set("merchant_id", MerchantId)
+                              .Set("account_id", AccountId)
+                              .Set("request_timestamp", timestamp);
+
+                    JsonDoc order = new JsonDoc();
+                    order.Set("id", builder.TransactionId)
+                          .Set("ob_trans_id", builder.ClientTransactionId)
+                          .Set("amount", amount)
+                          .Set("description", builder.Description);
+
+                    request.Set("order", order);
+
+                    break;
+                default:
+                    break;
+            }
+
+            try {
+                string rawResponse = DoTransaction(HttpMethod.Post, "/refunds", request.ToString());
+                return OpenBankingMapping.MapResponse(rawResponse);
+            }
+            catch (GatewayException gatewayException) {
+                throw gatewayException;
+            }
+        }
     }
 }
diff --git a/src/GlobalPayments.Api/Gateways/PorticoConnector.cs b/src/GlobalPayments.Api/Gateways/PorticoConnector.cs
@@ -1170,18 +1170,19 @@ private string MapTransactionType<T>(T builder) where T : TransactionBuilder<Tra
             throw new NotImplementedException();
         }
 
-        private string MapReportType(ReportType type) {
-            switch (type) {
+        private string MapReportType(ReportType type)
+        {
+            switch (type)
+            {
                 case ReportType.Activity:
-                case ReportType.TransactionDetail:
-                    return "ReportTxnDetail";
                 case ReportType.FindTransactions:
                     return "FindTransactions";
+                case ReportType.TransactionDetail:
+                    return "ReportTxnDetail";
                 default:
                     throw new UnsupportedTransactionException();
             }
         }
-
         private bool HasToken(IPaymentMethod paymentMethod, out string tokenValue) {
             tokenValue = null;
 
diff --git a/src/GlobalPayments.Api/GlobalPayments.Api.csproj b/src/GlobalPayments.Api/GlobalPayments.Api.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>5.2.1</VersionPrefix>
+    <VersionPrefix>5.2.2</VersionPrefix>
     <TargetFramework>netstandard1.3</TargetFramework>
     <AssemblyName>GlobalPayments.Api</AssemblyName>
     <PackageId>GlobalPayments.Api</PackageId>
diff --git a/src/GlobalPayments.Api/Mapping/OpenBankingMapping.cs b/src/GlobalPayments.Api/Mapping/OpenBankingMapping.cs
@@ -15,15 +15,18 @@ public static Transaction MapResponse(string rawResponse) {
             if (!string.IsNullOrEmpty(rawResponse)) {
                 JsonDoc json = JsonDoc.Parse(rawResponse);
 
-                transaction.TransactionId = json.GetValue<string>("ob_trans_id");
+                transaction.TransactionId = json.Get("order")?.GetValue<string>("id");
+                transaction.ClientTransactionId = json.GetValue<string>("ob_trans_id");
                 transaction.PaymentMethodType = PaymentMethodType.BankPayment;
-                transaction.OrderId = json.Get("order")?.GetValue<string>("id");
-                transaction.ResponseMessage = json.GetValue<string>("status");
+                transaction.OrderId = json.Get("order")?.GetValue<string>("id") ?? null;
+                transaction.ResponseMessage = json.GetValue<string>("status") ?? null;
 
                 BankPaymentResponse obResponse = new BankPaymentResponse();
-                obResponse.RedirectUrl = json.GetValue<string>("redirect_url");
-                obResponse.PaymentStatus = json.GetValue<string>("status");
-                obResponse.Id = json.GetValue<string>("ob_trans_id");
+                obResponse.RedirectUrl = json.GetValue<string>("redirect_url") ?? null;
+                obResponse.PaymentStatus = json.GetValue<string>("status") ?? null;
+                obResponse.Id = json.GetValue<string>("ob_trans_id") ?? null;
+                obResponse.Amount = json.Get("order")?.GetValue<string>("amount").ToAmount();
+                obResponse.Currency = json.Get("order")?.GetValue<string>("currency") ?? null;
                 transaction.BankPaymentResponse = obResponse;
             }
 
diff --git a/src/GlobalPayments.Api/Properties/AssemblyInfo.cs b/src/GlobalPayments.Api/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.2.1")]
-[assembly: AssemblyFileVersion("5.2.1")]
+[assembly: AssemblyVersion("5.2.2")]
+[assembly: AssemblyFileVersion("5.2.2")]
diff --git a/tests/GlobalPayments.Api.Tests/GpApi/GpApi3DSecure2Tests.cs b/tests/GlobalPayments.Api.Tests/GpApi/GpApi3DSecure2Tests.cs
diff --git a/tests/GlobalPayments.Api.Tests/GpEcom/GpEcomOpenBankingTests.cs b/tests/GlobalPayments.Api.Tests/GpEcom/GpEcomOpenBankingTests.cs
diff --git a/tests/GlobalPayments.Api.Tests/Portico/PorticoAchTests.cs b/tests/GlobalPayments.Api.Tests/Portico/PorticoAchTests.cs
diff --git a/tests/GlobalPayments.Api.Tests/Portico/PorticoReportingTests.cs b/tests/GlobalPayments.Api.Tests/Portico/PorticoReportingTests.cs

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,7 @@ public class BankPaymentResponse {`
`17`	`17`	`public string Iban { get; set; }`
`18`	`18`	`public string RemittanceReferenceValue { get; set; }`
`19`	`19`	`public string RemittanceReferenceType { get; set; }`
	`20`	`+ public decimal? Amount { get; set; }`
	`21`	`+ public string Currency { get; set; }`
`20`	`22`	`}`
`21`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,8 @@ public enum BankPaymentStatus {`
`24`	`24`	`FAILURE_DECLINED,`
`25`	`25`	`STATUS_NOT_AVAILABLE,`
`26`	`26`	`PAYMENT_NOT_COMPLETED,`
	`27`	`+ INITIATION_PROCESSING,`
	`28`	`+ INITIATION_REJECTED,`
	`29`	`+ INITIATION_FAILED`
`27`	`30`	`}`
`28`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ namespace GlobalPayments.Api.Gateways`
`9`	`9`	`public interface IOpenBankingProvider`
`10`	`10`	`{`
`11`	`11`	`bool SupportsHostedPayments { get; }`
`12`		`- Transaction ProcessOpenBanking(AuthorizationBuilder builder);`
	`12`	`+ Transaction ProcessOpenBanking(AuthorizationBuilder builder);`
	`13`	`+ Transaction ManageOpenBanking(ManagementBuilder builder);`
`13`	`14`	`}`
`14`	`15`	`}`