payment-kit 1.21.15 → 1.21.17

package/api/src/routes/subscriptions.ts

@@ -238,7 +238,7 @@ router.get('/search', auth, async (req, res) => {
 
 router.get('/:id', authPortal, async (req, res) => {
   try {
-    const doc = await Subscription.findOne({
+    const doc = (await Subscription.findOne({
       where: { id: req.params.id },
       include: [
         { model: PaymentCurrency, as: 'paymentCurrency' },
@@ -246,10 +246,15 @@ router.get('/:id', authPortal, async (req, res) => {
         { model: SubscriptionItem, as: 'items' },
         { model: Customer, as: 'customer' },
       ],
-    });
+    })) as Subscription & {
+      paymentMethod: PaymentMethod;
+      paymentCurrency: PaymentCurrency;
+      items: SubscriptionItem[];
+      customer: Customer;
+    };
 
     if (doc) {
-      const json = doc.toJSON();
+      const json: any = doc.toJSON();
       const isConsumesCredit = await doc.isConsumesCredit();
       const serviceType = isConsumesCredit ? 'credit' : 'standard';
       const products = (await Product.findAll()).map((x) => x.toJSON());
@@ -270,9 +275,70 @@ router.get('/:id', authPortal, async (req, res) => {
         logger.error('Failed to fetch subscription discount stats', { error, subscriptionId: json.id });
       }
 
+      // Get payment method details
+      let paymentMethodDetails = null;
+      try {
+        const paymentMethod = await PaymentMethod.findByPk(doc.default_payment_method_id);
+        if (paymentMethod?.type === 'stripe' && json.payment_details?.stripe?.subscription_id) {
+          const client = paymentMethod.getStripeClient();
+          const stripeSubscription = await client.subscriptions.retrieve(json.payment_details.stripe.subscription_id, {
+            expand: ['default_payment_method'],
+          });
+
+          if (stripeSubscription.default_payment_method) {
+            const paymentMethodId =
+              typeof stripeSubscription.default_payment_method === 'string'
+                ? stripeSubscription.default_payment_method
+                : stripeSubscription.default_payment_method.id;
+
+            const paymentMethodData = await client.paymentMethods.retrieve(paymentMethodId);
+
+            paymentMethodDetails = {
+              id: paymentMethodData.id,
+              type: paymentMethodData.type,
+              billing_details: paymentMethodData.billing_details,
+            } as any;
+
+            if (paymentMethodData.card) {
+              paymentMethodDetails.card = {
+                brand: paymentMethodData.card.brand,
+                last4: paymentMethodData.card.last4,
+                exp_month: paymentMethodData.card.exp_month,
+                exp_year: paymentMethodData.card.exp_year,
+              };
+            }
+
+            if (paymentMethodData.link) {
+              paymentMethodDetails.link = {
+                email: paymentMethodData.link.email,
+              };
+            }
+
+            if (paymentMethodData.us_bank_account) {
+              paymentMethodDetails.us_bank_account = {
+                account_type: paymentMethodData.us_bank_account.account_type,
+                bank_name: paymentMethodData.us_bank_account.bank_name,
+                last4: paymentMethodData.us_bank_account.last4,
+              };
+            }
+          }
+        } else if (doc.paymentMethod) {
+          const payer = getSubscriptionPaymentAddress(doc, doc.paymentMethod.type);
+          if (payer) {
+            paymentMethodDetails = {
+              type: doc.paymentMethod.type,
+              payer,
+            };
+          }
+        }
+      } catch (error) {
+        logger.error('Failed to fetch payment method details', { error, subscriptionId: json.id });
+      }
+
       res.json({
         ...json,
         discountStats,
+        paymentMethodDetails,
       });
     } else {
       res.status(404).json(null);
@@ -2283,4 +2349,65 @@ router.get('/:id/change-payment/migrate-invoice', auth, async (req, res) => {
     return res.status(400).json({ error: error.message });
   }
 });
+
+router.post('/:id/update-stripe-payment-method', authPortal, async (req, res) => {
+  try {
+    const subscription = await Subscription.findByPk(req.params.id);
+    if (!subscription) {
+      return res.status(404).json({ error: 'Subscription not found' });
+    }
+
+    if (!['active', 'trialing', 'past_due'].includes(subscription.status)) {
+      return res.status(400).json({ error: 'Subscription is not active' });
+    }
+
+    const paymentMethod = await PaymentMethod.findByPk(subscription.default_payment_method_id);
+    if (!paymentMethod || paymentMethod.type !== 'stripe') {
+      return res.status(400).json({ error: 'Subscription is not using Stripe payment method' });
+    }
+
+    const stripeSubscriptionId = subscription.payment_details?.stripe?.subscription_id;
+    if (!stripeSubscriptionId) {
+      return res.status(400).json({ error: 'Stripe subscription not found' });
+    }
+
+    const customer = await Customer.findByPk(subscription.customer_id);
+    if (!customer) {
+      return res.status(404).json({ error: 'Customer not found' });
+    }
+
+    await ensureStripeCustomer(customer, paymentMethod);
+
+    const client = paymentMethod.getStripeClient();
+    const settings = PaymentMethod.decryptSettings(paymentMethod.settings);
+
+    const setupIntent = await client.setupIntents.create({
+      customer: subscription.payment_details?.stripe?.customer_id,
+      payment_method_types: ['card'],
+      usage: 'off_session',
+      metadata: {
+        subscription_id: subscription.id,
+        action: 'update_payment_method',
+      },
+    });
+
+    logger.info('Setup intent created for updating stripe payment method', {
+      subscription: subscription.id,
+      setupIntent: setupIntent.id,
+    });
+
+    return res.json({
+      client_secret: setupIntent.client_secret,
+      publishable_key: settings.stripe?.publishable_key,
+      setup_intent_id: setupIntent.id,
+    });
+  } catch (err) {
+    logger.error('Failed to create setup intent for updating payment method', {
+      error: err,
+      subscriptionId: req.params.id,
+    });
+    return res.status(400).json({ error: err.message });
+  }
+});
+
 export default router;

package/api/src/routes/vendor.ts

@@ -5,6 +5,7 @@ import Joi from 'joi';
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { gte } from 'semver';
+import { Op } from 'sequelize';
 import { MetadataSchema } from '../libs/api';
 import { wallet } from '../libs/auth';
 import dayjs from '../libs/dayjs';
@@ -31,19 +32,15 @@ const createVendorSchema = Joi.object({
   name: Joi.string().max(255).required(),
   description: Joi.string().max(1000).allow('').optional(),
   app_url: Joi.string().uri().max(512).required(),
-  app_pid: Joi.string().max(255).allow('').optional(),
-  app_logo: Joi.string().max(512).allow('').optional(),
   status: Joi.string().valid('active', 'inactive').default('active'),
   metadata: MetadataSchema,
-}).unknown(false);
+}).unknown(true);
 
 const updateVendorSchema = Joi.object({
   vendor_type: Joi.string().valid('launcher', 'didnames').optional(),
   name: Joi.string().max(255).optional(),
   description: Joi.string().max(1000).allow('').optional(),
   app_url: Joi.string().uri().max(512).optional(),
-  app_pid: Joi.string().max(255).allow('').optional(),
-  app_logo: Joi.string().max(512).allow('').optional(),
   status: Joi.string().valid('active', 'inactive').optional(),
   metadata: MetadataSchema,
 }).unknown(true);
@@ -56,6 +53,10 @@ const sessionIdParamSchema = Joi.object({
   sessionId: Joi.string().max(100).required(),
 });
 
+const sessionIdsParamSchema = Joi.object({
+  sessionIds: Joi.array().items(Joi.string().max(100)).required(),
+});
+
 const subscriptionIdParamSchema = Joi.object({
   subscriptionId: Joi.string().max(100).required(),
 });
@@ -134,6 +135,51 @@ async function getVendorInfo(req: any, res: any) {
   }
 }
 
+async function prepareVendorData(appUrlInput: string, vendorType: 'launcher' | 'didnames', metadata: any = {}) {
+  let appUrl = '';
+  let blockletJson = null;
+  try {
+    appUrl = new URL(appUrlInput).origin;
+    blockletJson = await getBlockletJson(appUrl);
+  } catch (error) {
+    logger.error('Failed to get blocklet json', {
+      appUrlInput,
+      error,
+    });
+    return { error: `Invalid app URL: ${appUrlInput}, get blocklet json failed` as const };
+  }
+
+  if (!blockletJson?.appId || !blockletJson?.appPk) {
+    return { error: `Invalid app URL: ${appUrl}, the appId or appPk is required in the target app` as const };
+  }
+
+  const vendorDid = VENDOR_DID[vendorType];
+  const component = blockletJson?.componentMountPoints?.find((item: any) => item.did === vendorDid);
+
+  if (!component) {
+    return { error: `Invalid app URL: ${appUrl}, the ${vendorType} did is not found in the target server` as const };
+  }
+
+  const mountPoint = component.mountPoint || '/';
+  return {
+    vendor_did: vendorDid,
+    app_url: appUrl,
+    // Both appPid and appId can be used here for transfer purposes, with did being recommended.
+    // Keeping appPid for now due to extensive changes required
+    app_pid: blockletJson.appId,
+    app_logo: blockletJson.appLogo,
+    metadata: {
+      ...metadata,
+      mountPoint,
+    },
+    extends: {
+      mountPoint,
+      appId: blockletJson.appId,
+      appPk: blockletJson.appPk,
+    },
+  };
+}
+
 async function createVendor(req: any, res: any) {
   try {
     const { error, value } = createVendorSchema.validate(req.body);
@@ -144,26 +190,9 @@ async function createVendor(req: any, res: any) {
       });
     }
 
-    const {
-      vendor_key: vendorKey,
-      vendor_type: type,
-      name,
-      description,
-      metadata,
-      app_pid: appPid,
-      app_logo: appLogo,
-      status,
-    } = value;
-
-    let appUrl = '';
-    try {
-      appUrl = new URL(value.app_url).origin;
-    } catch {
-      return res.status(400).json({ error: 'Invalid app URL' });
-    }
+    const { vendor_key: vendorKey, vendor_type: type, name, description, metadata, status } = value;
 
     const vendorType = (type || 'launcher') as 'launcher' | 'didnames';
-    const vendorDid = VENDOR_DID[vendorType];
 
     const existingVendor = await ProductVendor.findOne({
       where: { vendor_key: vendorKey },
@@ -172,30 +201,18 @@ async function createVendor(req: any, res: any) {
       return res.status(400).json({ error: 'Vendor key already exists' });
     }
 
-    const blockletJson = await getBlockletJson(appUrl);
-
-    const mountPoint =
-      blockletJson?.componentMountPoints?.find((item: any) => item.did === vendorDid)?.mountPoint || '/';
+    const preparedData = await prepareVendorData(value.app_url, vendorType, metadata);
+    if ('error' in preparedData) {
+      return res.status(400).json({ error: preparedData.error });
+    }
 
     const vendor = await ProductVendor.create({
+      ...preparedData,
       vendor_key: vendorKey,
       vendor_type: vendorType,
       name,
       description,
-      app_url: appUrl,
-      vendor_did: vendorDid,
       status: status || 'active',
-      app_pid: appPid,
-      app_logo: appLogo,
-      metadata: {
-        ...metadata,
-        mountPoint,
-      },
-      extends: {
-        mountPoint,
-        appId: blockletJson?.appId,
-        appPk: blockletJson?.appPk,
-      },
       created_by: req.user?.did || 'admin',
     });
 
@@ -224,50 +241,30 @@ async function updateVendor(req: any, res: any) {
       });
     }
 
-    const { vendor_type: type, name, description, status, metadata, app_pid: appPid, app_logo: appLogo } = value;
-
-    let appUrl = '';
-    try {
-      appUrl = new URL(value.app_url).origin;
-    } catch {
-      return res.status(400).json({ error: 'Invalid app URL' });
-    }
-
-    const vendorType = (type || 'launcher') as 'launcher' | 'didnames';
-    const vendorDid = VENDOR_DID[vendorType];
-
-    const blockletJson = await getBlockletJson(appUrl);
-
-    const mountPoint =
-      blockletJson?.componentMountPoints?.find((item: any) => item.did === vendorDid)?.mountPoint || '/';
+    const { vendor_type: type, vendor_key: vendorKey, name, description, status, metadata } = value;
 
-    if (req.body.vendorKey && req.body.vendorKey !== vendor.vendor_key) {
+    if (vendorKey && vendorKey !== vendor.vendor_key) {
       const existingVendor = await ProductVendor.findOne({
-        where: { vendor_key: req.body.vendorKey },
+        where: { vendor_key: vendorKey },
       });
       if (existingVendor) {
         return res.status(400).json({ error: 'Vendor key already exists' });
       }
     }
+
+    const vendorType = (type || 'launcher') as 'launcher' | 'didnames';
+    const preparedData = await prepareVendorData(value.app_url, vendorType, metadata);
+    if ('error' in preparedData) {
+      return res.status(400).json({ error: preparedData.error });
+    }
+
     const updates = {
+      ...preparedData,
       vendor_type: vendorType,
+      vendor_key: vendorKey,
       name,
       description,
-      app_url: appUrl,
-      vendor_did: vendorDid,
       status,
-      metadata: {
-        ...metadata,
-        mountPoint,
-      },
-      app_pid: appPid,
-      app_logo: appLogo,
-      vendor_key: req.body.vendor_key,
-      extends: {
-        mountPoint,
-        appId: blockletJson?.appId,
-        appPk: blockletJson?.appPk,
-      },
     };
 
     await vendor.update(Object.fromEntries(Object.entries(updates).filter(([, v]) => v !== undefined)));
@@ -561,6 +558,36 @@ async function redirectToVendor(req: any, res: any) {
   }
 }
 
+async function getCancelledSessions(req: any, res: any) {
+  const { error } = sessionIdsParamSchema.validate(req.body);
+  if (error) {
+    return res.status(400).json({ error: error.message });
+  }
+
+  const { sessionIds = [] } = req.body;
+
+  const allCheckoutSessions = await CheckoutSession.findAll({
+    where: { id: { [Op.in]: sessionIds } },
+    attributes: ['id', 'subscription_id', 'fulfillment_status', 'vendor_info'],
+  });
+
+  const subscriptionIds = allCheckoutSessions.map((item) => item.subscription_id!).filter((item) => !!item);
+
+  const cancelledSubscriptions = await Subscription.findAll({
+    where: {
+      id: { [Op.in]: subscriptionIds },
+      status: 'canceled',
+    },
+    attributes: ['id'],
+  });
+
+  const cancelledSubIds = cancelledSubscriptions.map((item) => item.id);
+  const cancelledSessions = allCheckoutSessions.filter(
+    (item) => item.subscription_id && cancelledSubIds.includes(item.subscription_id)
+  );
+  return res.json({ cancelledSessions });
+}
+
 async function getVendorSubscription(req: any, res: any) {
   const { sessionId } = req.params;
 
@@ -636,6 +663,7 @@ router.get('/order/:sessionId/detail', loginAuth, validateParams(sessionIdParamS
 
 // Those for Vendor Call
 router.get('/connectTest', ensureVendorAuth, getVendorConnectTest);
+router.post('/subscription/cancelled', ensureVendorAuth, getCancelledSessions);
 router.get('/subscription/:sessionId/redirect', handleSubscriptionRedirect);
 router.get('/subscription/:sessionId', ensureVendorAuth, getVendorSubscription);
 

package/api/src/store/models/checkout-session.ts

@@ -239,6 +239,7 @@ export class CheckoutSession extends Model<InferAttributes<CheckoutSession>, Inf
 
     attempts?: number;
     lastAttemptAt?: string;
+    returnRetry?: number;
     completedAt?: string;
     commissionAmount?: 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.21.15
+version: 1.21.17
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.21.15",
+  "version": "1.21.17",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -56,9 +56,9 @@
     "@blocklet/error": "^0.2.5",
     "@blocklet/js-sdk": "^1.16.53-beta-20251011-054719-4ed2f6b7",
     "@blocklet/logger": "^1.16.53-beta-20251011-054719-4ed2f6b7",
-    "@blocklet/payment-broker-client": "1.21.15",
-    "@blocklet/payment-react": "1.21.15",
-    "@blocklet/payment-vendor": "1.21.15",
+    "@blocklet/payment-broker-client": "1.21.17",
+    "@blocklet/payment-react": "1.21.17",
+    "@blocklet/payment-vendor": "1.21.17",
     "@blocklet/sdk": "^1.16.53-beta-20251011-054719-4ed2f6b7",
     "@blocklet/ui-react": "^3.1.46",
     "@blocklet/uploader": "^0.2.15",
@@ -128,7 +128,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.53-beta-20251011-054719-4ed2f6b7",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.21.15",
+    "@blocklet/payment-types": "1.21.17",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -175,5 +175,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "fd48f9233f19514b537e30b013e09a7d9f7a9f48"
+  "gitHead": "a823bc05e706681ee70451437b0460aba909c253"
 }

package/src/components/invoice-pdf/template.tsx

@@ -65,6 +65,16 @@ export function InvoiceTemplate({ data, t }: InvoicePDFProps) {
               <span style={composeStyles('gray')}>{formatTime(data.period_end * 1000)}</span>
             </div>
           </div>
+          <div style={composeStyles('flex mb-5')}>
+            <div style={composeStyles('w-40')}>
+              <span style={composeStyles('bold')}>{t('admin.paymentCurrency.name')}</span>
+            </div>
+            <div style={composeStyles('w-60')}>
+              <span style={composeStyles('gray')}>
+                {data.paymentCurrency.symbol} ({data.paymentMethod.name})
+              </span>
+            </div>
+          </div>
         </div>
       </div>
 
@@ -137,6 +147,26 @@ export function InvoiceTemplate({ data, t }: InvoicePDFProps) {
         );
       })}
 
+      {detail.length === 0 && (
+        <div style={composeStyles('row flex')}>
+          <div style={composeStyles('w-38 p-4-8 pb-15')}>
+            <span style={composeStyles('gray')}>-</span>
+          </div>
+          <div style={composeStyles('w-15 p-4-8 pb-15')}>
+            <span style={composeStyles('gray right')}>-</span>
+          </div>
+          <div style={composeStyles('w-15 p-4-8 pb-15')}>
+            <span style={composeStyles('gray right')}>-</span>
+          </div>
+          <div style={composeStyles('w-15 p-4-8 pb-15')}>
+            <span style={composeStyles('gray right')}>-</span>
+          </div>
+          <div style={composeStyles('w-17 p-4-8 pb-15')}>
+            <span style={composeStyles('gray right')}>-</span>
+          </div>
+        </div>
+      )}
+
       {/* Summary */}
       <div
         style={{