payment-kit 1.13.207 → 1.13.209

package/api/src/libs/api.ts

@@ -1,3 +1,4 @@
+import Joi from 'joi';
 import { Op } from 'sequelize';
 import SqlWhereParser from 'sql-where-parser';
 
@@ -101,3 +102,37 @@ export const getWhereFromKvQuery = (query?: string) => {
   }
   return out;
 };
+
+export function createListParamSchema<T>(schema: any) {
+  return Joi.object<T & { page: number; pageSize: number; livemode?: boolean; q?: string; o?: string }>({
+    // prettier-ignore
+    page: Joi.number()
+      .integer()
+      .default(1)
+      .custom((value) => {
+        if (value < 1) {
+          return 1;
+        }
+        return value;
+      }, 'page should be valid'),
+
+    pageSize: Joi.number()
+      .integer()
+      .default(20)
+      .custom((value) => {
+        if (value > 100) {
+          return 100;
+        }
+        if (value < 1) {
+          return 1;
+        }
+        return value;
+      }, 'pageSize should be valid'),
+
+    livemode: Joi.boolean().empty(''),
+    q: Joi.string().empty(''), // query
+    o: Joi.string().empty(''), // order
+
+    ...schema,
+  });
+}

package/api/src/routes/customers.ts

@@ -4,7 +4,7 @@ import Joi from 'joi';
 import pick from 'lodash/pick';
 
 import { getStakeSummaryByDid, getTokenSummaryByDid } from '../integrations/blockchain/stake';
-import { getWhereFromKvQuery, getWhereFromQuery } from '../libs/api';
+import { createListParamSchema, getWhereFromKvQuery, getWhereFromQuery } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { formatMetadata } from '../libs/util';
 import { Customer } from '../store/models/customer';
@@ -21,21 +21,7 @@ const authPortal = authenticate<Customer>({
   },
 });
 
