payment-kit 1.18.2 → 1.18.4

package/api/src/index.ts

@@ -6,8 +6,7 @@ import fallback from '@blocklet/sdk/lib/middlewares/fallback';
 import cookieParser from 'cookie-parser';
 import cors from 'cors';
 import dotenv from 'dotenv-flow';
-import express, { ErrorRequestHandler, Request, Response } from 'express';
-import morgan from 'morgan';
+import express, { ErrorRequestHandler } from 'express';
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { xss } from '@blocklet/xss';
@@ -18,7 +17,7 @@ import { ensureStakedForGas } from './integrations/arcblock/stake';
 import { initResourceHandler } from './integrations/blocklet/resource';
 import { ensureWebhookRegistered } from './integrations/stripe/setup';
 import { handlers } from './libs/auth';
-import logger, { accessLogStream } from './libs/logger';
+import logger, { setupAccessLogger } from './libs/logger';
 import { contextMiddleware, ensureI18n } from './libs/middleware';
 import { initEventBroadcast } from './libs/ws';
 import { startCheckoutSessionQueue } from './queues/checkout-session';
@@ -49,6 +48,7 @@ initialize(sequelize);
 
 export const app = express();
 
+setupAccessLogger(app);
 app.set('trust proxy', true);
 app.use(cookieParser());
 app.use((req, res, next) => {
@@ -79,23 +79,6 @@ router.use('/api', routes);
 
 const isProduction = process.env.BLOCKLET_MODE === 'production';
 
-const accessFormat =
-  isProduction
-    ? 'combined'
-    : (tokens: any, req: Request, res: Response) => [tokens.method(req, res), tokens.url(req, res), tokens.status(req, res), tokens.res(req, res, 'content-length'), '-', tokens['response-time'](req, res), 'ms'].join(' '); // prettier-ignore
-
-if (isProduction) {
-  app.use(morgan(accessFormat, { stream: accessLogStream }));
-} else {
-  app.use((req, res, next) => {
-    if (['/node_modules/.vite', '/src', '/@'].some((p) => req.originalUrl.startsWith(p))) {
-      return next();
-    }
-
-    return morgan(accessFormat, { stream: accessLogStream })(req, res, next);
-  });
-}
-
 app.use(contextMiddleware);
 app.use(router);
 
@@ -106,7 +89,7 @@ if (isProduction) {
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   app.use(<ErrorRequestHandler>((err, req, res, _next) => {
-    console.error(err);
+    logger.error(err);
     if (req.accepts('json')) {
       res.status(500).send({ error: err.message });
     } else {

package/api/src/libs/logger.ts

@@ -16,4 +16,5 @@ const logger = init('app');
 
 export default logger;
 
-export const accessLogStream = createLogger.getAccessLogStream();
+const { setupAccessLogger } = createLogger;
+export { setupAccessLogger };

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

@@ -522,7 +522,7 @@ export async function startCheckoutSessionFromPaymentLink(id: string, req: Reque
       customer: req.user ? await Customer.findOne({ where: { did: req.user.did } }) : null,
     });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.status(500).json({ error: err.message });
   }
 }
@@ -1135,7 +1135,7 @@ router.put('/:id/upsell', user, ensureCheckoutSessionOpen, async (req, res) => {
     const items = await Price.expand(checkoutSession.line_items, { upsell: true });
     res.json({ ...checkoutSession.toJSON(), line_items: items });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.status(500).json({ error: err.message });
   }
 });
@@ -1215,7 +1215,7 @@ router.get('/:id/cross-sell', user, ensureCheckoutSessionOpen, async (req, res)
     // @ts-ignore
     return res.status(result.error ? 400 : 200).json(result);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.status(500).json({ error: err.message });
   }
 });
@@ -1261,7 +1261,7 @@ router.put('/:id/cross-sell', user, ensureCheckoutSessionOpen, async (req, res)
     const items = await Price.expand(checkoutSession.line_items, { upsell: true });
     res.json({ ...checkoutSession.toJSON(), line_items: items });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.status(500).json({ error: err.message });
   }
 });
