@commercetools/connect-payments-sdk 0.8.0 → 0.8.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @commercetools/connect-payments-sdk
 
+## 0.8.2
+
+### Patch Changes
+
+- c10522b: - Do not crash the commercetools permissions health check if the config is incorrect. Instead return a proper health check status.
+
+## 0.8.1
+
+### Patch Changes
+
+- de97af3: Improve updatePayment for resolving conflicts updating the interfaceId
+
 ## 0.8.0
 
 ### Minor Changes

package/dist/api/handlers/status.handler.js

@@ -68,26 +68,38 @@ exports.statusHandler = statusHandler;
  * @returns
  */
 const healthCheckCommercetoolsPermissions = (opts) => async () => {
-    const token = await opts.ctAuthorizationService.getAccessToken();
-    const foundAll = opts.requiredPermissions.every((currentScope) => token.scope.split(' ').some((scopeInToken) => scopeInToken === `${currentScope}:${opts.projectKey}`));
-    if (foundAll) {
+    try {
+        const token = await opts.ctAuthorizationService.getAccessToken();
+        const foundAll = opts.requiredPermissions.every((currentScope) => token.scope.split(' ').some((scopeInToken) => scopeInToken === `${currentScope}:${opts.projectKey}`));
+        if (foundAll) {
+            return {
+                name: 'commercetools permissions',
+                status: 'UP',
+                details: {
+                    scope: token.scope,
+                },
+            };
+        }
         return {
-            name: 'CoCo Permissions',
-            status: 'UP',
+            name: 'commercetools permissions',
+            status: 'DOWN',
+            message: `commercetools permissions are not correct, expected scopes: ${opts.requiredPermissions.join(' ')}, actual scopes: ${token.scope}`,
             details: {
-                scope: token.scope,
+                expectedScopes: opts.requiredPermissions,
+                actualScopes: token.scope,
+                reason: 'scopes not available',
+            },
+        };
+    }
+    catch (error) {
+        return {
+            name: 'commercetools permissions',
+            status: 'DOWN',
+            message: `Not able to talk with commercetools API`,
+            details: {
+                error,
             },
         };
     }
-    return {
-        name: 'CoCo Permissions',
-        status: 'DOWN',
-        message: `CoCo permissions are not correct, expected scopes: ${opts.requiredPermissions.join(' ')}, actual scopes: ${token.scope}`,
-        details: {
-            expectedScopes: opts.requiredPermissions,
-            actualScopes: token.scope,
-            reason: 'scopes not available',
-        },
-    };
 };
 exports.healthCheckCommercetoolsPermissions = healthCheckCommercetoolsPermissions;

package/dist/api/hooks/jwt-auth.hook.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { IncomingHttpHeaders } from 'node:http';
 import { JWTAuthenticationManager } from '../../security/authn/jwt-authn-manager';
 import { ContextProvider, RequestContextData } from '../context/types/request-context.type';

package/dist/api/hooks/oauth2-auth.hook.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { IncomingHttpHeaders } from 'node:http';
 import { Oauth2AuthenticationManager } from '../../security/authn/oauth2-authn-manager';
 import { ContextProvider, RequestContextData } from '../context/types/request-context.type';

package/dist/api/hooks/session-header-auth.hook.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { IncomingHttpHeaders } from 'node:http';
 import { ContextProvider, RequestContextData } from '../context/types/request-context.type';
 import { SessionHeaderAuthenticationManager } from '../../security';

package/dist/api/hooks/session-query-param-auth.hook.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { IncomingHttpHeaders } from 'node:http';
 import { ContextProvider, RequestContextData } from '../context/types/request-context.type';
 import { SessionQueryParamAuthenticationManager } from '../../security';

package/dist/api/hooks/types/hook.type.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { IncomingHttpHeaders } from 'node:http';
 export interface AuthenticationHook {
     authenticate(): (request: {

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

@@ -24,7 +24,11 @@ class DefaultPaymentService {
         for (let retries = 0; retries < maxRetries; retries++) {
             const payment = await this.getPayment({ id: opts.id });
             const actions = this.consolidateUpdateActions(payment, opts);
-            this.logger.info({ paymentId: payment.id, actions }, 'Updating payment with actions');
+            this.logger.info({ paymentId: payment.id, paymentVersion: payment.version, actions, retries }, 'Updating payment with actions');
+            if (actions.length === 0) {
+                this.logger.info({ paymentId: payment.id, paymentVersion: payment.version, retries }, 'Update payment skipped, no actions to perform');
+                return payment;
+            }
             try {
                 const updatedPayment = await this.ctAPI.payment.updatePayment({
                     resource: {
@@ -37,10 +41,14 @@ class DefaultPaymentService {
             }
             catch (e) {
                 err = e;
-                if (e instanceof ct_api_error_1.CommercetoolsAPIError && e.httpErrorStatus === 409) {
+                if (e instanceof ct_api_error_1.CommercetoolsAPIError &&
+                    (e.httpErrorStatus === 409 ||
+                        (e.httpErrorStatus === 400 && e.message.includes('already used without setting a payment interface')))) {
+                    this.logger.warn({ paymentId: payment.id, paymentVersion: payment.version, retries, err }, 'Unable to update the payment, retrying');
                     retries++;
                 }
                 else {
+                    this.logger.error({ paymentId: payment.id, paymentVersion: payment.version, retries, err }, 'Unable to update the payment, abort');
                     throw e;
                 }
             }
@@ -52,7 +60,7 @@ class DefaultPaymentService {
         if (!payment.interfaceId && updateInfo.pspReference) {
             actions.push(this.populateSetInterfaceIdAction(updateInfo.pspReference));
         }
-        if (!payment.paymentMethodInfo.method && updateInfo.paymentMethod) {
+        if (!payment.paymentMethodInfo?.method && updateInfo.paymentMethod) {
             actions.push(this.populateSetPaymentMethod(updateInfo.paymentMethod));
         }
         if (updateInfo.transaction) {

package/dist/fetch/decorators/base.decorator.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { Fetcher } from '../types/fetch.type';
 /**
  * Basic fetcher implementation

package/dist/fetch/decorators/monitoring.decorator.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { ContextProvider, RequestContextData } from '../../api';
 import { Fetcher } from '../types/fetch.type';
 /**

package/dist/fetch/types/fetch.type.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 export interface Fetcher {
     run(input: string | URL | globalThis.Request, init?: RequestInit): Promise<Response>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commercetools/connect-payments-sdk",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "description": "Payment SDK for commercetools payment connectors",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,7 +15,7 @@
   ],
   "license": "ISC",
   "dependencies": {
-    "@commercetools-backend/loggers": "22.27.0",
+    "@commercetools-backend/loggers": "22.29.0",
     "@commercetools/platform-sdk": "7.9.0",
     "@commercetools/sdk-client-v2": "2.5.0",
     "jsonwebtoken": "9.0.2",