payment-kit 1.13.50 → 1.13.52

package/api/src/integrations/blockchain/nft.ts

@@ -1,10 +1,11 @@
+import { isEthereumDid, isValid } from '@arcblock/did';
 // import pick from 'lodash/pick';
 import { formatFactoryState, preMintFromFactory } from '@ocap/asset';
 import merge from 'lodash/merge';
 
 import { wallet } from '../../libs/auth';
 import logger from '../../libs/logger';
-import { CheckoutSession, PaymentCurrency, PaymentIntent, PaymentMethod, Subscription } from '../../store/models';
+import { CheckoutSession, PaymentIntent, PaymentMethod, Subscription } from '../../store/models';
 import { sendNftNotification } from '../blocklet/notification';
 
 export async function mintNftForCheckoutSession(id: string) {
@@ -34,13 +35,23 @@ export async function mintNftForCheckoutSession(id: string) {
     return;
   }
 
+  const { factory, inputs } = checkoutSession.nft_mint_settings as any;
+  if (isValid(factory) === false) {
+    logger.warn('checkoutSession nft mint settings invalid', { id, factory });
+    return;
+  }
+
+  // TODO: we only support minting from arcblock chain now
+  if (isEthereumDid(factory)) {
+    logger.warn('nft mint not supported for factory', { id, factory });
+    return;
+  }
+
   // TODO: we may need retry here when the chain is temporarily inaccessible
-  const currency = await PaymentCurrency.findByPk(checkoutSession.currency_id);
-  const method = await PaymentMethod.findByPk(currency?.payment_method_id);
-  if (method?.type === 'arcblock') {
+  const method = await PaymentMethod.findOne({ where: { livemode: checkoutSession.livemode, type: 'arcblock' } });
+  if (method) {
     const client = method.getOcapClient();
     const nftOwner = checkoutSession.customer_did;
-    const { factory, inputs } = checkoutSession.nft_mint_settings as any;
 
     const [{ state: factoryState }, { state: appState }] = await Promise.all([
       client.getFactoryState({ address: factory }),
@@ -118,9 +129,5 @@ export async function mintNftForCheckoutSession(id: string) {
       factoryState.name
     );
     logger.info('nft sent for checkoutSession', { id, nftOwner });
-
-    return;
   }
-
-  logger.warn('nft mint not supported for payment method', { id, type: method?.type });
 }

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

@@ -38,8 +38,6 @@ 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),
@@ -50,9 +48,7 @@ export async function syncStripPayment(paymentIntent: PaymentIntent) {
     });
     logger.info('stripe payment intent synced', { locale: paymentIntent.id, remote: stripeIntent.id });
 
-    if (justSucceed) {
-      await handlePaymentSucceed(paymentIntent);
-    }
+    await handlePaymentSucceed(paymentIntent);
   }
 }
 
@@ -107,6 +103,9 @@ export async function handleStripePaymentCreated(event: TEventExpanded, client:
     }
 
     logger.info('stripe payment intent mirrored', { locale: paymentIntent.id, remote: stripeIntent.id });
+    if (stripeIntent.status === 'succeeded') {
+      await handlePaymentSucceed(paymentIntent);
+    }
   }
 }
 

package/api/src/jobs/payment.ts

@@ -37,17 +37,19 @@ export const handlePaymentSucceed = async (paymentIntent: PaymentIntent) => {
     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.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() },