@@ -1287,7 +1287,7 @@ router.delete('/:id/cross-sell', user, ensureCheckoutSessionOpen, async (req, re
     const items = await Price.expand(checkoutSession.line_items, { upsell: true });
     res.json({ ...checkoutSession.toJSON(), line_items: items });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.status(500).json({ error: err.message });
   }
 });
@@ -1356,7 +1356,7 @@ router.put('/:id/amount', ensureCheckoutSessionOpen, async (req, res) => {
 
     res.json({ ...checkoutSession.toJSON(), line_items: await Price.expand(newItems) });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.status(500).json({ error: err.message });
   }
 });
@@ -1454,7 +1454,7 @@ router.get('/', auth, async (req, res) => {
 
     res.json({ count, list: docs });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json({ count: 0, list: [] });
   }
 });

package/api/src/routes/customers.ts

@@ -10,6 +10,7 @@ import { authenticate } from '../libs/security';
 import { formatMetadata } from '../libs/util';
 import { Customer } from '../store/models/customer';
 import { blocklet } from '../libs/auth';
+import logger from '../libs/logger';
 
 const router = Router();
 const auth = authenticate<Customer>({ component: true, roles: ['owner', 'admin'] });
@@ -46,7 +47,7 @@ router.get('/', auth, async (req, res) => {
 
     res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
@@ -103,7 +104,7 @@ router.get('/me', sessionMiddleware(), async (req, res) => {
       res.json({ ...doc.toJSON(), summary: { ...summary, stake, token }, livemode });
     }
   } catch (err) {
-    console.error('get customer failed', err);
+    logger.error('get customer failed', err);
     res.status(500).json({ error: `Failed to get customer: ${err.message}` });
   }
 });
@@ -117,7 +118,7 @@ router.get('/:id', auth, async (req, res) => {
       res.status(404).json(null);
     }
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.status(500).json({ error: `Failed to get customer: ${err.message}` });
   }
 });
@@ -137,7 +138,7 @@ router.get('/:id/summary', auth, async (req, res) => {
     ]);
     res.json({ ...summary, stake, token });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json(null);
   }
 });
@@ -183,7 +184,7 @@ router.put('/:id', authPortal, async (req, res) => {
     await doc.update(raw);
     res.json(doc);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json(null);
   }
 });

package/api/src/routes/events.ts

@@ -6,6 +6,7 @@ import { createListParamSchema } from '../libs/api';
 import { authenticate } from '../libs/security';
 import { Event } from '../store/models/event';
 import { blocklet } from '../libs/auth';
+import logger from '../libs/logger';
 
 const router = Router();
 const auth = authenticate<Event>({ component: true, roles: ['owner', 'admin'] });
@@ -49,7 +50,7 @@ router.get('/', auth, async (req, res) => {
 
     res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
@@ -71,7 +72,7 @@ router.get('/:id', auth, async (req, res) => {
     }
     return res.status(404).json(null);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.status(400).json({ error: `Failed to get event: ${err.message}` });
   }
 });

package/api/src/routes/invoices.ts

@@ -23,6 +23,7 @@ import { Product } from '../store/models/product';
 import { Subscription } from '../store/models/subscription';
 import { getReturnStakeInvoices, getStakingInvoices } from '../libs/invoice';
 import { CheckoutSession, PaymentLink, TInvoiceExpanded } from '../store/models';
+import logger from '../libs/logger';
 
 const router = Router();
 const authAdmin = authenticate<Subscription>({ component: true, roles: ['owner', 'admin'] });
@@ -174,7 +175,7 @@ router.get('/', authMine, async (req, res) => {
 
     res.json({ count, list: invoices, subscription, paging: { page, pageSize } });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
@@ -279,7 +280,7 @@ router.get('/:id', authPortal, async (req, res) => {
     }
     return res.status(404).json(null);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.status(500).json({ error: `Failed to get invoice: ${err.message}` });
   }
 });
@@ -304,7 +305,7 @@ router.put('/:id', authAdmin, async (req, res) => {
     await doc.update(raw);
     res.json(doc);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json(null);
   }
 });

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

@@ -77,7 +77,7 @@ router.post('/', auth, async (req, res) => {
       });
       return res.json(currency);
     } catch (err) {
-      console.error(err);
+      logger.error(err);
       return res.status(400).json({ error: `${method.type} currency contract verify failed` });
     }
   }
