payment-kit 1.13.29 → 1.13.31

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

@@ -2,6 +2,8 @@
 import { getUrl } from '@blocklet/sdk/lib/component';
 import userMiddleware from '@blocklet/sdk/lib/middlewares/user';
 import { Request, Response, Router } from 'express';
+import cloneDeep from 'lodash/cloneDeep';
+import merge from 'lodash/merge';
 import omit from 'lodash/omit';
 import pick from 'lodash/pick';
 import sortBy from 'lodash/sortBy';
@@ -19,8 +21,10 @@ import logger from '../libs/logger';
 import { isDelegationSufficientForPayment } from '../libs/payment';
 import { authenticate } from '../libs/security';
 import {
+  canUpsell,
   getCheckoutAmount,
   getCheckoutMode,
+  getFastCheckoutAmount,
   getStatementDescriptor,
   getSubscriptionCreateSetup,
   getSupportedPaymentCurrencies,
@@ -28,7 +32,7 @@ import {
   isLineItemAligned,
 } from '../libs/session';
 import { createCodeGenerator, formatMetadata } from '../libs/util';
-import type { LineItem, TPaymentCurrency } from '../store/models';
+import type { TPaymentCurrency } from '../store/models';
 import { CheckoutSession } from '../store/models/checkout-session';
 import { Customer } from '../store/models/customer';
 import { PaymentCurrency } from '../store/models/payment-currency';
@@ -137,7 +141,7 @@ export const formatCheckoutSession = async (payload: any, throwOnEmptyItems = tr
     throw new Error('line items should not be empty for checkout session');
   }
 
-  const items = await Price.expand(raw.line_items as LineItem[]);
+  const items = await Price.expand(raw.line_items as any[]);
   if (items.some((x) => !x.price)) {
     throw new Error('Invalid line items for checkout session, some price may have been deleted');
   }
@@ -159,8 +163,6 @@ export const formatCheckoutSession = async (payload: any, throwOnEmptyItems = tr
     raw.currency_id = items[0]?.price.currency_id;
   }
 
-  const currency = await PaymentCurrency.findByPk(raw.currency_id);
-  const amount = getCheckoutAmount(items, currency as TPaymentCurrency, !!raw.subscription_data?.trial_period_days);
   const mode = getCheckoutMode(items);
 
   return Object.assign(raw, {
@@ -168,7 +170,19 @@ export const formatCheckoutSession = async (payload: any, throwOnEmptyItems = tr
     status: 'open',
     payment_status: 'unpaid',
     nft_mint_status: raw.nft_mint_settings?.enabled ? 'pending' : 'disabled',
+    payment_method_types: await getPaymentTypes(items),
+    // always create invoice for subscriptions
+    invoice_creation: mode === 'subscription' ? { enabled: true } : raw.invoice_creation,
+    ...(await getCheckoutSessionAmounts(raw as CheckoutSession)),
+  });
+};
 
+export async function getCheckoutSessionAmounts(checkoutSession: CheckoutSession) {
+  const items = await Price.expand(checkoutSession.line_items);
+  const currency = await PaymentCurrency.findByPk(checkoutSession.currency_id);
+  const includeTrial = !!checkoutSession.subscription_data?.trial_period_days;
+  const amount = getCheckoutAmount(items, currency as TPaymentCurrency, includeTrial);
+  return {
     amount_subtotal: amount.subtotal,
     amount_total: amount.total,
     total_details: {
@@ -176,13 +190,8 @@ export const formatCheckoutSession = async (payload: any, throwOnEmptyItems = tr
       amount_shipping: amount.shipping,
       amount_tax: amount.tax,
     },
-
-    payment_method_types: await getPaymentTypes(items),
-
-    // always create invoice for subscriptions
-    invoice_creation: mode === 'subscription' ? { enabled: true } : raw.invoice_creation,
-  });
-};
+  };
+}
 
 // create checkout session
 router.post('/', auth, async (req, res) => {
@@ -206,7 +215,7 @@ export async function startCheckoutSessionFromPaymentLink(id: string, req: Reque
     return;
   }
 
-  const items = await Price.expand(link.line_items);
+  const items = await Price.expand(link.line_items, { upsell: true });
 
   const raw: Partial<CheckoutSession> = await formatCheckoutSession(link, false);
   raw.livemode = link.livemode;
@@ -214,6 +223,20 @@ export async function startCheckoutSessionFromPaymentLink(id: string, req: Reque
   raw.currency_id = link.currency_id || req.currency.id;
   raw.payment_link_id = link.id;
 
+  if (link.after_completion?.hosted_confirmation?.custom_message) {
+    raw.payment_intent_data = {
+      description: link.after_completion?.hosted_confirmation?.custom_message,
+    };
+  } else {
+    raw.payment_intent_data = {
+      // TODO: bake default into this
+      description: 'Thanks for your purchase',
+    };
+  }
+  if (link.after_completion?.redirect?.url) {
+    raw.success_url = link.after_completion?.redirect?.url;
+  }
+
   if (req.query.redirect) {
     raw.success_url = req.query.redirect as string;
     raw.cancel_url = req.query.redirect as string;
@@ -268,7 +291,7 @@ router.get('/:id', auth, async (req, res) => {
 
   if (doc) {
     // @ts-ignore
-    doc.line_items = await Price.expand(doc.line_items);
+    doc.line_items = await Price.expand(doc.line_items, { upsell: true });
     doc.url = getUrl(`/checkout/${doc.submit_type}/${doc.id}`);
   }
 
@@ -285,7 +308,7 @@ router.get('/retrieve/:id', user, async (req, res) => {
   }
 
   // @ts-ignore
-  doc.line_items = await Price.expand(doc.line_items);
+  doc.line_items = await Price.expand(doc.line_items, { upsell: true });
 
   // check payment intent
   const paymentIntent = doc.payment_intent_id ? await PaymentIntent.findByPk(doc.payment_intent_id) : null;
@@ -334,7 +357,7 @@ router.put('/:id/submit', user, async (req, res) => {
     await checkoutSession.update({ currency_id: paymentCurrency.id });
 
     // always update payment amount in case currency has changed
-    const lineItems = await Price.expand(checkoutSession.line_items, true);
+    const lineItems = await Price.expand(checkoutSession.line_items, { product: true, upsell: true });
     const trialInDays = checkoutSession.subscription_data?.trial_period_days || 0;
     const amount = getCheckoutAmount(lineItems, paymentCurrency, !!trialInDays);
     await checkoutSession.update({
@@ -364,6 +387,7 @@ router.put('/:id/submit', user, async (req, res) => {
         delinquent: false,
         invoice_prefix: getInvoicePrefix(),
       });
+      logger.info('customer created on checkout session submit', { did: req.user.did, id: customer.id });
     } else {
       const updates: Record<string, string> = {};
       if (checkoutSession.customer_update?.name) {
@@ -429,6 +453,10 @@ router.put('/:id/submit', user, async (req, res) => {
           setup_future_usage: 'on_session',
           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) } });
@@ -473,6 +501,10 @@ router.put('/:id/submit', user, async (req, res) => {
           usage: 'off_session',
           metadata: checkoutSession.metadata,
         });
+        logger.info('setupIntent created on checkout session submit', {
+          session: checkoutSession.id,
+          intent: setupIntent.id,
+        });
 
         // persist setup intent id
         await checkoutSession.update({ setup_intent_id: setupIntent.id });
@@ -520,8 +552,13 @@ router.put('/:id/submit', user, async (req, res) => {
           metadata: checkoutSession.metadata as any,
         });
 
+        logger.info('subscription created on checkout session submit', {
+          session: checkoutSession.id,
+          subscription: subscription.id,
+        });
+
         // create subscription items
-        await Promise.all(
+        const items = await Promise.all(
           lineItems
             .filter((x) => x.price.type === 'recurring')
             .map((x) =>
@@ -529,15 +566,19 @@ router.put('/:id/submit', user, async (req, res) => {
                 livemode: !!checkoutSession.livemode,
                 // @ts-ignore
                 subscription_id: subscription.id,
-                price_id: x.price_id,
+                price_id: x.upsell_price_id || x.price_id,
                 quantity: x.quantity,
                 metadata: checkoutSession.metadata as any,
               })
             )
         );
+        logger.info('subscription items created on checkout session submit', {
+          session: checkoutSession.id,
+          items: items.map((x) => x.id),
+        });
 
         // lock prices used by this subscription
-        await Price.update({ locked: true }, { where: { id: lineItems.map((x) => x.price_id) } });
+        await Price.update({ locked: true }, { where: { id: lineItems.map((x) => x.upsell_price_id || x.price_id) } });
 
         // persist subscription id
         await checkoutSession.update({ subscription_id: subscription.id });
@@ -545,11 +586,12 @@ router.put('/:id/submit', user, async (req, res) => {
     }
 
     // if we can complete purchase without any wallet interaction
+    const fastCheckoutAmount = getFastCheckoutAmount(lineItems, checkoutSession.mode, paymentCurrency, !!trialInDays);
     const delegation = await isDelegationSufficientForPayment({
       paymentMethod,
       paymentCurrency,
       userDid: customer.did,
-      amount: checkoutSession.amount_total,
+      amount: fastCheckoutAmount,
     });
     if (delegation.sufficient) {
       const paymentSettings = {
@@ -623,7 +665,7 @@ router.put('/:id/submit', user, async (req, res) => {
           subscription,
           paymentMethod,
           paymentCurrency,
-          lineItems as any[],
+          lineItems,
           trialInDays
         );
         if (stripeSubscription && subscription?.payment_details?.stripe?.subscription_id === stripeSubscription.id) {
@@ -651,6 +693,105 @@ router.put('/:id/submit', user, async (req, res) => {
   }
 });
 
+// upsell
+router.put('/:id/upsell', user, async (req, res) => {
+  try {
+    // validate session
+    const checkoutSession = await CheckoutSession.findByPk(req.params.id);
+    if (!checkoutSession) {
+      return res.status(404).json({ error: 'Checkout session not found' });
+    }
+    if (checkoutSession.status === 'complete') {
+      return res.status(403).json({ error: 'Checkout session completed' });
+    }
+    if (checkoutSession.status === 'expired') {
+      return res.status(403).json({ error: 'Checkout session expired' });
+    }
+
+    if (checkoutSession.line_items) {
+      // validate line items
+      if (checkoutSession.line_items.length > 1) {
+        return res.status(400).json({ error: 'Upsell not supported for checkoutSession with multiple line items' });
+      }
+
+      // validate from and to
+      const [from, to] = await Promise.all([Price.findByPk(req.body.from), Price.findByPk(req.body.to)]);
+      if (!from) {
+        return res.status(400).json({ error: 'Upsell from price not found' });
+      }
+      if (!to) {
+        return res.status(400).json({ error: 'Upsell to price not found' });
+      }
+
+      if (canUpsell(from, to) === false) {
+        return res.status(400).json({ error: `Upsell not possible from ${from} to ${to}` });
+      }
+
+      const index = checkoutSession.line_items.findIndex((x) => x.price_id === from.id);
+      if (index === -1) {
+        return res.status(400).json({ error: 'Upsell from not exist in checkoutSession line items' });
+      }
+
+      const items = cloneDeep(checkoutSession.line_items);
+      items[index] = merge(items[index], { upsell_price_id: to.id });
+      await checkoutSession.update({ line_items: items });
+      logger.info('CheckoutSession updated on upsell', { id: req.params.id, from: from.id, to: to.id });
+
+      // recalculate amount
+      await checkoutSession.update(await getCheckoutSessionAmounts(checkoutSession));
+    }
+
+    const items = await Price.expand(checkoutSession.line_items, { upsell: true });
+    res.json({ ...checkoutSession.toJSON(), line_items: items });
+  } catch (err) {
+    console.error(err);
+    res.status(500).json({ error: err.message });
+  }
+});
+
+router.put('/:id/downsell', user, async (req, res) => {
+  try {
+    // validate session
+    const checkoutSession = await CheckoutSession.findByPk(req.params.id);
+    if (!checkoutSession) {
+      return res.status(404).json({ error: 'Checkout session not found' });
+    }
+    if (checkoutSession.status === 'complete') {
+      return res.status(403).json({ error: 'Checkout session completed' });
+    }
+    if (checkoutSession.status === 'expired') {
+      return res.status(403).json({ error: 'Checkout session expired' });
+    }
+
+    // validate from
+    const from = await Price.findByPk(req.body.from);
+    if (!from) {
+      return res.status(400).json({ error: 'Upsell from price not found' });
+    }
+
+    if (checkoutSession.line_items) {
+      const index = checkoutSession.line_items.findIndex((x) => x.upsell_price_id === from.id);
+      if (index === -1) {
+        return res.status(400).json({ error: 'Upsell not configured for checkout session' });
+      }
+
+      const items = cloneDeep(checkoutSession.line_items);
+      items[index] = merge(items[index], { upsell_price_id: '' });
+      await checkoutSession.update({ line_items: items });
+      logger.info('CheckoutSession updated on downsell', { id: req.params.id, from: from.id });
+
+      // recalculate amount
+      await checkoutSession.update(await getCheckoutSessionAmounts(checkoutSession));
+    }
+
+    const items = await Price.expand(checkoutSession.line_items, { upsell: true });
+    res.json({ ...checkoutSession.toJSON(), line_items: items });
+  } catch (err) {
+    console.error(err);
+    res.status(500).json({ error: err.message });
+  }
+});
+
 // eslint-disable-next-line consistent-return
 router.put('/:id/expire', auth, async (req, res) => {
   const doc = await CheckoutSession.findByPk(req.params.id);

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

@@ -6,6 +6,7 @@ import { 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';
 
 // Used to collect an open invoice failed to collect automatically
@@ -26,15 +27,10 @@ export default {
     // @ts-ignore
     const itx: TransferV3Tx = {
       outputs: [{ owner: wallet.address, tokens, assets: [] }],
-      data: {
-        type: 'json',
-        // @ts-ignore
-        value: {
-          appId: wallet.address,
-          paymentIntentId: paymentIntent.id,
-          invoiceId,
-        },
-      },
+      data: getTxMetadata({
+        paymentIntentId: paymentIntent.id,
+        invoiceId,
+      }),
     };
 
     if (paymentMethod.type === 'arcblock') {

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

@@ -4,6 +4,7 @@ import { fromAddress } from '@ocap/wallet';
 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';
 
 export default {
@@ -27,15 +28,10 @@ export default {
       // @ts-ignore
       const itx: TransferV3Tx = {
         outputs: [{ owner: wallet.address, tokens, assets: [] }],
-        data: {
-          type: 'json',
-          // @ts-ignore
-          value: {
-            appId: wallet.address,
-            paymentIntentId: paymentIntent.id,
-            checkoutSessionId,
-          },
-        },
+        data: getTxMetadata({
+          paymentIntentId: paymentIntent.id,
+          checkoutSessionId,
+        }),
       };
 
       return {

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

@@ -6,6 +6,9 @@ import { fromPublicKey } from '@ocap/wallet';
 import { subscriptionQueue } from '../../jobs/subscription';
 import type { CallbackArgs } from '../../libs/auth';
 import { wallet } from '../../libs/auth';
+import { getFastCheckoutAmount } from '../../libs/session';
+import { getTxMetadata } from '../../libs/util';
+import type { TLineItemExpanded } from '../../store/models';
 import { ensureSetupIntent, getAuthPrincipalClaim } from './shared';
 
 export default {
@@ -19,12 +22,22 @@ export default {
   },
   onConnect: async ({ userDid, userPk, extraParams }: CallbackArgs) => {
     const { checkoutSessionId } = extraParams;
-    const { paymentMethod, subscription } = await ensureSetupIntent(checkoutSessionId, userDid);
+    const { paymentMethod, paymentCurrency, checkoutSession, subscription } = await ensureSetupIntent(
+      checkoutSessionId,
+      userDid
+    );
     if (!subscription) {
       throw new Error('Subscription for checkoutSession not found');
     }
 
     if (paymentMethod.type === 'arcblock') {
+      const amount = getFastCheckoutAmount(
+        checkoutSession.line_items as TLineItemExpanded[],
+        checkoutSession.mode,
+        paymentCurrency,
+        !!checkoutSession.subscription_data?.trial_period_days
+      );
+
       return {
         signature: {
           type: 'DelegateTx',
@@ -35,17 +48,16 @@ export default {
               address: toDelegateAddress(userDid, wallet.address),
               to: wallet.address,
               ops: [{ typeUrl: 'fg:t:transfer_v2', rules: [] }],
-              data: {
-                type: 'json',
-                // @ts-ignore
-                value: {
-                  appId: wallet.address,
-                  subscriptionId: subscription.id,
-                  checkoutSessionId,
-                },
-              },
+              data: getTxMetadata({
+                subscriptionId: subscription.id,
+                checkoutSessionId,
+              }),
             },
           },
+          nonce: checkoutSessionId,
+          requirement: {
+            tokens: [{ address: paymentCurrency.contract as string, value: amount }],
+          },
           chainInfo: {
             host: paymentMethod.settings?.arcblock?.api_host as string,
             id: paymentMethod.settings?.arcblock?.chain_id as string,

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

@@ -3,7 +3,8 @@ import { BN } from '@ocap/util';
 import { blocklet } from '../../libs/auth';
 import dayjs from '../../libs/dayjs';
 import logger from '../../libs/logger';
-import { TLineItemExpanded, getStatementDescriptor } from '../../libs/session';
+import { getStatementDescriptor } from '../../libs/session';
+import type { TLineItemExpanded } from '../../store/models';
 import { CheckoutSession } from '../../store/models/checkout-session';
 import { Customer } from '../../store/models/customer';
 import { Invoice } from '../../store/models/invoice';
@@ -110,7 +111,7 @@ export async function ensurePaymentIntent(checkoutSessionId: string, userDid?: s
     throw new Error(`Payment method ${paymentMethod.type} should not be here`);
   }
 
-  checkoutSession.line_items = await Price.expand(checkoutSession.line_items, false);
+  checkoutSession.line_items = await Price.expand(checkoutSession.line_items);
 
   return {
     checkoutSession,
@@ -192,7 +193,7 @@ export async function ensureSetupIntent(checkoutSessionId: string, userDid?: str
     throw new Error(`Payment method ${paymentMethod.type} should not be here`);
   }
 
-  checkoutSession.line_items = await Price.expand(checkoutSession.line_items, false);
+  checkoutSession.line_items = await Price.expand(checkoutSession.line_items);
 
   return {
     checkoutSession,
@@ -311,15 +312,16 @@ export async function ensureInvoiceForCheckout({
   const subscriptionItems = subscription
     ? await SubscriptionItem.findAll({ where: { subscription_id: subscription?.id } })
     : [];
-  const lineItems = await Price.expand(checkoutSession.line_items, true);
+  const lineItems = await Price.expand(checkoutSession.line_items, { product: true });
 
   const trailing = !!checkoutSession.subscription_data?.trial_period_days;
   const getLineSetup = (x: TLineItemExpanded) => {
-    if (x.price.type === 'recurring' && trailing) {
+    const price = x.upsell_price || x.price;
+    if (price.type === 'recurring' && trailing) {
       return {
         amount: '0',
         // @ts-ignore
-        description: trailing ? `${x.price.product.name} (trailing)` : x.price.product.name,
+        description: trailing ? `${price.product.name} (trailing)` : price.product.name,
         period: {
           start: subscription?.current_period_start as number,
           end: subscription?.current_period_end as number,
@@ -328,9 +330,9 @@ export async function ensureInvoiceForCheckout({
     }
 
     return {
-      amount: new BN(x.price.unit_amount).mul(new BN(x.quantity)).toString(),
+      amount: new BN(price.unit_amount).mul(new BN(x.quantity)).toString(),
       // @ts-ignore
-      description: x.price.product.name,
+      description: price.product.name,
       period: undefined,
     };
   };
@@ -338,9 +340,10 @@ export async function ensureInvoiceForCheckout({
   const items = await Promise.all(
     lineItems.map((x: TLineItemExpanded) => {
       const setup = getLineSetup(x);
+      const price = x.upsell_price || x.price;
       let { quantity } = x;
-      if (x.price.type === 'recurring') {
-        if (x.price.recurring?.usage_type === 'metered') {
+      if (price.type === 'recurring') {
+        if (price.recurring?.usage_type === 'metered') {
           quantity = 0;
         }
         if (trailing) {

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

@@ -8,6 +8,9 @@ import { invoiceQueue } from '../../jobs/invoice';
 import { subscriptionQueue } from '../../jobs/subscription';
 import type { CallbackArgs } from '../../libs/auth';
 import { wallet } from '../../libs/auth';
+import { getFastCheckoutAmount } from '../../libs/session';
+import { getTxMetadata } from '../../libs/util';
+import type { TLineItemExpanded } from '../../store/models';
 import { ensureInvoiceForCheckout, ensurePaymentIntent, getAuthPrincipalClaim } from './shared';
 
 export default {
@@ -30,16 +33,12 @@ export default {
     }
 
     if (paymentMethod.type === 'arcblock') {
-      if (checkoutSession.amount_total > '0') {
-        const client = paymentMethod.getOcapClient();
-        const result = await client.getAccountTokens({ address: userDid, token: paymentCurrency.contract });
-        const balance = result.tokens[0]?.balance || '0';
-        if (new BN(balance).lt(new BN(checkoutSession.amount_total))) {
-          throw new Error(
-            `Your account ${userDid} does not have enough ${paymentCurrency.symbol} to complete this subscription`
-          );
-        }
-      }
+      const amount = getFastCheckoutAmount(
+        checkoutSession.line_items as TLineItemExpanded[],
+        checkoutSession.mode,
+        paymentCurrency,
+        !!checkoutSession.subscription_data?.trial_period_days
+      );
 
       return {
         signature: {
@@ -51,17 +50,16 @@ export default {
               address: toDelegateAddress(userDid, wallet.address),
               to: wallet.address,
               ops: [{ typeUrl: 'fg:t:transfer_v2', rules: [] }],
-              data: {
-                type: 'json',
-                // @ts-ignore
-                value: {
-                  appId: wallet.address,
-                  subscriptionId: subscription.id,
-                  checkoutSessionId,
-                },
-              },
+              data: getTxMetadata({
+                subscriptionId: subscription.id,
+                checkoutSessionId,
+              }),
             },
           },
+          nonce: checkoutSessionId,
+          requirement: {
+            tokens: [{ address: paymentCurrency.contract as string, value: amount }],
+          },
           chainInfo: {
             host: paymentMethod.settings?.arcblock?.api_host as string,
             id: paymentMethod.settings?.arcblock?.chain_id as string,
@@ -74,7 +72,7 @@ export default {
   },
   onAuth: async ({ userDid, userPk, claims, request, extraParams }: CallbackArgs) => {
     const { checkoutSessionId } = extraParams;
-    const { checkoutSession, customer, paymentMethod, subscription } = await ensurePaymentIntent(
+    const { checkoutSession, customer, paymentMethod, paymentCurrency, subscription } = await ensurePaymentIntent(
       checkoutSessionId,
       userDid
     );
@@ -83,6 +81,17 @@ export default {
       throw new Error('Subscription for checkoutSession not found');
     }
 
+    if (checkoutSession.amount_total > '0') {
+      const client = paymentMethod.getOcapClient();
+      const result = await client.getAccountTokens({ address: userDid, token: paymentCurrency.contract });
+      const balance = result.tokens[0]?.balance || '0';
+      if (new BN(balance).lt(new BN(checkoutSession.amount_total))) {
+        throw new Error(
+          `Your account ${userDid} does not have enough ${paymentCurrency.symbol} to complete this subscription`
+        );
+      }
+    }
+
     if (paymentMethod.type === 'arcblock') {
       await subscription.update({
         payment_settings: {

package/api/src/routes/invoices.ts

@@ -3,6 +3,7 @@ import { Router } from 'express';
 import Joi from 'joi';
 import type { WhereOptions } from 'sequelize';
 
+import { syncStripeInvoice } from '../integrations/stripe/handlers/invoice';
 import { authenticate } from '../libs/security';
 import { expandLineItems } from '../libs/session';
 import { Customer } from '../store/models/customer';
@@ -102,7 +103,6 @@ router.get('/', authMine, async (req, res) => {
   }
 });
 
-// FIXME: exclude some sensitive fields from PaymentMethod
 router.get('/:id', authPortal, async (req, res) => {
   try {
     const doc = await Invoice.findOne({
@@ -118,6 +118,10 @@ router.get('/:id', authPortal, async (req, res) => {
     });
 
     if (doc) {
+      if (doc.status !== 'paid' && doc.metadata?.stripe_id) {
+        await syncStripeInvoice(doc);
+      }
+
       const json = doc.toJSON();
       const products = (await Product.findAll()).map((x) => x.toJSON());
       const prices = (await Price.findAll()).map((x) => x.toJSON());

package/api/src/routes/payment-intents.ts

@@ -3,6 +3,7 @@ import { Router } from 'express';
 import Joi from 'joi';
 import type { WhereOptions } from 'sequelize';
 
+import { syncStripPayment } from '../integrations/stripe/handlers/payment-intent';
 import { authenticate } from '../libs/security';
 import { CheckoutSession } from '../store/models/checkout-session';
 import { Customer } from '../store/models/customer';
@@ -98,7 +99,6 @@ router.get('/', authMine, async (req, res) => {
   }
 });
 
-// FIXME: exclude some sensitive fields from PaymentMethod
 router.get('/:id', authPortal, async (req, res) => {
   try {
     const doc = await PaymentIntent.findOne({
@@ -115,6 +115,10 @@ router.get('/:id', authPortal, async (req, res) => {
     let subscription;
 
     if (doc) {
+      if (doc.status !== 'succeeded' && doc.metadata?.stripe_id) {
+        await syncStripPayment(doc);
+      }
+
       checkoutSession = await CheckoutSession.findOne({ where: { payment_intent_id: doc.id } });
       invoice = await Invoice.findByPk(doc.invoice_id);
       if (invoice && invoice.subscription_id) {