-const schema = Joi.object<{
-  page: number;
-  pageSize: number;
-  did?: string;
-  livemode?: boolean;
-  q?: string;
-  o?: string;
-}>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
-  did: Joi.string().empty(''),
-  livemode: Joi.boolean().empty(''),
-  q: Joi.string().empty(''), // query
-  o: Joi.string().empty(''), // order
-});
+const schema = createListParamSchema<{ did?: string }>({ did: Joi.string().empty('') });
 router.get('/', auth, async (req, res) => {
   const { page, pageSize, ...query } = await schema.validateAsync(req.query, { stripUnknown: true });
   const where = getWhereFromKvQuery(query.q);
@@ -56,28 +42,18 @@ router.get('/', auth, async (req, res) => {
       include: [],
     });
 
-    res.json({ count, list });
+    res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
     console.error(err);
-    res.json({ count: 0, list: [] });
+    res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
 
 // search customers
-const searchSchema = Joi.object<{
-  page: number;
-  pageSize: number;
+const searchSchema = createListParamSchema<{
   query: string;
-  livemode?: boolean;
-  q?: string;
-  o?: string;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
   query: Joi.string(),
-  livemode: Joi.boolean().empty(''),
-  q: Joi.string().empty(''), // query
-  o: Joi.string().empty(''), // order
 });
 router.get('/search', auth, async (req, res) => {
   const { page, pageSize, query, livemode, q, o } = await searchSchema.validateAsync(req.query, {
@@ -97,7 +73,7 @@ router.get('/search', auth, async (req, res) => {
     include: [],
   });
 
-  res.json({ count, list });
+  res.json({ count, list, paging: { page, pageSize } });
 });
 
 // eslint-disable-next-line consistent-return

package/api/src/routes/events.ts

@@ -2,22 +2,17 @@ import { Router } from 'express';
 import Joi from 'joi';
 import type { WhereOptions } from 'sequelize';
 
+import { createListParamSchema } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { Event } from '../store/models/event';
 
 const router = Router();
 const auth = authenticate<Event>({ component: true, roles: ['owner', 'admin'] });
 
-const schema = Joi.object<{
-  page: number;
-  pageSize: number;
-  livemode?: boolean;
+const schema = createListParamSchema<{
   type?: string;
   object_id?: string;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
-  livemode: Joi.boolean().empty(''),
   type: Joi.string().empty(''),
   object_id: Joi.string().empty(''),
 });
@@ -51,10 +46,10 @@ router.get('/', auth, async (req, res) => {
       include: [],
     });
 
-    res.json({ count, list });
+    res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
     console.error(err);
-    res.json({ count: 0, list: [] });
+    res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
 

package/api/src/routes/invoices.ts

@@ -6,7 +6,7 @@ import { Op } from 'sequelize';
 
 import { syncStripeInvoice } from '../integrations/stripe/handlers/invoice';
 import { syncStripePayment } from '../integrations/stripe/handlers/payment-intent';
-import { getWhereFromKvQuery } from '../libs/api';
+import { createListParamSchema, getWhereFromKvQuery } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { expandLineItems } from '../libs/session';
 import { formatMetadata } from '../libs/util';
@@ -33,30 +33,20 @@ const authPortal = authenticate<Invoice>({
   },
 });
 
-const schema = Joi.object<{
-  page: number;
-  pageSize: number;
-  livemode?: boolean;
+const schema = createListParamSchema<{
   status?: string;
   customer_id?: string;
   customer_did?: string;
   subscription_id?: string;
   currency_id?: string;
   ignoreZero?: boolean;
-  q?: string;
-  o?: string;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
-  livemode: Joi.boolean().empty(''),
   status: Joi.string().empty(''),
   customer_id: Joi.string().empty(''),
   customer_did: Joi.string().empty(''),
   subscription_id: Joi.string().empty(''),
   currency_id: Joi.string().empty(''),
   ignoreZero: Joi.boolean().empty(false),
-  q: Joi.string().empty(''), // query
-  o: Joi.string().empty(''), // order
 });
 router.get('/', authMine, async (req, res) => {
   const { page, pageSize, livemode, status, ignoreZero, ...query } = await schema.validateAsync(req.query, {
@@ -85,7 +75,7 @@ router.get('/', authMine, async (req, res) => {
     if (customer) {
       where.customer_id = customer.id;
     } else {
-      res.json({ count: 0, list: [] });
+      res.json({ count: 0, list: [], paging: { page, pageSize } });
       return;
     }
   }
@@ -174,26 +164,14 @@ router.get('/', authMine, async (req, res) => {
       }
     }
 
-    res.json({ count, list, subscription });
+    res.json({ count, list, subscription, paging: { page, pageSize } });
   } catch (err) {
     console.error(err);
-    res.json({ count: 0, list: [] });
+    res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
 
-const searchSchema = Joi.object<{
-  page: number;
-  pageSize: number;
-  livemode?: boolean;
-  q: string;
-  o?: string;
-}>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
-  livemode: Joi.boolean().empty(''),
-  q: Joi.string().empty(''), // query
-  o: Joi.string().empty(''), // order
-});
+const searchSchema = createListParamSchema<{}>({});
 router.get('/search', authMine, async (req, res) => {
   const { page, pageSize, livemode, q, o } = await searchSchema.validateAsync(req.query, {
     stripUnknown: false,
@@ -217,7 +195,7 @@ router.get('/search', authMine, async (req, res) => {
     ],
   });
 
-  res.json({ count, list });
+  res.json({ count, list, paging: { page, pageSize } });
 });
 
 router.get('/:id', authPortal, async (req, res) => {

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

@@ -5,7 +5,7 @@ import pick from 'lodash/pick';
 
 import { syncStripeInvoice } from '../integrations/stripe/handlers/invoice';
 import { syncStripePayment } from '../integrations/stripe/handlers/payment-intent';
-import { getWhereFromKvQuery, getWhereFromQuery } from '../libs/api';
+import { createListParamSchema, getWhereFromKvQuery, getWhereFromQuery } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { formatMetadata } from '../libs/util';
 import { CheckoutSession } from '../store/models/checkout-session';
@@ -30,28 +30,18 @@ const authPortal = authenticate<PaymentIntent>({
 });
 
 // list payment intents
-const paginationSchema = Joi.object<{
-  page: number;
-  pageSize: number;
+const paginationSchema = createListParamSchema<{
   status?: string;
-  livemode?: boolean;
   invoice_id?: string;
   customer_id?: string;
   customer_did?: string;
   currency_id?: string;
-  q?: string;
-  o?: string;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
   status: Joi.string().empty(''),
-  livemode: Joi.boolean().empty(''),
   invoice_id: Joi.string().empty(''),
   customer_id: Joi.string().empty(''),
   customer_did: Joi.string().empty(''),
   currency_id: Joi.string().empty(''),
-  q: Joi.string().empty(''), // query
-  o: Joi.string().empty(''), // order
 });
 router.get('/', authMine, async (req, res) => {
   const { page, pageSize, status, livemode, ...query } = await paginationSchema.validateAsync(req.query, {
@@ -110,28 +100,18 @@ router.get('/', authMine, async (req, res) => {
       ],
     });
 
-    res.json({ count, list });
+    res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
     console.error(err);
-    res.json({ count: 0, list: [] });
+    res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
 
 // search payment intents
-const searchSchema = Joi.object<{
-  page: number;
-  pageSize: number;
+const searchSchema = createListParamSchema<{
   query: string;
-  livemode?: boolean;
-  q?: string;
-  o?: string;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
   query: Joi.string(),
-  livemode: Joi.boolean().empty(''),
-  q: Joi.string().empty(''), // query
-  o: Joi.string().empty(''), // order
 });
 router.get('/search', authMine, async (req, res) => {
   const { page, pageSize, query, livemode, q, o } = await searchSchema.validateAsync(req.query, {
@@ -156,7 +136,7 @@ router.get('/search', authMine, async (req, res) => {
     ],
   });
 
-  res.json({ count, list });
+  res.json({ count, list, paging: { page, pageSize } });
 });
 
 router.get('/:id', authPortal, async (req, res) => {

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

@@ -3,6 +3,7 @@ import Joi from 'joi';
 import pick from 'lodash/pick';
 import type { WhereOptions } from 'sequelize';
 
+import { createListParamSchema } from '../libs/api';
 import logger from '../libs/logger';
 import { authenticate } from '../libs/security';
 import { isLineItemAligned } from '../libs/session';
@@ -145,17 +146,7 @@ router.post('/', auth, async (req, res) => {
 });
 
 // list payment links
-const paginationSchema = Joi.object<{
-  page: number;
-  pageSize: number;
-  active?: boolean;
-  livemode?: boolean;
-}>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
-  active: Joi.boolean().empty(''),
-  livemode: Joi.boolean().empty(''),
-});
+const paginationSchema = createListParamSchema<{ active?: boolean }>({ active: Joi.boolean().empty('') });
 router.get('/', auth, async (req, res) => {
   const { page, pageSize, ...query } = await paginationSchema.validateAsync(req.query, { stripUnknown: true });
   const where: WhereOptions<PaymentLink> = { 'metadata.preview': null };
@@ -186,10 +177,10 @@ router.get('/', auth, async (req, res) => {
       });
     });
 
-    res.json({ count, list });
+    res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
     console.error(err);
-    res.json({ count: 0, list: [] });
+    res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
 

package/api/src/routes/prices.ts

@@ -4,7 +4,7 @@ import Joi from 'joi';
 import pick from 'lodash/pick';
 import type { WhereOptions } from 'sequelize';
 
-import { getWhereFromQuery } from '../libs/api';
+import { createListParamSchema, getWhereFromQuery } from '../libs/api';
 import logger from '../libs/logger';
 import { authenticate } from '../libs/security';
 import { canUpsell } from '../libs/session';
@@ -43,19 +43,13 @@ export async function getExpandedPrice(id: string) {
 }
 
 // list prices
-const paginationSchema = Joi.object<{
-  page: number;
-  pageSize: number;
-  livemode?: boolean;
+const paginationSchema = createListParamSchema<{
   active?: boolean;
   type?: string;
   currency_id?: string;
   product_id?: string;
   lookup_key?: string;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
-  livemode: Joi.boolean().empty(''),
   active: Joi.boolean().empty(''),
   type: Joi.string().empty(''),
   currency_id: Joi.string().empty(''),
@@ -98,20 +92,14 @@ router.get('/', auth, async (req, res) => {
     limit: pageSize,
   });
 
-  res.json({ count, list: await Promise.all(rows.map((x) => getExpandedPrice(x.id))) });
+  res.json({ count, list: await Promise.all(rows.map((x) => getExpandedPrice(x.id))), paging: { page, pageSize } });
 });
 
 // search prices
-const searchSchema = Joi.object<{
-  page: number;
-  pageSize: number;
+const searchSchema = createListParamSchema<{
   query: string;
-  livemode?: boolean;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
   query: Joi.string(),
-  livemode: Joi.boolean().empty(''),
 });
 router.get('/search', auth, async (req, res) => {
   const { page, pageSize, query, livemode } = await searchSchema.validateAsync(req.query, {

package/api/src/routes/pricing-table.ts

@@ -7,6 +7,7 @@ import uniq from 'lodash/uniq';
 import type { WhereOptions } from 'sequelize';
 
 import { checkPassportForPricingTable } from '../integrations/blocklet/passport';
+import { createListParamSchema } from '../libs/api';
 import logger from '../libs/logger';
 import { authenticate } from '../libs/security';
 import { getBillingThreshold, isLineItemCurrencyAligned } from '../libs/session';
@@ -49,16 +50,10 @@ router.post('/', auth, async (req, res) => {
 });
 
 // list pricing tables
-const paginationSchema = Joi.object<{
-  page: number;
-  pageSize: number;
+const paginationSchema = createListParamSchema<{
   active?: boolean;
-  livemode?: boolean;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
   active: Joi.boolean().empty(''),
-  livemode: Joi.boolean().empty(''),
 });
 router.get('/', auth, async (req, res) => {
   const { page, pageSize, ...query } = await paginationSchema.validateAsync(req.query, { stripUnknown: true });
@@ -93,10 +88,10 @@ router.get('/', auth, async (req, res) => {
       });
     });
 
-    res.json({ count, list });
+    res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
     console.error(err);
-    res.json({ count: 0, list: [] });
+    res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
 

package/api/src/routes/products.ts

@@ -3,7 +3,7 @@ import { Router } from 'express';
 import Joi from 'joi';
 import pick from 'lodash/pick';
 
-import { getWhereFromKvQuery, getWhereFromQuery } from '../libs/api';
+import { createListParamSchema, getWhereFromKvQuery, getWhereFromQuery } from '../libs/api';
 import logger from '../libs/logger';
 import { authenticate } from '../libs/security';
 import { formatMetadata } from '../libs/util';
@@ -106,26 +106,16 @@ router.post('/', auth, async (req, res) => {
 });
 
 // list products and prices
-const paginationSchema = Joi.object<{
-  page: number;
-  pageSize: number;
-  livemode?: boolean;
+const paginationSchema = createListParamSchema<{
   active?: boolean;
   status?: string;
   name?: string;
   description?: string;
-  q?: string;
-  o?: string;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
-  livemode: Joi.boolean().empty(''),
   active: Joi.boolean().empty(''),
   status: Joi.string().empty(''),
   name: Joi.string().empty(''),
   description: Joi.string().empty(''),
-  q: Joi.string().empty(''), // query
-  o: Joi.string().empty(''), // order
 });
 router.get('/', auth, async (req, res) => {
   const { page, pageSize, active, livemode, name, description, ...query } = await paginationSchema.validateAsync(
@@ -168,22 +158,14 @@ router.get('/', auth, async (req, res) => {
     distinct: true,
   });
 
-  res.json({ count, list });
+  res.json({ count, list, paging: { page, pageSize } });
 });
 
 // search products
-const searchSchema = Joi.object<{
-  page: number;
-  pageSize: number;
+const searchSchema = createListParamSchema<{
   query: string;
-  livemode?: boolean;
-  q?: string;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
   query: Joi.string(),
-  livemode: Joi.boolean().empty(''),
-  q: Joi.string().empty(''), // query
 });
 router.get('/search', auth, async (req, res) => {
   const { page, pageSize, query, livemode, q } = await searchSchema.validateAsync(req.query, {

package/api/src/routes/refunds.ts

@@ -3,7 +3,7 @@ import { Router } from 'express';
 import Joi from 'joi';
 import pick from 'lodash/pick';
 
-import { getWhereFromKvQuery } from '../libs/api';
+import { createListParamSchema, getWhereFromKvQuery } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { formatMetadata } from '../libs/util';
 import {
@@ -29,28 +29,18 @@ const auth = authenticate<Invoice>({
   },
 });
 
-const paginationSchema = Joi.object<{
-  page: number;
-  pageSize: number;
-  livemode?: boolean;
+const paginationSchema = createListParamSchema<{
   status?: string;
   invoice_id: string;
   subscription_id: string;
   currency_id: string;
   customer_id: string;
-  q?: string;
-  o?: string;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
-  livemode: Joi.boolean().empty(''),
   status: Joi.string().empty(''),
   invoice_id: Joi.string().empty(''),
   currency_id: Joi.string().empty(''),
   subscription_id: Joi.string().empty(''),
   customer_id: Joi.string().empty(''),
-  q: Joi.string().empty(''), // query
-  o: Joi.string().empty(''), // order
 });
 router.get('/', auth, async (req, res) => {
   const { page, pageSize, livemode, status, ...query } = await paginationSchema.validateAsync(req.query, {
@@ -109,23 +99,10 @@ router.get('/', auth, async (req, res) => {
     distinct: true,
   });
 
-  res.json({ count, list });
-});
-
-const searchSchema = Joi.object<{
-  page: number;
-  pageSize: number;
-  livemode?: boolean;
-  q: string;
-  o?: string;
-}>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
-  livemode: Joi.boolean().empty(''),
-  q: Joi.string().empty(''), // query
-  o: Joi.string().empty(''), // order
+  res.json({ count, list, paging: { page, pageSize } });
 });
 
+const searchSchema = createListParamSchema<{}>({});
 router.get('/search', auth, async (req, res) => {
   const { page, pageSize, livemode, q, o } = await searchSchema.validateAsync(req.query, {
     stripUnknown: false,
@@ -148,7 +125,7 @@ router.get('/search', auth, async (req, res) => {
     ],
   });
 
-  res.json({ count, list });
+  res.json({ count, list, paging: { page, pageSize } });
 });
 
 router.get('/:id', auth, async (req, res) => {

package/api/src/routes/subscription-items.ts

@@ -3,6 +3,7 @@ import Joi from 'joi';
 import pick from 'lodash/pick';
 import type { WhereOptions } from 'sequelize';
 
+import { createListParamSchema } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { expandLineItems } from '../libs/session';
 import { formatMetadata } from '../libs/util';
@@ -38,18 +39,12 @@ router.post('/', auth, async (req, res) => {
 });
 
 // @link https://stripe.com/docs/api/subscription_items/list
-const schema = Joi.object<{
-  page: number;
-  pageSize: number;
+const schema = createListParamSchema<{
   subscription_id: string;
   price_id: string;
-  livemode?: boolean;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
   subscription_id: Joi.string(),
   price_id: Joi.string(),
-  livemode: Joi.boolean().empty(''),
 });
 router.get('/', auth, async (req, res) => {
   const { page, pageSize, ...query } = await schema.validateAsync(req.query, { stripUnknown: true });
@@ -82,10 +77,10 @@ router.get('/', auth, async (req, res) => {
       // @ts-ignore
       expandLineItems(list, products, prices);
     }
-    res.json({ count, list });
+    res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
     console.error(err);
-    res.json({ count: 0, list: [] });
+    res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
 

package/api/src/routes/subscriptions.ts

@@ -6,7 +6,7 @@ import pick from 'lodash/pick';
 import uniq from 'lodash/uniq';
 
 import { ensureStripeSubscription } from '../integrations/stripe/resource';
-import { getWhereFromKvQuery, getWhereFromQuery } from '../libs/api';
+import { createListParamSchema, getWhereFromKvQuery, getWhereFromQuery } from '../libs/api';
 import dayjs from '../libs/dayjs';
 import logger from '../libs/logger';
 import { isDelegationSufficientForPayment } from '../libs/payment';
@@ -60,24 +60,14 @@ const updateStripeSubscription = async (doc: Subscription, updates: any) => {
   }
 };
 
-const schema = Joi.object<{
-  page: number;
-  pageSize: number;
+const schema = createListParamSchema<{
   status?: string;
   customer_id?: string;
   customer_did?: string;
-  livemode?: boolean;
-  q?: string;
-  o?: string;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
   status: Joi.string().empty(''),
   customer_id: Joi.string().empty(''),
   customer_did: Joi.string().empty(''),
-  livemode: Joi.boolean().empty(''),
-  q: Joi.string().empty(''), // query
-  o: Joi.string().empty(''), // order
 });
 router.get('/', authMine, async (req, res) => {
   const { page, pageSize, status, livemode, ...query } = await schema.validateAsync(req.query, {
@@ -100,7 +90,7 @@ router.get('/', authMine, async (req, res) => {
     if (customer) {
       where.customer_id = customer.id;
     } else {
-      res.json({ count: 0, list: [] });
+      res.json({ count: 0, list: [], paging: { page, pageSize } });
       return;
     }
   }
@@ -137,28 +127,18 @@ router.get('/', authMine, async (req, res) => {
     // @ts-ignore
     docs.forEach((x) => expandLineItems(x.items, products, prices));
 
-    res.json({ count, list: docs });
+    res.json({ count, list: docs, paging: { page, pageSize } });
   } catch (err) {
     console.error(err);
-    res.json({ count: 0, list: [] });
+    res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
 
 // search subscriptions
-const searchSchema = Joi.object<{
-  page: number;
-  pageSize: number;
+const searchSchema = createListParamSchema<{
   query: string;
-  livemode?: boolean;
-  q?: string;
-  o?: string;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
   query: Joi.string(),
-  livemode: Joi.boolean().empty(''),
-  q: Joi.string().empty(''), // query
-  o: Joi.string().empty(''), // order
 });
 router.get('/search', auth, async (req, res) => {
   const { page, pageSize, query, livemode, q, o } = await searchSchema.validateAsync(req.query, {
@@ -190,7 +170,7 @@ router.get('/search', auth, async (req, res) => {
   const docs = list.map((x) => x.toJSON());
   // @ts-ignore
   docs.forEach((x) => expandLineItems(x.items, products, prices));
-  res.json({ count, list: docs });
+  res.json({ count, list: docs, paging: { page, pageSize } });
 });
 
 // FIXME: exclude some sensitive fields from PaymentMethod

package/api/src/routes/usage-records.ts

@@ -5,6 +5,7 @@ import pick from 'lodash/pick';
 import { Op } from 'sequelize';
 
 import { forwardUsageRecordToStripe } from '../integrations/stripe/resource';
+import { createListParamSchema } from '../libs/api';
 import dayjs from '../libs/dayjs';
 import { authenticate } from '../libs/security';
 import { usageRecordQueue } from '../queues/usage-record';
@@ -75,16 +76,10 @@ router.post('/', auth, async (req, res) => {
 });
 
 // @link https://stripe.com/docs/api/usage_records/subscription_item_summary_list
-const schema = Joi.object<{
-  page: number;
-  pageSize: number;
+const schema = createListParamSchema<{
   subscription_item_id: string;
-  livemode?: boolean;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
   subscription_item_id: Joi.string().required(),
-  livemode: Joi.boolean().empty(''),
 });
 router.get('/summary', auth, async (req, res) => {
   const { page, pageSize, ...query } = await schema.validateAsync(req.query, { stripUnknown: true });
@@ -127,10 +122,10 @@ router.get('/summary', auth, async (req, res) => {
       })
     );
 
-    res.json({ count, list });
+    res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
     console.error(err);
-    res.json({ count: 0, list: [] });
+    res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
 

package/api/src/routes/webhook-attempts.ts

@@ -2,22 +2,17 @@ import { Router } from 'express';
 import Joi from 'joi';
 import type { WhereOptions } from 'sequelize';
 
+import { createListParamSchema } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { Event, WebhookAttempt, WebhookEndpoint } from '../store/models';
 
 const router = Router();
 const auth = authenticate<WebhookAttempt>({ component: true, roles: ['owner', 'admin'] });
 
-const schema = Joi.object<{
-  page: number;
-  pageSize: number;
-  livemode?: boolean;
+const schema = createListParamSchema<{
   event_id?: string;
   webhook_endpoint_id?: string;
 }>({
-  page: Joi.number().integer().min(1).default(1),
-  pageSize: Joi.number().integer().min(1).max(100).default(20),
-  livemode: Joi.boolean().empty(''),
   event_id: Joi.string().empty(''),
   webhook_endpoint_id: Joi.string().empty(''),
 });
@@ -47,10 +42,10 @@ router.get('/', auth, async (req, res) => {
       ],
     });
 
-    res.json({ count, list });
+    res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
     console.error(err);
-    res.json({ count: 0, list: [] });
+    res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
 

package/api/src/routes/webhook-endpoints.ts

@@ -3,6 +3,7 @@ import Joi from 'joi';
 import pick from 'lodash/pick';
 import type { WhereOptions } from 'sequelize';
 
+import { createListParamSchema } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { formatMetadata } from '../libs/util';
 import { WebhookEndpoint } from '../store/models';
@@ -28,16 +29,10 @@ router.post('/', auth, async (req, res) => {
   return res.json(doc);
 });
 
-const schema = Joi.object<{
-  page: number;
-  pageSize: number;
+const schema = createListParamSchema<{
   status?: 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(''),
-  livemode: Joi.boolean().empty(''),
 });
 router.get('/', auth, async (req, res) => {
   const { page, pageSize, status, ...query } = await schema.validateAsync(req.query, { stripUnknown: true });
@@ -68,10 +63,10 @@ router.get('/', auth, async (req, res) => {
       include: [],
     });
 
-    res.json({ count, list });
+    res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
     console.error(err);
-    res.json({ count: 0, list: [] });
+    res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
 

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.207",
+  "version": "1.13.209",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev --open",
     "eject": "vite eject",
@@ -50,7 +50,7 @@
     "@arcblock/jwt": "^1.18.113",
     "@arcblock/ux": "^2.9.63",
     "@blocklet/logger": "1.16.24",
-    "@blocklet/payment-react": "1.13.207",
+    "@blocklet/payment-react": "1.13.209",
     "@blocklet/sdk": "1.16.24",
     "@blocklet/ui-react": "^2.9.63",
     "@blocklet/uploader": "^0.0.75",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.24",
     "@arcblock/eslint-config-ts": "^0.3.0",
-    "@blocklet/payment-types": "1.13.207",
+    "@blocklet/payment-types": "1.13.209",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -118,7 +118,7 @@
     "@types/node": "^18.19.14",
     "@types/react": "^18.2.55",
     "@types/react-dom": "^18.2.18",
-    "@vitejs/plugin-react": "^2.2.0",
+    "@vitejs/plugin-react": "^4.2.1",
     "bumpp": "^8.2.1",
     "cross-env": "^7.0.3",
     "eslint": "^8.56.0",
@@ -133,10 +133,10 @@
     "ts-node": "^10.9.2",
     "type-fest": "^4.10.2",
     "typescript": "^4.9.5",
-    "vite": "^4.5.2",
-    "vite-plugin-blocklet": "^0.7.5",
-    "vite-plugin-node-polyfills": "^0.7.0",
-    "vite-plugin-svgr": "^2.4.0",
+    "vite": "^5.2.7",
+    "vite-plugin-blocklet": "^0.7.6",
+    "vite-plugin-node-polyfills": "^0.21.0",
+    "vite-plugin-svgr": "^4.2.0",
     "zx": "^7.2.3"
   },
   "importSort": {
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "7b4918ac7bb09317df0b2a78e337312cc4b50b67"
+  "gitHead": "24391eee3017ca20e40a595334e1adccbadc85cd"
 }

package/src/pages/customer/index.tsx

@@ -4,11 +4,11 @@ import Toast from '@arcblock/ux/lib/Toast';
 import { CustomerInvoiceList, PaymentProvider, formatError, getPrefix } from '@blocklet/payment-react';
 import type { GroupedBN, TCustomerExpanded } from '@blocklet/payment-types';
 import { Edit } from '@mui/icons-material';
-import { Alert, Box, Button, CircularProgress, Grid, Stack, Tooltip } from '@mui/material';
+import { Alert, Box, Button, Grid, Stack, Tooltip } from '@mui/material';
 import { styled } from '@mui/system';
-import { useRequest, useSetState } from 'ahooks';
+import { useSetState } from 'ahooks';
 import { isEmpty } from 'lodash';
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import { FlagEmoji } from 'react-international-phone';
 import { useNavigate } from 'react-router-dom';
 import { joinURL } from 'ufo';
@@ -34,22 +34,21 @@ export default function CustomerHome() {
   const navigate = useNavigate();
   const { isPending, startTransition } = useTransitionContext();
 
-  const { loading, error, data, runAsync } = useRequest(fetchData);
+  const [data, setData] = useState(null as any);
+
+  const runAsync = () => {
+    fetchData().then((res) => {
+      setData(res as any);
+    });
+  };
 
   useEffect(() => {
+    runAsync();
     events.once('switch-did', () => {
-      runAsync().catch(console.error);
+      runAsync();
     });
   }, []);
 
-  if (error) {
-    return <Alert severity="error">{formatError(error)}</Alert>;
-  }
-
-  if (loading) {
-    return <CircularProgress />;
-  }
-
   if (!data) {
     return (
       <Alert sx={{ mt: 3 }} severity="info">
@@ -83,7 +82,9 @@ export default function CustomerHome() {
               <Box className="section-body">
                 <CurrentSubscriptions
                   id={data.id}
-                  onChange={runAsync}
+                  onChange={() => {
+                    runAsync();
+                  }}
                   style={{
                     cursor: 'pointer',
                   }}