@@ -113,7 +113,7 @@ router.post('/', auth, async (req, res) => {
       });
       return res.json(currency);
     } catch (err) {
-      console.error(err);
+      logger.error(err);
       return res.status(400).json({ error: `${method.type} currency contract verify failed` });
     }
   }

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

@@ -123,7 +123,7 @@ router.get('/', authMine, async (req, res) => {
 
     res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
@@ -191,7 +191,7 @@ router.get('/:id', authPortal, async (req, res) => {
       res.status(404).json(null);
     }
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.status(500).json({ error: `Failed to get payment intent: ${err.message}` });
   }
 });
@@ -216,7 +216,7 @@ router.put('/:id', authAdmin, async (req, res) => {
     await doc.update(raw);
     res.json(doc);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json(null);
   }
 });
@@ -242,7 +242,7 @@ router.get('/:id/retry', authAdmin, async (req, res) => {
     });
     res.json(doc);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json(null);
   }
 });
@@ -332,7 +332,7 @@ router.put('/:id/refund', authAdmin, async (req, res) => {
     });
     res.json(item.toJSON());
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.status(500).json({ error: `Failed to payment intent refund: ${err.message}` });
   }
 });
@@ -370,7 +370,7 @@ router.get('/:id/refundable-amount', authPortal, async (req, res) => {
       res.status(404).json(null);
     }
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.status(500).json({ error: `Failed to get payment intent refundable amount: ${err.message}` });
   }
 });

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

@@ -257,7 +257,7 @@ router.get('/', auth, async (req, res) => {
 
     res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });

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

@@ -21,6 +21,7 @@ import {
   Subscription,
 } from '../store/models';
 import { EVM_CHAIN_TYPES } from '../libs/constants';
+import logger from '../libs/logger';
 
 const router = Router();
 const auth = authenticate<PaymentStat>({ component: true, roles: ['owner', 'admin'] });
@@ -80,7 +81,7 @@ router.get('/', auth, async (req, res) => {
 
     res.json({ count, list });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json({ count: 0, list: [] });
   }
 });
@@ -132,7 +133,7 @@ router.get('/summary', auth, async (req, res) => {
       },
     });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json(null);
   }
 });

package/api/src/routes/payouts.ts

@@ -14,6 +14,7 @@ import { PaymentMethod } from '../store/models/payment-method';
 import { Payout } from '../store/models/payout';
 import { PaymentLink, TPaymentIntentExpanded } from '../store/models';
 import { CheckoutSession } from '../store/models/checkout-session';
+import logger from '../libs/logger';
 
 const router = Router();
 const authAdmin = authenticate<Payout>({ component: true, roles: ['owner', 'admin'] });
@@ -102,7 +103,7 @@ router.get('/', authMine, async (req, res) => {
 
     res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
@@ -169,7 +170,7 @@ router.get('/mine', sessionMiddleware(), async (req, res) => {
     );
     return res.json({ count, list: result, paging: { page, pageSize } });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.status(400).json({ error: err.message });
   }
 });
@@ -199,7 +200,7 @@ router.get('/:id', authPortal, async (req, res) => {
           paymentLink = await PaymentLink.findByPk(checkoutSession.payment_link_id);
         }
       } catch (err) {
-        console.error(err);
+        logger.error(err);
       }
     }
     const payout = doc.toJSON();
@@ -217,7 +218,7 @@ router.get('/:id', authPortal, async (req, res) => {
     }
     return res.json(payout);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     return res.status(500).json({ error: `Failed to get payout: ${err.message}` });
   }
 });
@@ -242,7 +243,7 @@ router.put('/:id', authAdmin, async (req, res) => {
     await doc.update(raw);
     res.json(doc);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json(null);
   }
 });

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

@@ -128,7 +128,7 @@ router.get('/', auth, async (req, res) => {
 
     res.json({ count, list, paging: { page, pageSize } });
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.json({ count: 0, list: [], paging: { page, pageSize } });
   }
 });
@@ -272,7 +272,7 @@ router.post('/stash', auth, async (req, res) => {
     }
     res.json(doc);
   } catch (err) {
-    console.error(err);
+    logger.error(err);
     res.status(500).json({ error: err.message });
   }
 });

