payment-kit 1.22.14 → 1.22.16

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

@@ -52,7 +52,7 @@ export default {
       const claims: { [key: string]: object } = {
         prepareTx: {
           type: 'TransferV3Tx',
-          description: `Pay all past due invoices for subscription ${subscription?.description}`,
+          description: `Pay all past due invoices ${subscriptionId ? `for subscription ${subscription?.description}` : ''}`,
           partialTx: { from: userDid, pk: userPk, itx },
           requirement: { tokens },
           chainInfo: {

package/api/src/routes/customers.ts

@@ -4,7 +4,7 @@ import Joi from 'joi';
 import pick from 'lodash/pick';
 import isEmail from 'validator/es/lib/isEmail';
 
-import { Op } from 'sequelize';
+import { Op, type WhereOptions } from 'sequelize';
 import { BN } from '@ocap/util';
 import { getStakeSummaryByDid, getTokenSummaryByDid, getTokenByAddress } from '../integrations/arcblock/stake';
 import { createListParamSchema, getOrder, getWhereFromKvQuery, getWhereFromQuery, MetadataSchema } from '../libs/api';
@@ -224,12 +224,16 @@ router.get('/:id/overdue/invoices', authPortal, async (req, res) => {
     if (!doc) {
       return res.status(404).json({ error: 'Customer not found' });
     }
+    const where: WhereOptions<Invoice> = {
+      customer_id: doc.id,
+      status: ['uncollectible'],
+      amount_remaining: { [Op.gt]: '0' },
+    };
+    if (typeof req.livemode === 'boolean') {
+      where.livemode = !!req.livemode;
+    }
     const { rows: invoices, count } = await Invoice.findAndCountAll({
-      where: {
-        customer_id: doc.id,
-        status: ['uncollectible'],
-        amount_remaining: { [Op.gt]: '0' },
-      },
+      where,
       include: [
         { model: PaymentCurrency, as: 'paymentCurrency' },
         { model: PaymentMethod, as: 'paymentMethod' },

package/api/src/routes/tool.ts

@@ -2,9 +2,12 @@ import dayjs from 'dayjs';
 import { Router } from 'express';
 import Joi from 'joi';
 
+import { getUrl } from '@blocklet/sdk';
+import { joinURL } from 'ufo';
 import { authenticate } from '../libs/security';
 import { formatToShortUrl } from '../libs/url';
 import { CheckoutSession } from '../store/models';
+import logger from '../libs/logger';
 
 const loginAuth = authenticate<CheckoutSession>({ component: false, ensureLogin: true, mine: true });
 
@@ -14,7 +17,7 @@ const shortUrlSchema = Joi.object({
   url: Joi.string().uri().required(),
   timeoutMin: Joi.number().optional(),
   maxVisits: Joi.number().optional(),
-});
+}).unknown(true);
 
 router.get('/short-url', loginAuth, async (req, res) => {
   const { error } = shortUrlSchema.validate(req.query);
@@ -32,4 +35,31 @@ router.get('/short-url', loginAuth, async (req, res) => {
   return res.json({ url: shortUrl });
 });
 
+router.get('/short-connect-url', async (req, res) => {
+  const { error } = shortUrlSchema.validate(req.query);
+  if (error) {
+    return res.status(400).json({ error: 'Invalid parameters', message: error.message });
+  }
+
+  const { url, timeoutMin = 60, maxVisits = 5 } = req.query;
+  const serverUrl = getUrl();
+
+  const allowedEndpoint = joinURL(new URL(serverUrl).origin, '.well-known/service/gen-simple-access-key');
+
+  if (!url?.toString().startsWith(allowedEndpoint)) {
+    logger.error('Client try to generate short connect url from invalid service', { url });
+    return res
+      .status(400)
+      .json({ error: 'Just support generate short connect url from gen-simple-access-key service' });
+  }
+
+  const timeoutMinNumber = Number(timeoutMin);
+  const validUntil = dayjs()
+    .add(timeoutMinNumber > 60 ? 60 : timeoutMinNumber, 'minutes')
+    .format('YYYY-MM-DDTHH:mm:ss+00:00');
+
+  const shortUrl = await formatToShortUrl({ url: url as string, validUntil, maxVisits: Number(maxVisits) });
+  return res.json({ url: shortUrl });
+});
+
 export default router;

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.22.14",
+  "version": "1.22.16",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -45,34 +45,34 @@
   },
   "dependencies": {
     "@abtnode/cron": "^1.17.2",
-    "@arcblock/did": "^1.27.6",
-    "@arcblock/did-connect-react": "^3.2.6",
+    "@arcblock/did": "^1.27.11",
+    "@arcblock/did-connect-react": "^3.2.7",
     "@arcblock/did-connect-storage-nedb": "^1.8.0",
-    "@arcblock/did-util": "^1.27.6",
-    "@arcblock/jwt": "^1.27.6",
-    "@arcblock/react-hooks": "^3.2.6",
-    "@arcblock/ux": "^3.2.6",
-    "@arcblock/validator": "^1.27.6",
-    "@blocklet/did-space-js": "^1.2.3",
-    "@blocklet/error": "^0.3.2",
+    "@arcblock/did-util": "^1.27.11",
+    "@arcblock/jwt": "^1.27.11",
+    "@arcblock/react-hooks": "^3.2.7",
+    "@arcblock/ux": "^3.2.7",
+    "@arcblock/validator": "^1.27.11",
+    "@blocklet/did-space-js": "^1.2.4",
+    "@blocklet/error": "^0.3.3",
     "@blocklet/js-sdk": "^1.17.2",
     "@blocklet/logger": "^1.17.2",
-    "@blocklet/payment-broker-client": "1.22.14",
-    "@blocklet/payment-react": "1.22.14",
-    "@blocklet/payment-vendor": "1.22.14",
+    "@blocklet/payment-broker-client": "1.22.16",
+    "@blocklet/payment-react": "1.22.16",
+    "@blocklet/payment-vendor": "1.22.16",
     "@blocklet/sdk": "^1.17.2",
-    "@blocklet/ui-react": "^3.2.6",
+    "@blocklet/ui-react": "^3.2.7",
     "@blocklet/uploader": "^0.3.11",
     "@blocklet/xss": "^0.3.9",
     "@mui/icons-material": "^7.1.2",
     "@mui/lab": "7.0.0-beta.14",
     "@mui/material": "^7.1.2",
     "@mui/system": "^7.1.1",
-    "@ocap/asset": "^1.27.6",
-    "@ocap/client": "^1.27.6",
-    "@ocap/mcrypto": "^1.27.6",
-    "@ocap/util": "^1.27.6",
-    "@ocap/wallet": "^1.27.6",
+    "@ocap/asset": "^1.27.11",
+    "@ocap/client": "^1.27.11",
+    "@ocap/mcrypto": "^1.27.11",
+    "@ocap/util": "^1.27.11",
+    "@ocap/wallet": "^1.27.11",
     "@stripe/react-stripe-js": "^2.9.0",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.5",
@@ -129,7 +129,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.17.2",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.22.14",
+    "@blocklet/payment-types": "1.22.16",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -160,7 +160,7 @@
     "vite": "^7.0.0",
     "vite-node": "^3.2.4",
     "vite-plugin-babel-import": "^2.0.5",
-    "vite-plugin-blocklet": "^0.12.2",
+    "vite-plugin-blocklet": "^0.12.3",
     "vite-plugin-node-polyfills": "^0.23.0",
     "vite-plugin-svgr": "^4.3.0",
     "vite-tsconfig-paths": "^5.1.4",
@@ -176,5 +176,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "fc9395e0eaf4472b42192835fb4933da469939c6"
+  "gitHead": "68ff7bcdc9f185a8d885d9af189d2e2c1cc5fbf6"
 }

package/src/pages/customer/index.tsx

@@ -592,7 +592,10 @@ export default function CustomerHome() {
           }}
           dialogProps={{
             open: showOverduePayment,
-            onClose: () => setShowOverduePayment(false),
+            onClose: () => {
+              setShowOverduePayment(false);
+              runAsync();
+            },
             title: t('customer.pastDue.title'),
           }}
         />