Merge branch 'master' into add_enabled-delete-card

Author: AlicanAkkus

README.md

@@ -1,7 +1,7 @@
 # Craftgate Java Client
 
 [![Build Status](https://github.com/craftgate/craftgate-java-client/actions/workflows/craftgate-build.yml/badge.svg?branch=master)](https://github.com/craftgate/craftgate-java-client/actions?query=branch%3Amaster)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.craftgate/craftgate/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.craftgate/craftgate)
+[![Maven Central](https://img.shields.io/maven-central/v/io.craftgate/craftgate)](https://central.sonatype.com/artifact/io.craftgate/craftgate)
 [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/craftgate/craftgate-java-client)
 
 This repo contains the Java client for Craftgate API.
@@ -17,16 +17,16 @@ Apache Maven:
 <dependency>
   <groupId>io.craftgate</groupId>
   <artifactId>craftgate</artifactId>
-  <version>1.0.72</version>
+  <version>1.0.77</version>
 </dependency>
 ```
 Gradle Groovy DSL
 ```
-implementation 'io.craftgate:craftgate:1.0.72'
+implementation 'io.craftgate:craftgate:1.0.77'
 ```
 Gradle Kotlin DSL
 ```
-implementation("io.craftgate:craftgate:1.0.72")
+implementation("io.craftgate:craftgate:1.0.77")
 ```
 
 ## Usage

bin/.DS_Store

@@ -40,7 +40,7 @@ private static Map<String, String> createHttpHeaders(Object request, String path
         headers.put(API_KEY_HEADER_NAME, options.getApiKey());
         headers.put(RANDOM_HEADER_NAME, randomString);
         headers.put(AUTH_VERSION_HEADER_NAME, API_VERSION_HEADER_VALUE);
-        headers.put(CLIENT_VERSION_HEADER_NAME, CLIENT_VERSION_HEADER_VALUE + ":1.0.72");
+        headers.put(CLIENT_VERSION_HEADER_NAME, CLIENT_VERSION_HEADER_VALUE + ":1.0.77");
         headers.put(SIGNATURE_HEADER_NAME, prepareAuthorizationString(request, path, randomString, options));
         if (Objects.nonNull(options.getLanguage())) {
             headers.put(LANGUAGE_HEADER_NAME, options.getLanguage());

src/main/java/io/craftgate/adapter/BaseAdapter.java

@@ -1,10 +1,13 @@
 package io.craftgate.adapter;
 
 import io.craftgate.net.HttpClient;
+import io.craftgate.request.CreateReportRequest;
 import io.craftgate.request.RetrieveDailyPaymentReportRequest;
 import io.craftgate.request.RetrieveDailyTransactionReportRequest;
+import io.craftgate.request.RetrieveReportRequest;
 import io.craftgate.request.common.RequestOptions;
 import io.craftgate.request.common.RequestQueryParamsBuilder;
+import io.craftgate.response.ReportDemandResponse;
 
 import java.util.Map;
 
@@ -32,4 +35,21 @@ public byte[] retrieveDailyPaymentReport(RetrieveDailyPaymentReportRequest retri
         headers.put(CONTENT_TYPE, APPLICATION_OCTET_STREAM);
         return HttpClient.get(requestOptions.getBaseUrl() + path, headers, byte[].class);
     }
+
+    public ReportDemandResponse createReport(CreateReportRequest request) {
+        String path = "/file-reporting/v1/report-demands";
+        Map<String, String> headers = createHeaders(request, path, requestOptions);
+        return HttpClient.post(requestOptions.getBaseUrl() + path,
+                headers,
+                request,
+                ReportDemandResponse.class);
+    }
+
+    public byte[] retrieveReport(RetrieveReportRequest retrieveReportRequest, Long reportId) {
+        String query = RequestQueryParamsBuilder.buildQueryParam(retrieveReportRequest);
+        String path = "/file-reporting/v1/reports/" + reportId + query;
+        Map<String, String> headers = createHeaders(path, requestOptions);
+        headers.put(CONTENT_TYPE, APPLICATION_OCTET_STREAM);
+        return HttpClient.get(requestOptions.getBaseUrl() + path, headers, byte[].class);
+    }
 }

src/main/java/io/craftgate/adapter/FileReportingAdapter.java

@@ -3,13 +3,12 @@
 import io.craftgate.model.FraudCheckStatus;
 import io.craftgate.model.FraudValueType;
 import io.craftgate.net.HttpClient;
-import io.craftgate.request.FraudValueListRequest;
-import io.craftgate.request.SearchFraudChecksRequest;
-import io.craftgate.request.UpdateFraudCheckRequest;
+import io.craftgate.request.*;
 import io.craftgate.request.common.RequestOptions;
 import io.craftgate.request.common.RequestQueryParamsBuilder;
 import io.craftgate.response.FraudAllValueListsResponse;
 import io.craftgate.response.FraudCheckListResponse;
+import io.craftgate.response.FraudRuleListResponse;
 import io.craftgate.response.FraudValueListResponse;
 
 public class FraudAdapter extends BaseAdapter {
@@ -58,8 +57,20 @@ public void addValueToValueList(FraudValueListRequest fraudValueListRequest) {
                 fraudValueListRequest, Void.class);
     }
 
+    public void addCardFingerprint(AddCardFingerprintFraudValueListRequest request, String listName) {
+        String path = "/fraud/v1/value-lists/"+ listName + "/card-fingerprints";
+        HttpClient.post(requestOptions.getBaseUrl() + path, createHeaders(request, path, requestOptions),
+                request, Void.class);
+    }
+
     public void removeValueFromValueList(String listName, String valueId) {
         String path = "/fraud/v1/value-lists/" + listName + "/values/" + valueId;
         HttpClient.delete(requestOptions.getBaseUrl() + path, createHeaders(path, requestOptions));
     }
+
+    public FraudRuleListResponse searchRules(SearchFraudRuleRequest searchFraudRuleRequest) {
+        String query = RequestQueryParamsBuilder.buildQueryParam(searchFraudRuleRequest);
+        String path = "/fraud/v1/rules" + query;
+        return HttpClient.get(requestOptions.getBaseUrl() + path, createHeaders(path, requestOptions), FraudRuleListResponse.class);
+    }
 }

src/main/java/io/craftgate/adapter/FraudAdapter.java

@@ -50,6 +50,17 @@ public InitCheckoutPaymentResponse initCheckoutPayment(InitCheckoutPaymentReques
                 initCheckoutPaymentRequest, InitCheckoutPaymentResponse.class);
     }
 
+    public InitCheckoutCardVerifyResponse initCheckoutCardVerify(InitCheckoutCardVerifyRequest initCheckoutCardVerifyRequest) {
+        String path = "/payment/v1/checkout-card-verify/init";
+        return HttpClient.post(requestOptions.getBaseUrl() + path, createHeaders(initCheckoutCardVerifyRequest, path, requestOptions),
+                initCheckoutCardVerifyRequest, InitCheckoutCardVerifyResponse.class);
+    }
+
+    public RetrieveCheckoutCardVerifyResponse retrieveCheckoutCardVerify(String token) {
+        String path = "/payment/v1/checkout-card-verify/" + token;
+        return HttpClient.get(requestOptions.getBaseUrl() + path, createHeaders(path, requestOptions), RetrieveCheckoutCardVerifyResponse.class);
+    }
+
     public PaymentResponse retrieveCheckoutPayment(String token) {
         String path = "/payment/v1/checkout-payments/" + token;
         return HttpClient.get(requestOptions.getBaseUrl() + path, createHeaders(path, requestOptions), PaymentResponse.class);
@@ -160,6 +171,12 @@ public PaymentRefundResponse refundPayment(RefundPaymentRequest refundPaymentReq
                 refundPaymentRequest, PaymentRefundResponse.class);
     }
 
+    public RefundWaitingPaymentResponse refundWaitingPayment(RefundWaitingPaymentRequest refundWaitingPaymentRequest) {
+        String path = "/payment/v1/refunds/refund-waiting-payment";
+        return HttpClient.post(requestOptions.getBaseUrl() + path, createHeaders(refundWaitingPaymentRequest, path, requestOptions),
+                refundWaitingPaymentRequest, RefundWaitingPaymentResponse.class);
+    }
+
     public PaymentRefundResponse retrievePaymentRefund(Long id) {
         String path = "/payment/v1/refunds/" + id;
         return HttpClient.get(requestOptions.getBaseUrl() + path, createHeaders(path, requestOptions), PaymentRefundResponse.class);
@@ -195,6 +212,12 @@ public void deleteStoredCard(DeleteStoredCardRequest deleteStoredCardRequest) {
                 deleteStoredCardRequest, Void.class);
     }
 
+    public VerifyCardResponse verifyCard(VerifyCardRequest verifyCardRequest) {
+        String path = "/payment/v1/cards/verify";
+        return HttpClient.post(requestOptions.getBaseUrl() + path, createHeaders(verifyCardRequest, path, requestOptions),
+                verifyCardRequest, VerifyCardResponse.class);
+    }
+
     public PaymentTransactionApprovalListResponse approvePaymentTransactions(ApprovePaymentTransactionsRequest approvePaymentTransactionsRequest) {
         String path = "/payment/v1/payment-transactions/approve";
         return HttpClient.post(requestOptions.getBaseUrl() + path, createHeaders(approvePaymentTransactionsRequest, path, requestOptions),
@@ -241,12 +264,28 @@ public BnplPaymentVerifyResponse verifyBnplPayment(Long paymentId) {
         return HttpClient.post(requestOptions.getBaseUrl() + path, createHeaders(path, requestOptions), BnplPaymentVerifyResponse.class);
     }
 
+    public BnplLimitInquiryResponse bnplLimitInquiryInit(BnplLimitInquiryRequest bnplLimitInquiryRequest) {
+        String path = "/payment/v1/bnpl-payments/limit-inquiry/init";
+        return HttpClient.post(requestOptions.getBaseUrl() + path, createHeaders(bnplLimitInquiryRequest, path, requestOptions), BnplLimitInquiryResponse.class);
+    }
+
+    public BnplLimitInquiryResponse bnplLimitInquiry(BnplLimitInquiryRequest bnplLimitInquiryRequest) {
+        String path = "/payment/v1/bnpl-payments/limit-inquiry";
+        return HttpClient.post(requestOptions.getBaseUrl() + path, createHeaders(bnplLimitInquiryRequest, path, requestOptions), BnplLimitInquiryResponse.class);
+    }
+
     public InstantTransferBanksResponse retrieveActiveBanks() {
         String path = "/payment/v1/instant-transfer-banks";
         return HttpClient.get(requestOptions.getBaseUrl() + path, createHeaders(path, requestOptions),
                 InstantTransferBanksResponse.class);
     }
 
+    public InitMultiPaymentResponse initMultiPayment(InitMultiPaymentRequest initMultiPaymentRequest) {
+        String path = "/payment/v1/multi-payments/init";
+        return HttpClient.post(requestOptions.getBaseUrl() + path, createHeaders(initMultiPaymentRequest, path, requestOptions),
+                initMultiPaymentRequest, InitMultiPaymentResponse.class);
+    }
+
     public MultiPaymentResponse retrieveMultiPayment(String token) {
         String path = "/payment/v1/multi-payments/" + token;
         return HttpClient.get(requestOptions.getBaseUrl() + path, createHeaders(path, requestOptions), MultiPaymentResponse.class);
@@ -258,6 +297,12 @@ public StoredCardListResponse retrieveProviderCards(RetrieveProviderCardRequest
         return HttpClient.get(requestOptions.getBaseUrl() + path, createHeaders(path, requestOptions), StoredCardListResponse.class);
     }
 
+    public CreateDepositToCardPaymentResponse depositToCard(CreateDepositToCardRequest createDepositToCardRequest) {
+        String path = "/payment/v1/card-payments/deposit-to-card";
+        return HttpClient.post(requestOptions.getBaseUrl() + path, createHeaders(createDepositToCardRequest, path, requestOptions),
+                createDepositToCardRequest, CreateDepositToCardPaymentResponse.class);
+    }
+
     public boolean is3DSecureCallbackVerified(String threeDSecureCallbackKey, Map<String, String> params) {
         String hash = params.get("hash");
         String hashString = threeDSecureCallbackKey +

src/main/java/io/craftgate/adapter/PaymentAdapter.java

@@ -14,25 +14,43 @@ public class CraftgateException extends RuntimeException {
     private final String errorCode;
     private final String errorDescription;
     private final String errorGroup;
+    private final String providerErrorCode;
+    private final String providerErrorDescription;
 
     public CraftgateException() {
         super(GENERAL_ERROR_DESCRIPTION);
         this.errorCode = GENERAL_ERROR_CODE;
         this.errorDescription = GENERAL_ERROR_DESCRIPTION;
         this.errorGroup = GENERAL_ERROR_GROUP;
+        this.providerErrorCode = null;
+        this.providerErrorDescription = null;
     }
 
     public CraftgateException(String errorCode, String errorDescription, String errorGroup) {
         super(errorDescription);
         this.errorCode = errorCode;
         this.errorDescription = errorDescription;
         this.errorGroup = errorGroup;
+        this.providerErrorCode = null;
+        this.providerErrorDescription = null;
+    }
+
+    public CraftgateException(String errorCode, String errorDescription, String errorGroup,
+            String providerErrorCode, String providerErrorDescription) {
+        super(errorDescription);
+        this.errorCode = errorCode;
+        this.errorDescription = errorDescription;
+        this.errorGroup = errorGroup;
+        this.providerErrorCode = providerErrorCode;
+        this.providerErrorDescription = providerErrorDescription;
     }
 
     public CraftgateException(Throwable cause) {
         super(cause.getMessage(), cause);
         this.errorCode = GENERAL_ERROR_CODE;
         this.errorDescription = GENERAL_ERROR_DESCRIPTION;
         this.errorGroup = GENERAL_ERROR_GROUP;
+        this.providerErrorCode = null;
+        this.providerErrorDescription = null;
     }
 }

src/main/java/io/craftgate/exception/CraftgateException.java

@@ -35,5 +35,6 @@ public enum ApmType {
     FUND_TRANSFER,
     SETCARD,
     PAPEL,
+    ALBARAKA,
     CASH_ON_DELIVERY
 }

src/main/java/io/craftgate/model/ApmType.java

@@ -0,0 +1,8 @@
+package io.craftgate.model;
+
+public enum CardVerificationAuthType {
+
+    NON_THREE_DS,
+    THREE_DS,
+    NONE
+}

src/main/java/io/craftgate/model/CardVerificationAuthType.java

@@ -0,0 +1,8 @@
+package io.craftgate.model;
+
+public enum CardVerifyStatus {
+
+    SUCCESS,
+    FAILURE,
+    THREE_DS_PENDING
+}