package/api/src/routes/settings.ts

@@ -1,12 +1,18 @@
 import { Router } from 'express';
 import pick from 'lodash/pick';
-import type { WhereOptions } from 'sequelize';
+import { Op, type WhereOptions } from 'sequelize';
 
+import Joi from 'joi';
+import { merge } from 'lodash';
 import { PaymentCurrency } from '../store/models/payment-currency';
 import { PaymentMethod } from '../store/models/payment-method';
+import { authenticate } from '../libs/security';
+import { Setting } from '../store/models';
+import logger from '../libs/logger';
+import { createListParamSchema, getWhereFromKvQuery } from '../libs/api';
 
 const router = Router();
-
+const authAdmin = authenticate<Setting>({ component: true, roles: ['owner', 'admin'] });
 router.get('/', async (req, res) => {
   const attributes = ['id', 'name', 'symbol', 'decimal', 'logo', 'payment_method_id', 'maximum_precision'];
   const where: WhereOptions<PaymentMethod> = { livemode: req.livemode, active: true };
@@ -35,4 +41,247 @@ router.get('/', async (req, res) => {
   });
 });
 
+const donateListSchema = createListParamSchema<{
+  active?: boolean;
+  mountLocation?: string;
+  description?: string;
+  componentDid?: string;
+}>({
+  active: Joi.boolean().empty(''),
+  mountLocation: Joi.string().empty(''),
+  description: Joi.string().empty(''),
+  componentDid: Joi.string().empty(''),
+});
+
+router.get('/donate', async (req, res) => {
+  try {
+    const { page, pageSize, mountLocation, description, componentDid, ...query } = await donateListSchema.validateAsync(
+      req.query,
+      { stripUnknown: false, allowUnknown: true }
+    );
+
+    const where = {
+      type: 'donate',
+      ...getWhereFromKvQuery(query.q),
+    };
+
+    if (typeof query.active === 'boolean') {
+      where.active = query.active;
+    }
+    if (mountLocation) {
+      where.mount_location = mountLocation;
+    }
+    if (description) {
+      where.description = description;
+    }
+    if (componentDid) {
+      where.component_did = componentDid;
+    }
+
+    const { rows: list, count } = await Setting.findAndCountAll({
+      where,
+      order: [['created_at', query.o === 'asc' ? 'ASC' : 'DESC']],
+      offset: (page - 1) * pageSize,
+      limit: pageSize,
+      distinct: true,
+    });
+
+    return res.json({ count, list, paging: { page, pageSize } });
+  } catch (err) {
+    logger.error(err);
+    return res.status(400).json({ error: err.message });
+  }
+});
+
+router.get('/donate/:mountLocationOrId', async (req, res) => {
+  try {
+    if (!req.params.mountLocationOrId) {
+      return res.status(400).json({ error: 'mountLocation is required' });
+    }
+    const settings = await Setting.findOne({
+      where: {
+        type: 'donate',
+        [Op.or]: [{ mount_location: req.params.mountLocationOrId }, { id: req.params.mountLocationOrId }],
+      },
+    });
+    return res.json(settings);
+  } catch (err) {
+    logger.error(err);
+    return res.status(400).json({ error: err.message });
+  }
+});
+
+const SettingSchema = Joi.object({
+  type: Joi.string().required(),
+  mountLocation: Joi.string().required(),
+  settings: Joi.object().optional(),
+  active: Joi.boolean().optional(),
+  description: Joi.string().required(),
+  livemode: Joi.boolean().optional(),
+  componentDid: Joi.string().optional(),
+}).unknown(true);
+router.post('/', async (req, res) => {
+  try {
+    const { error } = SettingSchema.validate(req.body);
+    if (error) {
+      return res.status(400).json({ error: error.message });
+    }
+    const { type, mountLocation, settings = {}, active = true, description, livemode = true, componentDid } = req.body;
+    const raw = {
+      type,
+      mount_location: mountLocation,
+      description,
+      active,
+      livemode,
+      settings: settings || {},
+      component_did: componentDid,
+    };
+    if (type === 'donate') {
+      const defaultSetting = {
+        amount: {
+          presets: ['1', '5', '10'],
+          preset: '1',
+          minimum: '0.01',
+          maximum: '100',
+          custom: true,
+        },
+        btnText: 'Donate',
+        historyType: 'avatar',
+      };
+
+      if (settings?.amount) {
+        const amountSchema = Joi.object({
+          presets: Joi.array()
+            .items(Joi.string())
+            .when('custom', { is: false, then: Joi.required(), otherwise: Joi.optional() }),
+          preset: Joi.string().optional(),
+          minimum: Joi.string().when('custom', { is: true, then: Joi.required() }),
+          maximum: Joi.string().when('custom', { is: true, then: Joi.required() }),
+          custom: Joi.boolean().required(),
+        });
+
+        const { error: amountError } = amountSchema.validate(settings.amount);
+        if (amountError) {
+          return res.status(400).json({ error: amountError.message });
+        }
+      }
+
+      raw.settings = merge({}, defaultSetting, settings);
+      if (settings.amount) {
+        raw.settings.amount = settings.amount;
+      }
+    }
+    const exist = await Setting.findOne({
+      where: {
+        type,
+        mount_location: mountLocation,
+      },
+    });
+    if (exist) {
+      if (exist.component_did !== componentDid) {
+        await exist.update({
+          component_did: componentDid,
+        });
+      }
+      return res.json(exist);
+    }
+    const doc = await Setting.create(raw);
+    return res.json(doc);
+  } catch (err) {
+    logger.error(err);
+    return res.status(400).json({ error: err.message });
+  }
+});
+
+const UpdateSettingSchema = Joi.object({
+  settings: Joi.object().optional(),
+  active: Joi.boolean().optional(),
+  description: Joi.string().optional(),
+}).unknown(true);
+router.put('/:mountLocationOrId', authAdmin, async (req, res) => {
+  try {
+    const { error } = UpdateSettingSchema.validate(req.body);
+    if (error) {
+      return res.status(400).json({ error: error.message });
+    }
+    const { settings = {}, active = true, description } = req.body;
+    const raw: {
+      active: boolean;
+      settings: Record<string, any>;
+      description?: string;
+    } = {
+      active,
+      settings: settings || {},
+    };
+    if (description) {
+      raw.description = description;
+    }
+    const setting = await Setting.findOne({
+      where: {
+        [Op.or]: [
+          {
+            id: req.params.mountLocationOrId,
+          },
+          {
+            mount_location: req.params.mountLocationOrId,
+          },
+        ],
+      },
+    });
+    if (!setting) {
+      return res.status(404).json({ error: 'Setting not found' });
+    }
+    raw.settings = merge({}, setting.settings, settings);
+    if (setting.type === 'donate') {
+      if (settings?.amount) {
+        const amountSchema = Joi.object({
+          presets: Joi.array()
+            .items(Joi.string())
+            .when('custom', { is: false, then: Joi.required(), otherwise: Joi.optional() }),
+          preset: Joi.string().optional(),
+          minimum: Joi.string().when('custom', { is: true, then: Joi.required() }),
+          maximum: Joi.string().when('custom', { is: true, then: Joi.required() }),
+          custom: Joi.boolean().required(),
+        });
+
+        const { error: amountError } = amountSchema.validate(settings.amount);
+        if (amountError) {
+          return res.status(400).json({ error: amountError.message });
+        }
+        raw.settings.amount = settings.amount;
+      }
+    }
+    const doc = await setting.update(raw);
+    return res.json(doc);
+  } catch (err) {
+    logger.error(err);
+    return res.status(400).json({ error: err.message });
+  }
+});
+
+router.delete('/:mountLocationOrId', authAdmin, async (req, res) => {
+  try {
+    const setting = await Setting.findOne({
+      where: {
+        [Op.or]: [
+          {
+            id: req.params.mountLocationOrId,
+          },
+          {
+            mount_location: req.params.mountLocationOrId,
+          },
+        ],
+      },
+    });
+    if (!setting) {
+      return res.status(404).json({ error: `Setting ${req.params.mountLocationOrId} not found` });
+    }
+    await setting.destroy();
+    return res.json({ message: `Setting ${req.params.mountLocationOrId} deleted` });
+  } catch (err) {
+    logger.error(err);
+    return res.status(400).json({ error: err.message });
+  }
+});
+
 export default router;