feat(accept-blue): return declined instead of throwing

Pinelab-studio · Nov 21, 2024 · 529ae1c · 529ae1c
1 parent f456ceb
commit 529ae1c
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 25 deletions.
diff --git a/packages/vendure-plugin-accept-blue/package.json b/packages/vendure-plugin-accept-blue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-accept-blue",
-  "version": "1.8.1",
+  "version": "1.9.0",
   "description": "Vendure plugin for creating subscriptions with the Accept Blue platform",
   "author": "Martijn van de Brug <[email protected]>",
   "homepage": "https://pinelab-plugins.com/",

diff --git a/packages/vendure-plugin-accept-blue/src/accept-blue-plugin.ts b/packages/vendure-plugin-accept-blue/src/accept-blue-plugin.ts
@@ -1,4 +1,4 @@
-import { PluginCommonModule, VendurePlugin } from '@vendure/core';
+import { PluginCommonModule, Type, VendurePlugin } from '@vendure/core';
 import { SubscriptionStrategy } from '../../util/src/subscription/subscription-strategy';
 import { AcceptBlueService } from './api/accept-blue-service';
 import { acceptBluePaymentHandler } from './api/accept-blue-handler';
@@ -61,7 +61,7 @@ export type AcceptBluePluginOptions = Required<AcceptBluePluginOptionsInput>;
 export class AcceptBluePlugin {
   static options: AcceptBluePluginOptions;
 
-  static init(options: AcceptBluePluginOptionsInput): AcceptBluePlugin {
+  static init(options: AcceptBluePluginOptionsInput): Type<AcceptBluePlugin> {
     let vendureHost = options.vendureHost;
     // Strip trailing slash
     if (vendureHost.endsWith('/')) {

diff --git a/packages/vendure-plugin-accept-blue/src/api/accept-blue-handler.ts b/packages/vendure-plugin-accept-blue/src/api/accept-blue-handler.ts
@@ -25,6 +25,7 @@ import {
 } from '../util';
 import { AcceptBlueClient } from './accept-blue-client';
 import { AcceptBlueService } from './accept-blue-service';
+import { asError } from 'catch-unknown';
 
 let service: AcceptBlueService;
 export const acceptBluePaymentHandler = new PaymentMethodHandler({
@@ -106,28 +107,41 @@ export const acceptBluePaymentHandler = new PaymentMethodHandler({
       | NoncePaymentMethodInput
       | SavedPaymentMethodInput;
     const client = new AcceptBlueClient(args.apiKey, args.pin, args.testMode);
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
-    const result = await service.handlePaymentForOrder(
-      ctx,
-      order,
-      amount,
-      client,
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-      input
-    );
-    const chargeTransactionId = result.chargeResult?.transaction?.id;
-    Logger.info(
-      `Settled payment for order '${order.code}', for Accept Blue customer '${result.customerId}' and one time charge transaction '${chargeTransactionId}'`,
-      loggerCtx
-    );
-    return {
-      amount,
-      state: 'Settled',
-      transactionId: chargeTransactionId
-        ? String(chargeTransactionId)
-        : undefined,
-      metadata: result,
-    };
+    try {
+      const result = await service.handlePaymentForOrder(
+        ctx,
+        order,
+        amount,
+        client,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        input
+      );
+      const chargeTransactionId = result.chargeResult?.transaction?.id;
+      Logger.info(
+        `Settled payment for order '${order.code}', for Accept Blue customer '${result.customerId}' and one time charge transaction '${chargeTransactionId}'`,
+        loggerCtx
+      );
+      return {
+        amount,
+        state: 'Settled',
+        transactionId: chargeTransactionId
+          ? String(chargeTransactionId)
+          : undefined,
+        metadata: result,
+      };
+    } catch (e) {
+      const error = asError(e);
+      Logger.error(
+        `Error settling payment for order '${order.code}': ${error.message}`,
+        loggerCtx,
+        error.stack
+      );
+      return {
+        amount,
+        state: 'Declined',
+        errorMessage: error.message,
+      };
+    }
   },
   settlePayment(): SettlePaymentResult {
     return {

diff --git a/...cept-blue/src/api/custom-field-types.d.ts → ...accept-blue/src/api/custom-field-types.ts b/...cept-blue/src/api/custom-field-types.d.ts → ...accept-blue/src/api/custom-field-types.ts
diff --git a/packages/vendure-plugin-accept-blue/src/index.ts b/packages/vendure-plugin-accept-blue/src/index.ts
@@ -7,3 +7,4 @@ export * from './api/accept-blue-client';
 export * from './api/accept-blue-transaction-event';
 export * from './api/accept-blue-handler';
 export * from './api/accept-blue-common-resolvers';
+export * from './api/custom-field-types';
diff --git a/packages/vendure-plugin-accept-blue/src/util.ts b/packages/vendure-plugin-accept-blue/src/util.ts
@@ -148,6 +148,7 @@ export function getDaysBetweenBillingCycles(frequency: Frequency): number {
     case 'biannually':
       return 730;
     default:
+      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions -- prevent runtime errors, even though this shouldnt be possible TS wise
       throw Error(`Frequency '${frequency}' is not a valid frequency`);
   }
 }