adds payment error, fixes checkout payment urls (#13)

* adds payment error, fixes checkout url * changes retrieve co payment url * formats code with prettier * fixes failing tests Co-authored-by: Burak Baldırlıoğlu <[email protected]>
craftgate · Feb 4, 2021 · fb28d1a · fb28d1a
1 parent ad1cefd
commit fb28d1a
Show file tree

Hide file tree

Showing 19 changed files with 5,605 additions and 57 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/CraftgateClient.ts b/src/CraftgateClient.ts
@@ -2,8 +2,7 @@ import BaseAdapter from './adapter/BaseAdapter';
 import InstallmentAdapter from './adapter/InstallmentAdapter';
 import OnboardingAdapter from './adapter/OnboardingAdapter';
 import PaymentAdapter from './adapter/PaymentAdapter';
-import WalletAdapter from "./adapter/WalletAdapter";
-
+import WalletAdapter from './adapter/WalletAdapter';
 import {ClientCreationOptions} from './lib/HttpClient';
 
 export default class CraftgateAdapter extends BaseAdapter {

diff --git a/src/adapter/PaymentAdapter.ts b/src/adapter/PaymentAdapter.ts
@@ -2,30 +2,30 @@ import {ClientCreationOptions} from '../lib/HttpClient';
 
 import ApprovePaymentTransactionsRequest from '../request/ApprovePaymentTransactionsRequest';
 import CompleteThreeDSPaymentRequest from '../request/CompleteThreeDSPaymentRequest';
+import CreateDepositPaymentRequest from '../request/CreateDepositPaymentRequest';
 import CreatePaymentRequest from '../request/CreatePaymentRequest';
 import DeleteStoredCardRequest from '../request/DeleteStoredCardRequest';
 import DisapprovePaymentTransactionsRequest from '../request/DisapprovePaymentTransactionsRequest';
+import InitCheckoutPaymentRequest from '../request/InitCheckoutPaymentRequest';
 import InitThreeDSPaymentRequest from '../request/InitThreeDSPaymentRequest';
+import RefundDepositPaymentRequest from '../request/RefundDepositPaymentRequest';
 import RefundPaymentRequest from '../request/RefundPaymentRequest';
 import RefundPaymentTransactionRequest from '../request/RefundPaymentTransactionRequest';
 import SearchPaymentTransactionRefundsRequest from '../request/SearchPaymentTransactionRefundsRequest';
 import SearchStoredCardsRequest from '../request/SearchStoredCardsRequest';
-import StoreCardRequest from "../request/StoreCardRequest";
-import RefundDepositPaymentRequest from "../request/RefundDepositPaymentRequest";
-import CreateDepositPaymentRequest from "../request/CreateDepositPaymentRequest";
-import InitCheckoutPaymentRequest from "../request/InitCheckoutPaymentRequest";
+import StoreCardRequest from '../request/StoreCardRequest';
 
 import DataResponse from '../response/DataResponse';
+import DepositPaymentRefundResponse from '../response/DepositPaymentRefundResponse';
+import DepositPaymentResponse from '../response/DepositPaymentResponse';
+import InitCheckoutPaymentResponse from '../response/InitCheckoutPaymentResponse';
 import InitThreeDSPaymentResponse from '../response/InitThreeDSPaymentResponse';
 import PaymentRefundResponse from '../response/PaymentRefundResponse';
 import PaymentResponse from '../response/PaymentResponse';
 import PaymentTransactionApprovalListResponse from '../response/PaymentTransactionApprovalListResponse';
 import PaymentTransactionRefundListResponse from '../response/PaymentTransactionRefundListResponse';
 import PaymentTransactionRefundResponse from '../response/PaymentTransactionRefundResponse';
 import StoredCardResponse from '../response/StoredCardResponse';
-import DepositPaymentResponse from "../response/DepositPaymentResponse";
-import DepositPaymentRefundResponse from "../response/DepositPaymentRefundResponse";
-import InitCheckoutPaymentResponse from "../response/InitCheckoutPaymentResponse";
 
 import BaseAdapter from './BaseAdapter';
 
@@ -51,11 +51,11 @@ export default class PaymentAdapter extends BaseAdapter {
   }
 
   async initCheckoutPayment(request: InitCheckoutPaymentRequest): Promise<InitCheckoutPaymentResponse> {
-    return this._client.post('/payment/v1/checkout-payment/init', request);
+    return this._client.post('/payment/v1/checkout-payments/init', request);
   }
 
   async retrieveCheckoutPayment(token: string): Promise<PaymentResponse> {
-    return this._client.get(`/payment/v1/checkout-payment?token=${token}`);
+    return this._client.get(`/payment/v1/checkout-payments/${token}`);
   }
 
   async createDepositPayment(request: CreateDepositPaymentRequest): Promise<DepositPaymentResponse> {

diff --git a/src/adapter/WalletAdapter.ts b/src/adapter/WalletAdapter.ts
@@ -1,13 +1,13 @@
 import {ClientCreationOptions} from '../lib/HttpClient';
 
-import SearchWalletsRequest from "../request/SearchWalletsRequest";
-import SearchWalletTransactionsRequest from "../request/SearchWalletTransactionsRequest";
-import CreateRemittanceRequest from "../request/CreateRemittanceRequest";
-
-import DataResponse from "../response/DataResponse";
-import WalletResponse from "../response/WalletResponse";
-import RemittanceResponse from "../response/RemittanceResponse";
-import WalletTransactionResponse from "../response/WalletTransactionResponse";
+import CreateRemittanceRequest from '../request/CreateRemittanceRequest';
+import SearchWalletsRequest from '../request/SearchWalletsRequest';
+import SearchWalletTransactionsRequest from '../request/SearchWalletTransactionsRequest';
+
+import DataResponse from '../response/DataResponse';
+import RemittanceResponse from '../response/RemittanceResponse';
+import WalletResponse from '../response/WalletResponse';
+import WalletTransactionResponse from '../response/WalletTransactionResponse';
 
 import BaseAdapter from './BaseAdapter';
 

diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -19,7 +19,7 @@ export function generateRandomString(length = 6): string {
  *
  * @param components the components to calculate the signature from
  */
-export function calculateSignature({apiKey, secretKey, url, body, randomStr}: { apiKey: string; secretKey: string; url: string; randomStr: string; body?: string }): string {
+export function calculateSignature({apiKey, secretKey, url, body, randomStr}: {apiKey: string; secretKey: string; url: string; randomStr: string; body?: string}): string {
   const hashStr: string = [url, apiKey, secretKey, randomStr, body].filter(s => !!s).join('');
   const hash = crypto.SHA256(hashStr);
   return crypto.enc.Base64.stringify(hash);

diff --git a/src/request/CreateMemberRequest.ts b/src/request/CreateMemberRequest.ts
@@ -1,8 +1,8 @@
 import MemberType from '../model/MemberType';
-import SettlementEarningsDestination from "../model/SettlementEarningsDestination";
+import SettlementEarningsDestination from '../model/SettlementEarningsDestination';
 
 type CreateMemberRequest = {
-  isBuyer?: boolean,
+  isBuyer?: boolean;
   isSubMerchant?: boolean;
   memberType?: MemberType;
   memberExternalId: string;

diff --git a/src/request/CreateRemittanceRequest.ts b/src/request/CreateRemittanceRequest.ts
@@ -1,4 +1,4 @@
-import RemittanceReasonType from "../model/RemittanceReasonType";
+import RemittanceReasonType from '../model/RemittanceReasonType';
 
 type CreateRemittanceRequest = {
   memberId: string;

diff --git a/src/request/InitThreeDSPaymentRequest.ts b/src/request/InitThreeDSPaymentRequest.ts
@@ -1,10 +1,10 @@
 import Currency from '../model/Currency';
 import Installment from '../model/Installment';
 import PaymentGroup from '../model/PaymentGroup';
+import PaymentPhase from '../model/PaymentPhase';
 
 import {Card} from './dto/Card';
 import PaymentItem from './dto/PaymentItem';
-import PaymentPhase from "../model/PaymentPhase";
 
 type InitThreeDSPaymentRequest = {
   price: number;

diff --git a/src/request/SearchWalletTransactionsRequest.ts b/src/request/SearchWalletTransactionsRequest.ts
@@ -1,4 +1,4 @@
-import WalletTransactionType from "../model/WalletTransactionType";
+import WalletTransactionType from '../model/WalletTransactionType';
 
 type SearchWalletTransactionsRequest = {
   walletTransactionType?: WalletTransactionType;

diff --git a/src/request/UpdateMemberRequest.ts b/src/request/UpdateMemberRequest.ts
@@ -1,8 +1,8 @@
-import MemberType from "../model/MemberType";
-import SettlementEarningsDestination from "../model/SettlementEarningsDestination";
+import MemberType from '../model/MemberType';
+import SettlementEarningsDestination from '../model/SettlementEarningsDestination';
 
 type UpdateMemberRequest = {
-  isBuyer?: boolean,
+  isBuyer?: boolean;
   isSubMerchant?: boolean;
   memberType?: MemberType;
   name?: string;

diff --git a/src/response/InstallmentListResponse.ts b/src/response/InstallmentListResponse.ts
@@ -1,4 +1,4 @@
-import Installment from './dto/Installment'
+import Installment from './dto/Installment';
 
 type InstallmentListResponse = {
   items: Installment[];

diff --git a/src/response/MemberResponse.ts b/src/response/MemberResponse.ts
@@ -1,6 +1,6 @@
-import Status from '../model/Status';
 import MemberType from '../model/MemberType';
-import SettlementEarningsDestination from "../model/SettlementEarningsDestination";
+import SettlementEarningsDestination from '../model/SettlementEarningsDestination';
+import Status from '../model/Status';
 
 type MemberResponse = {
   id: number;

diff --git a/src/response/PaymentResponse.ts b/src/response/PaymentResponse.ts
@@ -8,7 +8,8 @@ import PaymentStatus from '../model/PaymentStatus';
 import PaymentType from '../model/PaymentType';
 
 import PaymentTransaction from './dto/PaymentTransaction';
-import MerchantPos from "./dto/MerchantPos";
+import MerchantPos from './dto/MerchantPos';
+import PaymentError from './dto/PaymentError';
 
 type PaymentResponse = {
   id: number;
@@ -36,6 +37,7 @@ type PaymentResponse = {
   cardAssociation: CardAssociation;
   cardBrand: string;
   pos: MerchantPos;
+  paymentError: PaymentError;
   paymentTransactions: PaymentTransaction[];
 };
 

diff --git a/src/response/PaymentTransactionRefundListResponse.ts b/src/response/PaymentTransactionRefundListResponse.ts
@@ -1,4 +1,4 @@
-import PaymentTransactionRefundResponse from './PaymentTransactionRefundResponse'
+import PaymentTransactionRefundResponse from './PaymentTransactionRefundResponse';
 
 type PaymentTransactionRefundListResponse = {
   size: number;

diff --git a/src/response/RemittanceResponse.ts b/src/response/RemittanceResponse.ts
@@ -1,6 +1,6 @@
+import RemittanceReasonType from '../model/RemittanceReasonType';
+import RemittanceType from '../model/RemittanceType';
 import Status from '../model/Status';
-import RemittanceReasonType from "../model/RemittanceReasonType";
-import RemittanceType from "../model/RemittanceType";
 
 type RemittanceResponse = {
   id: number;

diff --git a/src/response/WalletResponse.ts b/src/response/WalletResponse.ts
@@ -1,4 +1,4 @@
-import Currency from "../model/Currency";
+import Currency from '../model/Currency';
 
 type WalletResponse = {
   id: number;

diff --git a/src/response/WalletTransactionResponse.ts b/src/response/WalletTransactionResponse.ts
@@ -1,4 +1,4 @@
-import WalletTransactionType from "../model/WalletTransactionType";
+import WalletTransactionType from '../model/WalletTransactionType';
 
 type WalletTransactionResponse = {
   id: number;

diff --git a/src/response/dto/PaymentError.ts b/src/response/dto/PaymentError.ts
@@ -0,0 +1,7 @@
+type PaymentError = {
+  errorCode: string;
+  errorDescription: string;
+  errorGroup: string;
+};
+
+export default PaymentError;
diff --git a/test/adapter/PaymentAdapter.test.js b/test/adapter/PaymentAdapter.test.js
@@ -204,7 +204,7 @@ test('should create deposit payment', async t => {
 
 test('should init checkout payment', async t => {
   const scope = nock('http://localhost:8000')
-    .post('/payment/v1/checkout-payment/init')
+    .post('/payment/v1/checkout-payments/init')
     .reply(200, {
       data: {
         token: 'd1811bb0-25a2-40c7-ba71-c8b605259611',
@@ -367,7 +367,7 @@ test('should retrieve payment', async t => {
 
 test('should retrieve checkout payment', async t => {
   const scope = nock('http://localhost:8000')
-    .get('/payment/v1/checkout-payment?token=d1811bb0-25a2-40c7-ba71-c8b605259611')
+    .get('/payment/v1/checkout-payments/d1811bb0-25a2-40c7-ba71-c8b605259611')
     .reply(200, {
       data: {
         id: 1,