payment-kit 1.13.43 → 1.13.45

package/api/src/integrations/stripe/handlers/invoice.ts

@@ -176,7 +176,7 @@ export async function ensureStripeInvoice(stripeInvoice: any, subscription: Subs
 }
 
 export async function handleStripeInvoiceCreated(event: TEventExpanded, client: Stripe) {
-  if (['invoice.created', 'payment_intent.created'].includes(event.type) === false) {
+  if (['invoice.created', 'payment_intent.created', 'payment_intent.succeeded'].includes(event.type) === false) {
     logger.warn('abort because event type not expected', { id: event.id, type: event.type });
     return null;
   }

package/api/src/integrations/stripe/handlers/payment-intent.ts

@@ -4,9 +4,10 @@ import pick from 'lodash/pick';
 import pWaitFor from 'p-wait-for';
 import type Stripe from 'stripe';
 
+import { handlePaymentSucceed } from '../../../jobs/payment';
 import dayjs from '../../../libs/dayjs';
 import logger from '../../../libs/logger';
-import { CheckoutSession, Invoice, PaymentIntent, PaymentMethod, TEventExpanded } from '../../../store/models';
+import { Invoice, PaymentIntent, PaymentMethod, TEventExpanded } from '../../../store/models';
 import { handleStripeInvoiceCreated } from './invoice';
 
 export async function handleStripePaymentSucceed(paymentIntent: PaymentIntent, event?: TEventExpanded) {
@@ -20,30 +21,7 @@ export async function handleStripePaymentSucceed(paymentIntent: PaymentIntent, e
   });
   logger.info('payment intent succeeded on stripe event', { locale: paymentIntent.id });
 
-  const checkoutSession = await CheckoutSession.findOne({ where: { payment_intent_id: paymentIntent.id } });
-  if (checkoutSession) {
-    await checkoutSession.update({
-      status: 'complete',
-      payment_status: 'paid',
-      payment_details: paymentIntent.payment_details,
-    });
-  }
-
-  if (paymentIntent.invoice_id) {
-    const invoice = await Invoice.findByPk(paymentIntent.invoice_id);
-    if (invoice && invoice.status !== 'paid') {
-      await invoice.update({
-        paid: true,
-        status: 'paid',
-        amount_due: '0',
-        amount_paid: paymentIntent.amount,
-        amount_remaining: '0',
-        attempt_count: invoice.attempt_count + 1,
-        attempted: true,
-        status_transitions: { ...invoice.status_transitions, paid_at: dayjs().unix() },
-      });
-    }
-  }
+  await handlePaymentSucceed(paymentIntent);
 }
 
 export async function syncStripPayment(paymentIntent: PaymentIntent) {
@@ -59,6 +37,8 @@ export async function syncStripPayment(paymentIntent: PaymentIntent) {
   const client = await method.getStripeClient();
   const stripeIntent = await client.paymentIntents.retrieve(paymentIntent.metadata.stripe_id);
   if (stripeIntent) {
+    const justSucceed = stripeIntent.status === 'succeeded' && paymentIntent.status !== 'succeeded';
+
     // @ts-ignore
     await paymentIntent.update({
       amount: String(stripeIntent.amount),
@@ -68,6 +48,10 @@ export async function syncStripPayment(paymentIntent: PaymentIntent) {
       ...pick(stripeIntent, ['status', 'confirmation_method', 'capture_method', 'last_payment_error']),
     });
     logger.info('stripe payment intent synced', { locale: paymentIntent.id, remote: stripeIntent.id });
+
+    if (justSucceed) {
+      await handlePaymentSucceed(paymentIntent);
+    }
   }
 }
 

package/api/src/jobs/payment.ts

@@ -19,6 +19,62 @@ type PaymentJob = {
   retryOnError?: boolean;
 };
 
+export const handlePaymentSucceed = async (paymentIntent: PaymentIntent) => {
+  let invoice;
+  if (paymentIntent.invoice_id) {
+    invoice = await Invoice.findByPk(paymentIntent.invoice_id);
+  }
+  if (!invoice) {
+    const checkoutSession = await CheckoutSession.findOne({ where: { payment_intent_id: paymentIntent.id } });
+    if (checkoutSession && checkoutSession.status === 'open') {
+      await checkoutSession.update({
+        status: 'complete',
+        payment_status: 'paid',
+        payment_details: paymentIntent.payment_details,
+      });
+      logger.info(`CheckoutSession ${checkoutSession.id} updated on payment done ${paymentIntent.id}`);
+    }
+    return;
+  }
+
+  await invoice.update({
+    paid: true,
+    status: 'paid',
+    amount_due: '0',
+    amount_paid: paymentIntent.amount,
+    amount_remaining: '0',
+    attempt_count: invoice.attempt_count + 1,
+    attempted: true,
+    status_transitions: { ...invoice.status_transitions, paid_at: dayjs().unix() },
+  });
+  logger.info(`Invoice ${invoice.id} updated on payment done: ${paymentIntent.id}`);
+
+  if (invoice.subscription_id) {
+    const subscription = await Subscription.findByPk(invoice.subscription_id);
+    if (subscription) {
+      if (subscription.status === 'incomplete') {
+        await subscription.update({ status: subscription.trail_end ? 'trialing' : 'active' });
+        logger.info(`Subscription ${subscription.id} updated on payment done ${invoice.id}`);
+      } else {
+        await subscription.update({ status: 'active' });
+        logger.info(`Subscription ${subscription.id} moved to active after payment done ${paymentIntent.id}`);
+      }
+    }
+  }
+
+  if (invoice.checkout_session_id) {
+    const checkoutSession = await CheckoutSession.findByPk(invoice.checkout_session_id);
+    if (checkoutSession && checkoutSession.status === 'open') {
+      await checkoutSession.update({
+        status: 'complete',
+        payment_status: 'paid',
+        payment_details: paymentIntent.payment_details,
+      });
+      logger.info(`CheckoutSession ${checkoutSession.id} updated on payment done ${paymentIntent.id}`);
+    }
+  }
+};
+
 export const handlePayment = async (job: PaymentJob) => {
   logger.info('handle payment', job);
 
@@ -110,49 +166,7 @@ export const handlePayment = async (job: PaymentJob) => {
       },
     });
 
-    if (invoice) {
-      await invoice.update({
-        paid: true,
-        status: 'paid',
-        amount_due: '0',
-        amount_paid: paymentIntent.amount,
-        amount_remaining: '0',
-        attempt_count: invoice.attempt_count + 1,
-        attempted: true,
-        status_transitions: { ...invoice.status_transitions, paid_at: dayjs().unix() },
-      });
-      logger.info(`Invoice ${invoice.id} updated on payment done: ${job.paymentIntentId}`);
-
-      if (invoice.subscription_id) {
-        const subscription = await Subscription.findByPk(invoice.subscription_id);
-        if (subscription) {
-          if (subscription.status === 'incomplete') {
-            await subscription.update({ status: subscription.trail_end ? 'trialing' : 'active' });
-            logger.info(`Subscription ${subscription.id} updated on payment done ${invoice.id}`);
-          } else {
-            await subscription.update({ status: 'active' });
-            logger.info(`Subscription ${subscription.id} moved to active after payment done ${invoice.id}`);
-          }
-        }
-      }
-
-      if (invoice.checkout_session_id) {
-        const checkoutSession = await CheckoutSession.findByPk(invoice.checkout_session_id);
-        if (checkoutSession && checkoutSession.status === 'open') {
-          await checkoutSession.update({
-            status: 'complete',
-            payment_status: 'paid',
-            payment_details: {
-              arcblock: {
-                tx_hash: txHash,
-                payer: payer as string,
-              },
-            },
-          });
-          logger.info(`CheckoutSession ${checkoutSession.id} updated on payment done ${invoice.id}`);
-        }
-      }
-    }
+    await handlePaymentSucceed(paymentIntent);
   } catch (err) {
     logger.error('PaymentIntent capture failed', { error: err, id: paymentIntent.id });
 
@@ -165,10 +179,27 @@ export const handlePayment = async (job: PaymentJob) => {
       payment_method_type: paymentMethod.type,
     };
 
-    if (invoice && job.retryOnError) {
+    if (!job.retryOnError) {
+      // To a final state without any retry
+      await paymentIntent.update({ status: 'requires_action', last_payment_error: error });
+      if (invoice) {
+        await invoice.update({
+          status: 'uncollectible',
+          attempt_count: invoice.attempt_count + 1,
+          attempted: true,
+          status_transitions: { ...invoice.status_transitions, marked_uncollectible_at: dayjs().unix() },
+        });
+      }
+    } else if (invoice) {
       if (invoice.attempt_count > MAX_RETRY_COUNT) {
         await paymentIntent.update({ status: 'requires_action', last_payment_error: error });
-        await invoice.update({ status: 'uncollectible' });
+        await invoice.update({
+          status: 'uncollectible',
+          attempt_count: invoice.attempt_count + 1,
+          attempted: true,
+          status_transitions: { ...invoice.status_transitions, marked_uncollectible_at: dayjs().unix() },
+        });
+
         // FIXME: send email to customer, pause subscription
         logger.error('PaymentIntent capture failed after max retry', { id: paymentIntent.id });
       } else {
@@ -189,9 +220,6 @@ export const handlePayment = async (job: PaymentJob) => {
           runAt: retryAt,
         });
       }
-    } else {
-      logger.error('PaymentIntent status reverted on capture error', { id: paymentIntent.id });
-      await paymentIntent.update({ status: 'requires_capture' });
     }
   }
 };

