payment-kit 1.18.15 → 1.18.17

package/api/src/routes/checkout-sessions.ts

@@ -15,12 +15,8 @@ import type { WhereOptions } from 'sequelize';
 
 import { MetadataSchema } from '../libs/api';
 import { checkPassportForPaymentLink } from '../integrations/blocklet/passport';
-import { handleStripePaymentSucceed } from '../integrations/stripe/handlers/payment-intent';
-import { handleStripeSubscriptionSucceed } from '../integrations/stripe/handlers/subscription';
-import { ensureStripePaymentIntent, ensureStripeSubscription } from '../integrations/stripe/resource';
 import dayjs from '../libs/dayjs';
 import logger from '../libs/logger';
-import { isCreditSufficientForPayment, isDelegationSufficientForPayment } from '../libs/payment';
 import { authenticate } from '../libs/security';
 import {
   canPayWithDelegation,
@@ -35,6 +31,7 @@ import {
   getStatementDescriptor,
   getSupportedPaymentCurrencies,
   getSupportedPaymentMethods,
+  isDonationCheckoutSession,
   isLineItemAligned,
 } from '../libs/session';
 import {
@@ -51,10 +48,11 @@ import {
   getDataObjectFromQuery,
   isUserInBlocklist,
 } from '../libs/util';
-import { invoiceQueue } from '../queues/invoice';
-import { paymentQueue } from '../queues/payment';
 import {
   Invoice,
+  SetupIntent,
+  Subscription,
+  SubscriptionItem,
   type LineItem,
   type SubscriptionData,
   type TPriceExpanded,
@@ -68,10 +66,13 @@ import { PaymentLink } from '../store/models/payment-link';
 import { PaymentMethod } from '../store/models/payment-method';
 import { Price } from '../store/models/price';
 import { Product } from '../store/models/product';
-import { SetupIntent } from '../store/models/setup-intent';
-import { Subscription } from '../store/models/subscription';
-import { SubscriptionItem } from '../store/models/subscription-item';
+import { ensureStripePaymentIntent, ensureStripeSubscription } from '../integrations/stripe/resource';
+import { handleStripePaymentSucceed } from '../integrations/stripe/handlers/payment-intent';
+import { paymentQueue } from '../queues/payment';
+import { invoiceQueue } from '../queues/invoice';
 import { ensureInvoiceForCheckout } from './connect/shared';
+import { isCreditSufficientForPayment, isDelegationSufficientForPayment } from '../libs/payment';
+import { handleStripeSubscriptionSucceed } from '../integrations/stripe/handlers/subscription';
 import { CHARGE_SUPPORTED_CHAIN_TYPES } from '../libs/constants';
 
 const router = Router();
@@ -143,6 +144,188 @@ export async function validateInventory(line_items: LineItem[], includePendingQu
   await Promise.all(checks);
 }
 
+export async function validatePaymentSettings(paymentMethodId: string, paymentCurrencyId: string) {
+  const paymentMethod = await PaymentMethod.findByPk(paymentMethodId);
+  const paymentCurrency = await PaymentCurrency.findByPk(paymentCurrencyId);
+
+  if (!paymentMethod) {
+    throw new Error('Payment method not found');
+  }
+  if (!paymentCurrency) {
+    throw new Error('Payment currency not found');
+  }
+  if (paymentCurrency.payment_method_id !== paymentMethod.id) {
+    throw new Error('Payment currency not match with payment method');
+  }
+  return { paymentMethod, paymentCurrency };
+}
+
+/**
+ * 计算并更新支付金额
+ */
+export async function calculateAndUpdateAmount(
+  checkoutSession: CheckoutSession,
+  paymentCurrencyId: string,
+  useTrialSetting: boolean = false
+) {
+  const now = dayjs().unix();
+  const lineItems = await Price.expand(checkoutSession.line_items, { product: true, upsell: true });
+
+  let trialInDays = 0;
+  let trialEnd = 0;
+
+  // only use trial setting for subscription
+  if (useTrialSetting) {
+    const trialSetup = getSubscriptionTrialSetup(checkoutSession.subscription_data as any, paymentCurrencyId);
+    trialInDays = trialSetup.trialInDays;
+    trialEnd = trialSetup.trialEnd;
+  }
+
+  const amount = getCheckoutAmount(lineItems, paymentCurrencyId, trialInDays > 0 || trialEnd > now);
+
+  await checkoutSession.update({
+    amount_subtotal: amount.subtotal,
+    amount_total: amount.total,
+    total_details: {
+      amount_discount: amount.discount,
+      amount_shipping: amount.shipping,
+      amount_tax: amount.tax,
+    },
+  });
+
+  if (checkoutSession.mode === 'payment' && amount.total <= 0) {
+    throw new Error('Payment amount should be greater than 0');
+  }
+
+  return { lineItems, amount, trialInDays, trialEnd, now };
+}
+
+/**
+ * 创建或更新支付意向
+ */
+async function createOrUpdatePaymentIntent(
+  checkoutSession: CheckoutSession,
+  paymentMethod: PaymentMethod,
+  paymentCurrency: PaymentCurrency,
+  lineItems: any[],
+  customerId?: string,
+  customerEmail?: string,
+  formData?: any
+) {
+  let paymentIntent: PaymentIntent | null = null;
+
+  if (checkoutSession.mode !== 'payment') {
+    return { paymentIntent };
+  }
+
+  const paymentLink = checkoutSession.payment_link_id
+    ? await PaymentLink.findByPk(checkoutSession.payment_link_id)
+    : null;
+
+  const beneficiaries =
+    paymentLink?.payment_intent_data?.beneficiaries || paymentLink?.donation_settings?.beneficiaries || [];
+
+  if (checkoutSession.payment_intent_id) {
+    paymentIntent = await PaymentIntent.findByPk(checkoutSession.payment_intent_id);
+  }
+
+  // check existing payment intent
+  if (paymentIntent) {
+    // Check payment intent, if we have a payment intent, we should not create a new one
+    if (paymentIntent.status === 'succeeded') {
+      throw new Error('PAYMENT_SUCCEEDED');
+    }
+    if (paymentIntent.status === 'canceled') {
+      throw new Error('PAYMENT_CANCELLED');
+    }
+    if (paymentIntent.status === 'processing') {
+      throw new Error('PAYMENT_PROCESSING');
+    }
+
+    const updateData: Partial<PaymentIntent> = {
+      status: 'requires_capture',
+      amount: checkoutSession.amount_total,
+      currency_id: paymentCurrency.id,
+      payment_method_id: paymentMethod.id,
+      last_payment_error: null,
+      beneficiaries: createPaymentBeneficiaries(checkoutSession.amount_total, beneficiaries),
+    };
+
+    if (customerId) {
+      updateData.customer_id = customerId;
+    }
+
+    if (customerEmail) {
+      updateData.receipt_email = customerEmail;
+    }
+
+    paymentIntent = await paymentIntent.update(updateData);
+    logger.info('payment intent for checkout session reset', {
+      session: checkoutSession.id,
+      intent: paymentIntent.id,
+    });
+  } else {
+    // 创建新的支付意向
+    const createData: any = {
+      livemode: !!checkoutSession.livemode,
+      amount: checkoutSession.amount_total,
+      amount_received: '0',
+      amount_capturable: checkoutSession.amount_total,
+      description: checkoutSession.payment_intent_data?.description || '',
+      currency_id: paymentCurrency.id,
+      payment_method_id: paymentMethod.id,
+      status: 'requires_payment_method',
+      capture_method: 'automatic',
+      confirmation_method: 'automatic',
+      payment_method_types: checkoutSession.payment_method_types,
+      statement_descriptor:
+        checkoutSession.payment_intent_data?.statement_descriptor || getStatementDescriptor(lineItems),
+      statement_descriptor_suffix: '',
+      setup_future_usage: 'on_session',
+      beneficiaries: createPaymentBeneficiaries(checkoutSession.amount_total, beneficiaries),
+      metadata: checkoutSession.payment_intent_data?.metadata || checkoutSession.metadata,
+    };
+
+    if (customerId) {
+      createData.customer_id = customerId;
+    }
+
+    if (customerEmail) {
+      createData.receipt_email = customerEmail;
+    }
+
+    if (formData) {
+      createData.metadata = {
+        ...createData.metadata,
+        is_donation: true,
+      };
+    }
+
+    paymentIntent = await PaymentIntent.create(createData);
+    logger.info('paymentIntent created on checkout session submit', {
+      session: checkoutSession.id,
+      intent: paymentIntent.id,
+    });
+
+    // lock prices used by this payment
+    await Price.update({ locked: true }, { where: { id: lineItems.map((x) => x.price_id) } });
+
+    // persist payment intent id
+    const updateData: any = { payment_intent_id: paymentIntent.id };
+
+    if (formData) {
+      updateData.metadata = {
+        ...checkoutSession.metadata,
+        is_donation: true,
+      };
+    }
+
+    await checkoutSession.update(updateData);
+  }
+
+  return { paymentIntent };
+}
+
 const SubscriptionDataSchema = Joi.object({
   service_actions: Joi.array()
     .items(
@@ -441,7 +624,7 @@ export async function startCheckoutSessionFromPaymentLink(id: string, req: Reque
         payment: 'Thanks for your purchase',
         subscription: 'Thanks for your subscribing',
         setup: 'Thanks for your subscribing',
-        donate: 'Thanks for your support',
+        donate: 'Thanks for for your tip',
       };
       const mode = link.submit_type === 'donate' ? 'donate' : raw.mode;
       raw.payment_intent_data = {
@@ -613,47 +796,19 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
       }
     }
 
-    // validate payment settings
-    const paymentMethod = await PaymentMethod.findByPk(req.body.payment_method);
-    const paymentCurrency = await PaymentCurrency.findByPk(req.body.payment_currency);
-    if (!paymentMethod) {
-      return res.status(400).json({ error: 'Payment method not found' });
-    }
-    if (!paymentCurrency) {
-      return res.status(400).json({ error: 'Payment currency not found' });
-    }
-    if (paymentCurrency.payment_method_id !== paymentMethod.id) {
-      return res.status(400).json({ error: 'Payment currency not match with payment method' });
-    }
+    const { paymentMethod, paymentCurrency } = await validatePaymentSettings(
+      req.body.payment_method,
+      req.body.payment_currency
+    );
     await checkoutSession.update({ currency_id: paymentCurrency.id });
 
-    // always update payment amount in case currency has changed
-    const now = dayjs().unix();
-    const lineItems = await Price.expand(checkoutSession.line_items, { product: true, upsell: true });
-
-    // trialing can be customized with currency_id list
-    const { trialEnd, trialInDays } = getSubscriptionTrialSetup(
-      checkoutSession.subscription_data as any,
-      paymentCurrency.id
+    // calculate amount and update checkout session
+    const { lineItems, trialInDays, trialEnd, now } = await calculateAndUpdateAmount(
+      checkoutSession,
+      paymentCurrency.id,
+      true
     );
 
-    const billingThreshold = Number(checkoutSession.subscription_data?.billing_threshold_amount || 0);
-    const minStakeAmount = Number(checkoutSession.subscription_data?.min_stake_amount || 0);
-    const amount = getCheckoutAmount(lineItems, paymentCurrency.id, trialInDays > 0 || trialEnd > now);
-    await checkoutSession.update({
-      amount_subtotal: amount.subtotal,
-      amount_total: amount.total,
-      total_details: {
-        amount_discount: amount.discount,
-        amount_shipping: amount.shipping,
-        amount_tax: amount.tax,
-      },
-    });
-    if (checkoutSession.mode === 'payment' && amount.total <= 0) {
-      return res.status(400).json({ error: 'Payment amount should be greater than 0' });
-    }
-
-    // ensure customer created or updated
     let customer = await Customer.findOne({ where: { did: req.user.did } });
     if (!customer) {
       customer = await Customer.create({
@@ -687,6 +842,8 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
 
       await customer.update(updates);
     }
+
+    // check if customer can make new purchase
     const canMakeNewPurchase = await customer.canMakeNewPurchase(checkoutSession.invoice_id);
     if (!canMakeNewPurchase) {
       return res.status(403).json({
@@ -695,7 +852,7 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
       });
     }
 
-    // check if user in block list
+    // check if user is in blocklist
     if (CHARGE_SUPPORTED_CHAIN_TYPES.includes(paymentMethod.type)) {
       const inBlock = await isUserInBlocklist(req.user.did, paymentMethod);
       if (inBlock) {
@@ -707,80 +864,21 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
 
     await checkoutSession.update({ customer_id: customer.id, customer_did: req.user.did });
 
-    // payment intent is only created when checkout session is in payment mode
+    // create or update payment intent
     let paymentIntent: PaymentIntent | null = null;
     if (checkoutSession.mode === 'payment') {
-      const paymentLink = checkoutSession.payment_link_id
-        ? await PaymentLink.findByPk(checkoutSession.payment_link_id)
-        : null;
-      const beneficiaries =
-        paymentLink?.payment_intent_data?.beneficiaries || paymentLink?.donation_settings?.beneficiaries || [];
-
-      if (checkoutSession.payment_intent_id) {
-        paymentIntent = await PaymentIntent.findByPk(checkoutSession.payment_intent_id);
-      }
-
-      // check existing payment intent
-      if (paymentIntent) {
-        // Check payment intent, if we have a payment intent, we should not create a new one
-        if (paymentIntent.status === 'succeeded') {
-          return res.status(403).json({ code: 'PAYMENT_SUCCEEDED', error: 'Checkout session payment completed' });
-        }
-        if (paymentIntent.status === 'canceled') {
-          return res.status(403).json({ code: 'PAYMENT_CANCELLED', error: 'Checkout session payment canceled' });
-        }
-        if (paymentIntent.status === 'processing') {
-          return res.status(403).json({ code: 'PAYMENT_PROCESSING', error: 'Checkout session payment processing' });
-        }
-        paymentIntent = await paymentIntent.update({
-          status: 'requires_capture',
-          amount: checkoutSession.amount_total,
-          customer_id: customer.id,
-          currency_id: paymentCurrency.id,
-          payment_method_id: paymentMethod.id,
-          receipt_email: customer.email,
-          last_payment_error: null,
-          beneficiaries: createPaymentBeneficiaries(checkoutSession.amount_total, beneficiaries),
-        });
-        logger.info('payment intent for checkout session reset', {
-          session: checkoutSession.id,
-          intent: paymentIntent.id,
-        });
-      } else {
-        paymentIntent = await PaymentIntent.create({
-          livemode: !!checkoutSession.livemode,
-          amount: checkoutSession.amount_total,
-          amount_received: '0',
-          amount_capturable: checkoutSession.amount_total,
-          customer_id: customer.id,
-          description: checkoutSession.payment_intent_data?.description || '',
-          currency_id: paymentCurrency.id,
-          payment_method_id: paymentMethod.id,
-          status: 'requires_payment_method',
-          capture_method: 'automatic',
-          confirmation_method: 'automatic',
-          payment_method_types: checkoutSession.payment_method_types,
-          receipt_email: customer.email,
-          statement_descriptor:
-            checkoutSession.payment_intent_data?.statement_descriptor || getStatementDescriptor(lineItems),
-          statement_descriptor_suffix: '',
-          setup_future_usage: 'on_session',
-          beneficiaries: createPaymentBeneficiaries(checkoutSession.amount_total, beneficiaries),
-          metadata: checkoutSession.payment_intent_data?.metadata || checkoutSession.metadata,
-        });
-        logger.info('paymentIntent created on checkout session submit', {
-          session: checkoutSession.id,
-          intent: paymentIntent.id,
-        });
-
-        // lock prices used by this payment
-        await Price.update({ locked: true }, { where: { id: lineItems.map((x) => x.price_id) } });
-
-        // persist payment intent id
-        await checkoutSession.update({ payment_intent_id: paymentIntent.id });
-      }
+      const result = await createOrUpdatePaymentIntent(
+        checkoutSession,
+        paymentMethod,
+        paymentCurrency,
+        lineItems,
+        customer.id,
+        customer.email
+      );
+      paymentIntent = result.paymentIntent;
     }
 
+    // SetupIntent processing
     let setupIntent: SetupIntent | null = null;
     if (checkoutSession.mode === 'setup' && paymentMethod.type !== 'stripe') {
       if (checkoutSession.setup_intent_id) {
@@ -830,6 +928,7 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
       }
     }
 
+    // subscription processing
     let subscription: Subscription | null = null;
     if (checkoutSession.mode === 'subscription' || checkoutSession.mode === 'setup') {
       if (checkoutSession.subscription_id) {
@@ -909,8 +1008,8 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
             },
           },
           billing_thresholds: {
-            amount_gte: billingThreshold,
-            stake_gte: minStakeAmount,
+            amount_gte: getBillingThreshold(checkoutSession.subscription_data as any),
+            stake_gte: getMinStakeAmount(checkoutSession.subscription_data as any),
             reset_billing_cycle_anchor: false,
           },
           pending_invoice_item_interval: setup.recurring,
@@ -1105,6 +1204,73 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
   }
 });
 
+// 打赏（不强制登录）
+router.put('/:id/donate-submit', ensureCheckoutSessionOpen, async (req, res) => {
+  try {
+    const checkoutSession = req.doc as CheckoutSession;
+    if (!isDonationCheckoutSession(checkoutSession)) {
+      return res.status(400).json({
+        code: 'INVALID_DONATION',
+        error: 'This endpoint is only for donations',
+      });
+    }
+
+    if (checkoutSession.mode !== 'payment') {
+      return res.status(400).json({
+        code: 'INVALID_MODE',
+        error: 'This endpoint is only for payment mode donations',
+      });
+    }
+
+    // validate inventory
+    if (checkoutSession.line_items) {
+      try {
+        await validateInventory(checkoutSession.line_items);
+      } catch (err) {
+        logger.error('validateInventory failed', {
+          error: err,
+          line_items: checkoutSession.line_items,
+          checkoutSessionId: checkoutSession.id,
+        });
+        return res.status(400).json({ error: err.message });
+      }
+    }
+
+    // validate payment settings
+    const { paymentMethod, paymentCurrency } = await validatePaymentSettings(
+      req.body.payment_method,
+      req.body.payment_currency
+    );
+    await checkoutSession.update({ currency_id: paymentCurrency.id });
+
+    // calculate amount and update checkout session
+    const { lineItems } = await calculateAndUpdateAmount(checkoutSession, paymentCurrency.id, false);
+
+    const { paymentIntent } = await createOrUpdatePaymentIntent(
+      checkoutSession,
+      paymentMethod,
+      paymentCurrency,
+      lineItems
+    );
+
+    // 返回支付信息
+    return res.json({
+      paymentIntent,
+      checkoutSession,
+      paymentMethod,
+      paymentCurrency,
+      formData: req.body,
+    });
+  } catch (err) {
+    logger.error('Error processing donation submission', {
+      sessionId: req.params.id,
+      error: err.message,
+      stack: err.stack,
+    });
+    res.status(400).json({ code: err.code, error: err.message });
+  }
+});
+
 // upsell
 router.put('/:id/upsell', user, ensureCheckoutSessionOpen, async (req, res) => {
   try {

package/api/src/routes/connect/change-payment.ts

@@ -99,6 +99,9 @@ export default {
     result.push({
       step,
       claim: claims?.[0],
+      stepRequest: {
+        headers: request?.headers,
+      },
     });
 
     // 判断是否为最后一步
@@ -164,12 +167,17 @@ export default {
 
     if (paymentMethod.type === 'arcblock') {
       await prepareTxExecution();
+      const requestArray = result
+        .map((item: { stepRequest?: Request }) => item.stepRequest)
+        .filter(Boolean) as Request[];
+      const requestSource = requestArray.length > 0 ? requestArray : request;
+
       const { stakingAmount, ...paymentDetails } = await executeOcapTransactions(
         userDid,
         userPk,
         claimsList,
         paymentMethod,
-        request,
+        requestSource,
         subscription?.id,
         paymentCurrency.contract
       );

package/api/src/routes/connect/change-plan.ts

@@ -113,6 +113,9 @@ export default {
     result.push({
       step,
       claim: claims?.[0],
+      stepRequest: {
+        headers: request?.headers,
+      },
     });
 
     // 判断是否为最后一步
@@ -171,12 +174,17 @@ export default {
     if (paymentMethod.type === 'arcblock') {
       await prepareTxExecution();
 
+      const requestArray = result
+        .map((item: { stepRequest?: Request }) => item.stepRequest)
+        .filter(Boolean) as Request[];
+      const requestSource = requestArray.length > 0 ? requestArray : request;
+
       const { stakingAmount, ...paymentDetails } = await executeOcapTransactions(
         userDid,
         userPk,
         claimsList,
         paymentMethod,
-        request,
+        requestSource,
         subscription?.id,
         paymentCurrency?.contract
       );

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

@@ -23,16 +23,18 @@ export default {
     authPrincipal: async ({ extraParams }: CallbackArgs) => {
       const { paymentMethod } = await ensureSubscriptionForCollectBatch(
         extraParams.subscriptionId,
-        extraParams.currencyId
+        extraParams.currencyId,
+        extraParams.customerId
       );
       return getAuthPrincipalClaim(paymentMethod, 'pay');
     },
   },
   onConnect: async ({ userDid, userPk, extraParams }: CallbackArgs) => {
-    const { subscriptionId, currencyId } = extraParams;
+    const { subscriptionId, currencyId, customerId } = extraParams;
     const { amount, invoices, paymentCurrency, paymentMethod } = await ensureSubscriptionForCollectBatch(
       subscriptionId,
-      currencyId
+      currencyId,
+      customerId
     );
 
     if (paymentMethod.type === 'arcblock') {
@@ -83,8 +85,8 @@ export default {
     throw new Error(`Payment method ${paymentMethod.type} not supported`);
   },
   onAuth: async ({ request, userDid, claims, extraParams }: CallbackArgs) => {
-    const { subscriptionId, currencyId } = extraParams;
-    const { invoices, paymentMethod } = await ensureSubscriptionForCollectBatch(subscriptionId, currencyId);
+    const { subscriptionId, currencyId, customerId } = extraParams;
+    const { invoices, paymentMethod } = await ensureSubscriptionForCollectBatch(subscriptionId, currencyId, customerId);
 
     const afterTxExecution = async (paymentDetails: any) => {
       const paymentIntents = await PaymentIntent.findAll({

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

@@ -20,7 +20,7 @@ export default {
 
   claims: {
     authPrincipal: async ({ extraParams }: CallbackArgs) => {
-      const { paymentMethod } = await ensurePaymentIntent(extraParams.checkoutSessionId);
+      const { paymentMethod } = await ensurePaymentIntent(extraParams.checkoutSessionId, '', true);
       return getAuthPrincipalClaim(paymentMethod, 'pay');
     },
   },