@commercetools/connect-payments-sdk 0.21.0 → 0.23.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @commercetools/connect-payments-sdk
 
+## 0.23.0
+
+### Minor Changes
+
+- 45ed8ad: Upgrade dependencies to latest versions
+
+## 0.22.0
+
+### Minor Changes
+
+- 8a98393: Improve logic for managing payment updates
+
 ## 0.21.0
 
 ### Minor Changes

package/dist/commercetools/api/root-api.d.ts

@@ -15,5 +15,6 @@ export declare class DefaultCommercetoolsAPI implements CommercetoolsAPI {
         projectKey: string;
         contextProvider: ContextProvider<RequestContextData>;
         logger: Logger;
+        httpClient?: Function;
     });
 }

package/dist/commercetools/api/root-api.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultCommercetoolsAPI = void 0;
 const platform_sdk_1 = require("@commercetools/platform-sdk");
-const sdk_client_v2_1 = require("@commercetools/sdk-client-v2");
+const ts_client_1 = require("@commercetools/ts-client");
 const cart_api_1 = require("./cart-api");
 const payment_api_1 = require("./payment-api");
 const order_api_1 = require("./order-api");
@@ -30,11 +30,13 @@ const createClient = (opts) => {
             clientId: opts.clientId,
             clientSecret: opts.clientSecret,
         },