package/api/src/routes/connect/collect.ts

@@ -2,10 +2,9 @@ import type { Transaction, TransferV3Tx } from '@ocap/client';
 import { fromAddress } from '@ocap/wallet';
 
 import { invoiceQueue } from '../../jobs/invoice';
-import { paymentQueue } from '../../jobs/payment';
+import { handlePaymentSucceed, paymentQueue } from '../../jobs/payment';
 import type { CallbackArgs } from '../../libs/auth';
 import { wallet } from '../../libs/auth';
-import dayjs from '../../libs/dayjs';
 import { getTxMetadata } from '../../libs/util';
 import { ensureInvoiceForCollect, getAuthPrincipalClaim } from './shared';
 
@@ -83,16 +82,7 @@ export default {
         },
       });
 
-      await invoice.update({
-        paid: true,
-        status: 'paid',
-        amount_due: '0',
-        amount_paid: invoice.amount_due,
-        amount_remaining: '0',
-        attempt_count: invoice.attempt_count + 1,
-        status_transitions: { ...invoice.status_transitions, paid_at: dayjs().unix() },
-        collection_method: 'send_invoice',
-      });
+      await handlePaymentSucceed(paymentIntent);
 
       // cleanup the queue
       let exist = await paymentQueue.get(paymentIntent.id);