+    });
+    logger.info(`Invoice ${invoice.id} updated on payment done: ${paymentIntent.id}`);
+  }
 
   if (invoice.subscription_id) {
     const subscription = await Subscription.findByPk(invoice.subscription_id);
@@ -56,6 +58,7 @@ export const handlePaymentSucceed = async (paymentIntent: PaymentIntent) => {
         await subscription.update({ status: subscription.trail_end ? 'trialing' : 'active' });
         logger.info(`Subscription ${subscription.id} updated on payment done ${invoice.id}`);
       } else {
+        // FIXME: possible error here
         await subscription.update({ status: 'active' });
         logger.info(`Subscription ${subscription.id} moved to active after payment done ${paymentIntent.id}`);
       }

package/api/src/libs/session.ts

@@ -169,7 +169,9 @@ export function getSubscriptionCycleAmount(items: TLineItemExpanded[], currency:
 export function expandLineItems(items: any[], products: Product[], prices: Price[]) {
   items.forEach((item) => {
     item.price = prices.find((x) => x.id === item.price_id);
-    item.price.product = products.find((x) => x.id === item.price.product_id);
+    if (item.price) {
+      item.price.product = products.find((x) => x.id === item.price.product_id);
+    }
   });
 
   return items;

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

@@ -1,13 +1,16 @@
 /* eslint-disable consistent-return */
+import { isValid } from '@arcblock/did';
 import { getUrl } from '@blocklet/sdk/lib/component';
 import userMiddleware from '@blocklet/sdk/lib/middlewares/user';
 import { NextFunction, Request, Response, Router } from 'express';
+import Joi from 'joi';
 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';
 import uniq from 'lodash/uniq';
+import type { WhereOptions } from 'sequelize';
 
 import { checkPassportForPaymentLink } from '../integrations/blocklet/passport';
 import { handleStripePaymentSucceed } from '../integrations/stripe/handlers/payment-intent';
@@ -22,6 +25,7 @@ import { isDelegationSufficientForPayment } from '../libs/payment';
 import { authenticate } from '../libs/security';
 import {
   canUpsell,
+  expandLineItems,
   getCheckoutAmount,
   getCheckoutMode,
   getFastCheckoutAmount,
@@ -957,4 +961,94 @@ router.delete('/:id/cross-sell', user, ensureCheckoutSessionOpen, async (req, re
   }
 });
 
+const schema = Joi.object<{
+  page: number;
+  pageSize: number;
+  status?: string;
+  payment_status?: string;
+  nft_mint_status?: string;
+  customer_id?: string;
+  customer_did?: string;
+  payment_intent_id?: string;
+  subscription_id?: string;
+  livemode?: boolean;
+}>({
+  page: Joi.number().integer().min(1).default(1),
+  pageSize: Joi.number().integer().min(1).max(100).default(20),
+  status: Joi.string().empty(''),
+  payment_status: Joi.string().empty(''),
+  nft_mint_status: Joi.string().empty(''),
+  customer_id: Joi.string().empty(''),
+  customer_did: Joi.string().empty(''),
+  payment_intent_id: Joi.string().empty(''),
+  subscription_id: Joi.string().empty(''),
+  livemode: Joi.boolean().empty(''),
+});
+router.get('/', auth, async (req, res) => {
+  const { page, pageSize, livemode, ...query } = await schema.validateAsync(req.query, {
+    stripUnknown: false,
+    allowUnknown: true,
+  });
+  const where: WhereOptions<CheckoutSession> = {};
+
+  ['status', 'payment_status', 'nft_mint_status'].forEach((key) => {
+    // @ts-ignore
+    if (query[key]) {
+      // @ts-ignore
+      where[key] = query[key].split(',').map((x: string) => x.trim()).filter(Boolean); // prettier-ignore
+    }
+  });
+  if (query.customer_id) {
+    where.customer_id = query.customer_id;
+  }
+  if (query.payment_intent_id) {
+    where.payment_intent_id = query.payment_intent_id;
+  }
+  if (query.subscription_id) {
+    where.subscription_id = query.subscription_id;
+  }
+  if (query.customer_did && isValid(query.customer_did)) {
+    const customer = await Customer.findOne({ where: { did: query.customer_did } });
+    if (customer) {
+      where.customer_id = customer.id;
+    } else {
+      res.json({ count: 0, list: [] });
+      return;
+    }
+  }
+  if (typeof livemode === 'boolean') {
+    where.livemode = livemode;
+  }
+
+  Object.keys(query)
+    .filter((x) => x.startsWith('metadata.'))
+    .forEach((key: string) => {
+      // @ts-ignore
+      where[key] = query[key];
+    });
+
+  try {
+    const { rows: list, count } = await CheckoutSession.findAndCountAll({
+      where,
+      order: [['created_at', 'DESC']],
+      offset: (page - 1) * pageSize,
+      limit: pageSize,
+      include: [],
+    });
+
+    const condition = { where: { livemode: !!req.livemode } };
+    const products = (await Product.findAll(condition)).map((x) => x.toJSON());
+    const prices = (await Price.findAll(condition)).map((x) => x.toJSON());
+    const docs = list.map((x) => x.toJSON());
+
+    // @ts-ignore
+    docs.forEach((x) => expandLineItems(x.line_items, products, prices));
+
+    res.json({ count, list: docs });
+  } catch (err) {
+    console.error(err);
+    res.json({ count: 0, list: [] });
+  }
+});
+
 export default router;

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

@@ -118,7 +118,8 @@ router.get('/:id', authPortal, async (req, res) => {
     let subscription;
 
     if (doc) {
-      if (doc.status !== 'succeeded' && doc.metadata?.stripe_id) {
+      const shouldSync = doc.status !== 'succeeded' || req.query.sync === '1';
+      if (doc.metadata?.stripe_id && shouldSync) {
         await syncStripPayment(doc);
       }
 

package/api/src/store/models/types.ts

@@ -272,7 +272,7 @@ export type PaymentDetails = {
 export type NftMintSettings = {
   enabled: boolean;
   behavior?: LiteralUnion<'per_customer' | 'per_checkout_session', string>;
-  factory?: string;
+  factory?: string; // the factory address determines which chain to mint on
   inputs?: Record<string, string>;
 };
 

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.50
+version: 1.13.52
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.50",
+  "version": "1.13.52",
   "scripts": {
     "dev": "blocklet dev",
     "eject": "vite eject",
@@ -42,14 +42,14 @@
   "dependencies": {
     "@arcblock/did": "^1.18.95",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.8.7",
+    "@arcblock/did-connect": "^2.8.8",
     "@arcblock/did-util": "^1.18.95",
     "@arcblock/jwt": "^1.18.95",
-    "@arcblock/ux": "^2.8.7",
+    "@arcblock/ux": "^2.8.8",
     "@blocklet/logger": "1.16.17",
     "@blocklet/sdk": "1.16.17",
-    "@blocklet/ui-react": "^2.8.7",
-    "@blocklet/uploader": "^0.0.33",
+    "@blocklet/ui-react": "^2.8.8",
+    "@blocklet/uploader": "^0.0.34",
     "@mui/icons-material": "^5.14.16",
     "@mui/lab": "^5.0.0-alpha.151",
     "@mui/material": "^5.14.16",
@@ -104,7 +104,7 @@
     "@abtnode/types": "1.16.17",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.50",
+    "@did-pay/types": "1.13.52",
     "@types/cookie-parser": "^1.4.5",
     "@types/cors": "^2.8.15",
     "@types/dotenv-flow": "^3.3.2",
@@ -141,5 +141,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "7bdfa2019c557823145e8d262c887b9066c90d04"
+  "gitHead": "f51b870fb8b6d9d37641055d389550b16aded800"
 }