+        ...(opts.httpClient ? { httpClient: opts.httpClient } : {}),
     };
     const httpMiddlewareOptions = {
         host: opts.apiUrl,
         //Enables SDK retries when CoCo returns a 503 error. It retries up to 10 times with an 200ms backoff.
         enableRetry: true,
+        ...(opts.httpClient ? { httpClient: opts.httpClient } : {}),
     };
     const correlationIdMiddlewareOptions = {
         generate: () => {
@@ -43,7 +45,7 @@ const createClient = (opts) => {
             return correlationID;
         },
     };
-    const ctpClient = new sdk_client_v2_1.ClientBuilder()
+    const ctpClient = new ts_client_1.ClientBuilder()
         .withClientCredentialsFlow(authMiddlewareOptions)
         .withCorrelationIdMiddleware(correlationIdMiddlewareOptions)
         .withHttpMiddleware(httpMiddlewareOptions)

package/dist/commercetools/services/ct-payment.service.d.ts

@@ -1,4 +1,4 @@
-import { Payment, PaymentDraft, Transaction } from '@commercetools/platform-sdk';
+import { Payment, PaymentDraft, PaymentUpdateAction, Transaction } from '@commercetools/platform-sdk';
 import { FindPaymentsByInterfaceId, FindTransaction, GetPayment, PaymentService, PaymentServiceOptions, TransactionData, UpdatePayment } from '../types/payment.type';
 /**
  * This is the default implementation of the PaymentService interface.
@@ -21,5 +21,10 @@ export declare class DefaultPaymentService implements PaymentService {
     private populateAddInterfaceInteractions;
     findMatchingTransactions(payment: Payment, transaction: TransactionData): Transaction[];
     hasTransactionInState(opts: FindTransaction): boolean;
-    private consolidateTransactionChanges;
+    consolidateTransactionChanges(payment: Payment, newTransaction: TransactionData): PaymentUpdateAction[];
+    private shouldDiscardTransaction;
+    private handleTransactionUpdates;
+    private shouldUpdateTransactionState;
+    private shouldUpdateInteractionId;
+    private throwMultipleMatchingTransactionsError;
 }

package/dist/commercetools/services/ct-payment.service.js

@@ -144,33 +144,54 @@ class DefaultPaymentService {
     hasTransactionInState(opts) {
         return opts.payment.transactions.some((tx) => tx.type === opts.transactionType && opts.states.includes(tx.state));
     }
-    consolidateTransactionChanges(payment, transaction) {
+    consolidateTransactionChanges(payment, newTransaction) {
         const actions = [];
-        // If the transaction is in Initial state and has no interactionId, we discard it as it does not provide any value
-        if (transaction.state === 'Initial' && !transaction.interactionId) {
+        // Discard transactions in 'Initial' state without an interactionId as they provide no value
+        if (this.shouldDiscardTransaction(newTransaction)) {
             return [];
         }
-        const matchingTxs = this.findMatchingTransactions(payment, transaction);
+        // Find matching transactions in the payment
+        const matchingTxs = this.findMatchingTransactions(payment, newTransaction);
+        // Handle cases where no matching transactions are found
         if (matchingTxs.length === 0) {
-            actions.push(this.populateAddTransactionAction(transaction));
+            actions.push(this.populateAddTransactionAction(newTransaction));
+            return actions;
         }
-        else {
-            if (matchingTxs.length === 1) {
-                const tx = matchingTxs[0];
-                if ((tx.state !== transaction.state && tx.state === 'Initial') ||
-                    (tx.state === 'Pending' && (transaction.state === 'Success' || transaction.state === 'Failure'))) {
-                    actions.push(this.populateChangeTransactionState(tx.id, transaction.state));
-                    if (!tx.interactionId && transaction.interactionId) {
-                        actions.push(this.populateChangeTransactionInteractionId(tx.id, transaction.interactionId));
-                    }
-                }
-            }
-            else {
-                this.logger.error({ paymentId: payment.id, transaction }, 'Multiple transactions found when consolidating payment changes');
-                throw new Error('Multiple transactions found');
-            }
+        // Handle cases where exactly one matching transaction is found
+        if (matchingTxs.length === 1) {
+            const existingTx = matchingTxs[0];
+            this.handleTransactionUpdates(existingTx, newTransaction, actions);
+            return actions;
         }
-        return actions;
+        // Handle cases where multiple matching transactions are found
+        this.throwMultipleMatchingTransactionsError(payment, newTransaction, matchingTxs);
+    }
+    shouldDiscardTransaction(newTransaction) {
+        return newTransaction.state === 'Initial' && !newTransaction.interactionId;
+    }
+    handleTransactionUpdates(existingTx, newTransaction, actions) {
+        if (this.shouldUpdateTransactionState(existingTx, newTransaction)) {
+            actions.push(this.populateChangeTransactionState(existingTx.id, newTransaction.state));
+        }
+        if (this.shouldUpdateInteractionId(existingTx, newTransaction)) {
+            actions.push(this.populateChangeTransactionInteractionId(existingTx.id, newTransaction.interactionId));
+        }
+    }
+    shouldUpdateTransactionState(existingTx, newTransaction) {
+        return ((existingTx.state !== newTransaction.state && existingTx.state === 'Initial') ||
+            (existingTx.state === 'Pending' && (newTransaction.state === 'Success' || newTransaction.state === 'Failure')) ||
+            (existingTx.state === 'Failure' && newTransaction.state === 'Success'));
+    }
+    shouldUpdateInteractionId(existingTx, newTransaction) {
+        return !existingTx.interactionId && !!newTransaction.interactionId;
+    }
+    throwMultipleMatchingTransactionsError(payment, newTransaction, matchingTxs) {
+        this.logger.error({
+            paymentId: payment.id,
+            transaction: newTransaction,
+            matchingTransactions: matchingTxs,
+        }, 'Multiple matching transactions found when consolidating payment changes');
+        throw new Error(`Multiple matching transactions found for payment ${payment.id} and transaction ${JSON.stringify(newTransaction)}`);
     }
 }
 exports.DefaultPaymentService = DefaultPaymentService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commercetools/connect-payments-sdk",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "description": "Payment SDK for commercetools payment connectors",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,9 +15,9 @@
   ],
   "license": "ISC",
   "dependencies": {
-    "@commercetools-backend/loggers": "23.2.2",
-    "@commercetools/platform-sdk": "8.5.0",
-    "@commercetools/sdk-client-v2": "2.5.0",
+    "@commercetools-backend/loggers": "23.3.0",
+    "@commercetools/platform-sdk": "8.9.0",
+    "@commercetools/ts-client": "3.3.1",
     "jsonwebtoken": "9.0.2",
     "jwks-rsa": "3.2.0",
     "lodash": "4.17.21",