package/api/src/routes/connect/pay.ts

@@ -1,9 +1,9 @@
 import type { Transaction, TransferV3Tx } from '@ocap/client';
 import { fromAddress } from '@ocap/wallet';
 
+import { handlePaymentSucceed } from '../../jobs/payment';
 import type { CallbackArgs } from '../../libs/auth';
 import { wallet } from '../../libs/auth';
-import dayjs from '../../libs/dayjs';
 import { getTxMetadata } from '../../libs/util';
 import { ensureInvoiceForCheckout, ensurePaymentIntent, getAuthPrincipalClaim } from './shared';
 
@@ -60,7 +60,7 @@ export default {
       throw new Error('Payment intent not found');
     }
 
-    const { invoice } = await ensureInvoiceForCheckout({ checkoutSession, customer, paymentIntent });
+    await ensureInvoiceForCheckout({ checkoutSession, customer, paymentIntent });
 
     if (paymentMethod.type === 'arcblock') {
       await paymentIntent.update({ status: 'processing' });
@@ -79,16 +79,6 @@ export default {
         { headers: client.pickGasPayerHeaders(request) }
       );
 
-      await checkoutSession.update({
-        status: 'complete',
-        payment_status: 'paid',
-        payment_details: {
-          arcblock: {
-            tx_hash: txHash,
-            payer: userDid,
-          },
-        },
-      });
       await paymentIntent.update({
         status: 'succeeded',
         amount_received: paymentIntent.amount,
@@ -100,18 +90,7 @@ export default {
         },
       });
 
-      if (invoice) {
-        await invoice.update({
-          paid: true,
-          status: 'paid',
-          amount_due: '0',
-          amount_paid: paymentIntent.amount,
-          amount_remaining: '0',
-          attempt_count: invoice.attempt_count + 1,
-          attempted: true,
-          status_transitions: { ...invoice.status_transitions, paid_at: dayjs().unix() },
-        });
-      }
+      await handlePaymentSucceed(paymentIntent);
 
       return { hash: txHash };
     }

package/api/src/routes/connect/subscribe.ts

@@ -124,7 +124,6 @@ export default {
         },
       });
 
-      // FIXME: handle error on the invoice payment job
       if (invoice) {
         invoiceQueue.push({ id: invoice.id, job: { invoiceId: invoice.id, retryOnError: false } });
       }

package/api/src/routes/pricing-table.ts

@@ -363,7 +363,10 @@ router.post('/:id/checkout/:priceId', async (req, res) => {
       behavior: 'per_checkout_session',
       factory: req.query.nft_mint_factory as string,
     };
+    raw.nft_mint_status = 'pending';
     logger.info('use nft_mint_settings from query when checkout from pricing table', { v: raw.nft_mint_settings });
+  } else {
+    raw.nft_mint_status = 'disabled';
   }
 
   const session = await CheckoutSession.create(raw as any);

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.13.43
+version: 1.13.45
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.43",
+  "version": "1.13.45",
   "scripts": {
     "dev": "blocklet dev",
     "eject": "vite eject",
@@ -103,7 +103,7 @@
     "@abtnode/types": "1.16.17",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.43",
+    "@did-pay/types": "1.13.45",
     "@types/cookie-parser": "^1.4.5",
     "@types/cors": "^2.8.15",
     "@types/dotenv-flow": "^3.3.2",
@@ -140,5 +140,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "45e2930980a56ef53f1994ca52748972740bd505"
+  "gitHead": "6dacad185a8f180bbb63ec062aa196dc07c56535"
 }

package/src/components/checkout/form/index.tsx

@@ -28,6 +28,14 @@ const waitForCheckoutComplete = (sessionId: string) => {
   return pWaitFor(
     async () => {
       const { data } = await api.get(`/api/checkout-sessions/retrieve/${sessionId}`);
+      if (
+        data.paymentIntent &&
+        data.paymentIntent.status === 'requires_action' &&
+        data.paymentIntent.last_payment_error
+      ) {
+        throw new Error(data.paymentIntent.last_payment_error.message);
+      }
+
       return (
         data.checkoutSession?.status === 'complete' &&
         ['paid', 'no_payment_required'].includes(data.checkoutSession?.payment_status)