payment-kit 1.29.1 → 1.29.2

package/api/src/routes/{payouts.ts → hono/payouts.ts}

@@ -1,23 +1,27 @@
+// Phase 3 (express→hono) — hono fork of routes/payouts.ts. Sub-app with
+// routes relative to /api/payouts (mounted via mountResourceGroup). The
+// business logic is unchanged; only the express plumbing becomes hono:
+//   req.body → c.get('sanitizedBody'); res.status(n).json(x) → c.json(x, n).
 import { isValid } from '@arcblock/did';
-import { Router } from 'express';
+import { Hono } from 'hono';
 import Joi from 'joi';
 import pick from 'lodash/pick';
 
-import { sessionMiddleware } from '@blocklet/sdk/lib/middlewares/session';
 import type { WhereOptions } from 'sequelize';
-import { createListParamSchema, getOrder, getWhereFromKvQuery, MetadataSchema } from '../libs/api';
-import logger from '../libs/logger';
-import { authenticate } from '../libs/security';
-import { formatMetadata } from '../libs/util';
-import { PaymentLink, TPaymentIntentExpanded } from '../store/models';
-import { CheckoutSession } from '../store/models/checkout-session';
-import { Customer } from '../store/models/customer';
-import { PaymentCurrency } from '../store/models/payment-currency';
-import { PaymentIntent } from '../store/models/payment-intent';
-import { PaymentMethod } from '../store/models/payment-method';
-import { Payout } from '../store/models/payout';
-
-const router = Router();
+import { createListParamSchema, getOrder, getWhereFromKvQuery, MetadataSchema } from '../../libs/api';
+import logger from '../../libs/logger';
+import { authenticate } from '../../middlewares/hono/security';
+import { sessionMiddleware } from '../../middlewares/hono/session';
+import { formatMetadata } from '../../libs/util';
+import { PaymentLink, TPaymentIntentExpanded } from '../../store/models';
+import { CheckoutSession } from '../../store/models/checkout-session';
+import { Customer } from '../../store/models/customer';
+import { PaymentCurrency } from '../../store/models/payment-currency';
+import { PaymentIntent } from '../../store/models/payment-intent';
+import { PaymentMethod } from '../../store/models/payment-method';
+import { Payout } from '../../store/models/payout';
+
+const app = new Hono();
 const authAdmin = authenticate<Payout>({ component: true, roles: ['owner', 'admin'] });
 const authMine = authenticate<Payout>({ component: true, roles: ['owner', 'admin'], mine: true });
 const authPortal = authenticate<Payout>({
@@ -44,8 +48,8 @@ const paginationSchema = createListParamSchema<{
   customer_did: Joi.string().empty(''),
   currency_id: Joi.string().empty(''),
 });
-router.get('/', authMine, async (req, res) => {
-  const { page, pageSize, status, livemode, ...query } = await paginationSchema.validateAsync(req.query, {
+app.get('/', authMine, async (c) => {
+  const { page, pageSize, status, livemode, ...query } = await paginationSchema.validateAsync(c.req.query(), {
     stripUnknown: false,
     allowUnknown: true,
   });
@@ -57,16 +61,15 @@ router.get('/', authMine, async (req, res) => {
       .map((x) => x.trim())
       .filter(Boolean);
   }
-  if (query.customer_id) {
-    where.customer_id = query.customer_id;
+  if (c.get('customer_id') ?? query.customer_id) {
+    where.customer_id = c.get('customer_id') ?? query.customer_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;
+      return c.json({ count: 0, list: [] });
     }
   }
   if (query.payment_intent_id) {
@@ -91,7 +94,7 @@ router.get('/', authMine, async (req, res) => {
   try {
     const { rows: list, count } = await Payout.findAndCountAll({
       where,
-      order: getOrder(req.query, [['created_at', query.o === 'asc' ? 'ASC' : 'DESC']]),
+      order: getOrder(c.req.query(), [['created_at', query.o === 'asc' ? 'ASC' : 'DESC']]),
       offset: (page - 1) * pageSize,
       limit: pageSize,
       include: [
@@ -102,10 +105,10 @@ router.get('/', authMine, async (req, res) => {
       ],
     });
 
-    res.json({ count, list, paging: { page, pageSize } });
+    return c.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
     logger.error(err);
-    res.json({ count: 0, list: [], paging: { page, pageSize } });
+    return c.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
 
@@ -117,7 +120,9 @@ const mineRecordPaginationSchema = createListParamSchema<{
   currency_id: Joi.string().empty(''),
   status: Joi.string().empty(''),
 });
-router.get('/mine', sessionMiddleware({ accessKey: true }), async (req, res) => {
+// faithful fork of the express `sessionMiddleware({ accessKey: true })` — populates
+// c.get('user') from a login token OR access key, and does NOT gate (next() either way).
+app.get('/mine', sessionMiddleware({ accessKey: true }), async (c) => {
   try {
     const {
       page,
@@ -125,16 +130,18 @@ router.get('/mine', sessionMiddleware({ accessKey: true }), async (req, res) =>
       currency_id: currencyId,
       customer_id: customerId,
       status,
-    } = await mineRecordPaginationSchema.validateAsync(req.query, {
+    } = await mineRecordPaginationSchema.validateAsync(c.req.query(), {
       stripUnknown: true,
       allowUnknown: true,
     });
-    if (!req.user) {
-      return res.status(403).json({ code: 'REQUIRE_LOGIN', error: 'Please login to continue' });
+    if (!c.get('user')) {
+      return c.json({ code: 'REQUIRE_LOGIN', error: 'Please login to continue' }, 403);
     }
-    const customer = await Customer.findOne({ where: { did: customerId || req.user?.did } });
+    const customer = await Customer.findOne({
+      where: { did: (c.get('customer_id') ?? customerId) || c.get('user')?.did },
+    });
     if (!customer) {
-      throw new Error(`Customer not found: ${req.user?.did}`);
+      throw new Error(`Customer not found: ${c.get('user')?.did}`);
     }
 
     const where: WhereOptions = { customer_id: customer.id };
@@ -147,7 +154,7 @@ router.get('/mine', sessionMiddleware({ accessKey: true }), async (req, res) =>
 
     const { rows: list, count } = await Payout.findAndCountAll({
       where,
-      order: getOrder(req.query, [['created_at', 'DESC']]),
+      order: getOrder(c.req.query(), [['created_at', 'DESC']]),
       offset: (page - 1) * pageSize,
       limit: pageSize,
       include: [
@@ -169,17 +176,17 @@ router.get('/mine', sessionMiddleware({ accessKey: true }), async (req, res) =>
         return x;
       })
     );
-    return res.json({ count, list: result, paging: { page, pageSize } });
+    return c.json({ count, list: result, paging: { page, pageSize } });
   } catch (err) {
     logger.error(err);
-    return res.status(400).json({ error: err.message });
+    return c.json({ error: err.message }, 400);
   }
 });
 
-router.get('/:id', authPortal, async (req, res) => {
+app.get('/:id', authPortal, async (c) => {
   try {
     const doc = (await Payout.findOne({
-      where: { id: req.params.id },
+      where: { id: c.req.param('id') },
       include: [
         { model: PaymentCurrency, as: 'paymentCurrency' },
         { model: PaymentMethod, as: 'paymentMethod' },
@@ -188,7 +195,7 @@ router.get('/:id', authPortal, async (req, res) => {
       ],
     })) as Payout & { paymentIntent: TPaymentIntentExpanded & { customer: Customer } };
     if (!doc) {
-      return res.status(404).json(null);
+      return c.json(null, 404);
     }
     let checkoutSession = null;
     let paymentLink = null;
@@ -210,43 +217,44 @@ router.get('/:id', authPortal, async (req, res) => {
       if (paymentCustomer) {
         // @ts-ignore
         payout.paymentIntent.customer = paymentCustomer.toJSON();
-        return res.json({
+        return c.json({
           ...payout,
           checkoutSession,
           paymentLink,
         });
       }
     }
-    return res.json(payout);
+    return c.json(payout);
   } catch (err) {
     logger.error(err);
-    return res.status(500).json({ error: `Failed to get payout: ${err.message}` });
+    return c.json({ error: `Failed to get payout: ${err.message}` }, 500);
   }
 });
 
 // eslint-disable-next-line consistent-return
-router.put('/:id', authAdmin, async (req, res) => {
+app.put('/:id', authAdmin, async (c) => {
   try {
-    const doc = await Payout.findByPk(req.params.id as string);
+    const doc = await Payout.findByPk(c.req.param('id') as string);
     if (!doc) {
-      return res.status(404).json({ error: 'Payout not found' });
+      return c.json({ error: 'Payout not found' }, 404);
     }
 
-    const raw = pick(req.body, ['metadata']);
+    const body = c.get('sanitizedBody') ?? {};
+    const raw = pick(body, ['metadata']);
     if (raw.metadata) {
       const { error: metadataError } = MetadataSchema.validate(raw.metadata);
       if (metadataError) {
-        return res.status(400).json({ error: `metadata invalid: ${metadataError.message}` });
+        return c.json({ error: `metadata invalid: ${metadataError.message}` }, 400);
       }
       raw.metadata = formatMetadata(raw.metadata);
     }
 
     await doc.update(raw);
-    res.json(doc);
+    return c.json(doc);
   } catch (err) {
     logger.error(err);
-    res.json(null);
+    return c.json(null);
   }
 });
 
-export default router;
+export default app;