payment-kit 1.13.23 → 1.13.24

package/api/src/jobs/event.ts

@@ -1,11 +1,13 @@
 import { Op } from 'sequelize';
 
+import { events } from '../libs/event';
 import logger from '../libs/logger';
 import createQueue from '../libs/queue';
+import { getWebhookJobId } from '../libs/util';
 import { Event } from '../store/models/event';
 import { WebhookAttempt } from '../store/models/webhook-attempt';
 import { WebhookEndpoint } from '../store/models/webhook-endpoint';
-import { getJobId, webhookQueue } from './webhook';
+import { webhookQueue } from './webhook';
 
 type EventJob = {
   eventId: string;
@@ -43,7 +45,7 @@ export const handleEvent = async (job: EventJob) => {
     if (!attempted) {
       logger.info('schedule initial attempt for event', job);
       webhookQueue.push({
-        id: getJobId(event.id, webhook.id),
+        id: getWebhookJobId(event.id, webhook.id),
         job: { eventId: event.id, webhookId: webhook.id },
       });
     }
@@ -60,14 +62,14 @@ export const eventQueue = createQueue<EventJob>({
 });
 
 export const startEventQueue = async () => {
-  const events = await Event.findAll({
+  const docs = await Event.findAll({
     where: {
       pending_webhooks: { [Op.gt]: 0 },
     },
     attributes: ['id'],
   });
 
-  events.forEach(async (x) => {
+  docs.forEach(async (x) => {
     const exist = await eventQueue.get(x.id);
     if (!exist) {
       eventQueue.push({ id: x.id, job: { eventId: x.id } });
@@ -78,3 +80,7 @@ export const startEventQueue = async () => {
 eventQueue.on('failed', ({ id, job, error }) => {
   logger.error('event job failed', { id, job, error });
 });
+
+events.on('event.created', (event) => {
+  eventQueue.push({ id: event.id, job: { eventId: event.id } });
+});

package/api/src/jobs/webhook.ts

@@ -4,8 +4,10 @@ import axios, { AxiosError } from 'axios';
 import { wallet } from '../libs/auth';
 import logger from '../libs/logger';
 import createQueue from '../libs/queue';
-import { MAX_RETRY_COUNT, getNextRetry, md5 } from '../libs/util';
+import { MAX_RETRY_COUNT, getNextRetry, getWebhookJobId } from '../libs/util';
+import { Customer } from '../store/models/customer';
 import { Event } from '../store/models/event';
+import { PaymentCurrency } from '../store/models/payment-currency';
 import { WebhookAttempt } from '../store/models/webhook-attempt';
 import { WebhookEndpoint } from '../store/models/webhook-endpoint';
 
@@ -14,10 +16,6 @@ type WebhookJob = {
   webhookId: string;
 };
 
-export const getJobId = (eventId: string, webhookId: string) => {
-  return md5([eventId, webhookId].join('-'));
-};
-
 // https://stripe.com/docs/webhooks
 export const handleWebhook = async (job: WebhookJob) => {
   logger.info('handle webhook', job);
@@ -45,16 +43,27 @@ export const handleWebhook = async (job: WebhookJob) => {
   const retryCount = lastRetryCount ? +lastRetryCount + 1 : 1;
 
   try {
+    const json = event.toJSON();
+
+    // expand basic fields
+    const { object } = json.data;
+    if (object.customer_id && !object.customer) {
+      object.customer = await Customer.findByPk(object.customer_id);
+    }
+    if (object.currency_id && !object.currency) {
+      object.currency = await PaymentCurrency.findByPk(object.currency_id);
+    }
+
     // verify similar to component call, but supports external urls
     const result = await axios({
       url: webhook.url,
       method: 'POST',
       timeout: 60 * 1000,
-      data: event.toJSON(),
+      data: json,
       headers: {
         'x-app-id': wallet.address,
         'x-app-pk': wallet.publicKey,
-        'x-component-sig': sign(event.toJSON()),
+        'x-component-sig': sign(json),
         'x-component-did': process.env.BLOCKLET_COMPONENT_DID as string,
       },
     });
@@ -87,7 +96,7 @@ export const handleWebhook = async (job: WebhookJob) => {
     if (retryCount < MAX_RETRY_COUNT) {
       process.nextTick(() => {
         webhookQueue.push({
-          id: getJobId(event.id, webhook.id),
+          id: getWebhookJobId(event.id, webhook.id),
           job: { eventId: event.id, webhookId: webhook.id },
           runAt: getNextRetry(retryCount),
         });

package/api/src/libs/audit.ts

@@ -1,7 +1,7 @@
 import pick from 'lodash/pick';
 
-import { eventQueue } from '../jobs/event';
 import { Event } from '../store/models/event';
+import { events } from './event';
 
 export async function createEvent(scope: string, type: string, model: any, options: any) {
   // console.log('createEvent', scope, type, model, options);
@@ -28,7 +28,7 @@ export async function createEvent(scope: string, type: string, model: any, optio
     pending_webhooks: 99, // force all events goto the event queue
   });
 
-  eventQueue.push({ id: event.id, job: { eventId: event.id } });
+  events.emit('event.created', { id: event.id });
 }
 
 export async function createStatusEvent(
@@ -69,5 +69,5 @@ export async function createStatusEvent(
     pending_webhooks: 99, // force all events goto the event queue
   });
 
-  eventQueue.push({ id: event.id, job: { eventId: event.id } });
+  events.emit('event.created', { id: event.id });
 }

package/api/src/libs/event.ts

@@ -0,0 +1,3 @@
+import EventEmitter from 'events';
+
+export const events = new EventEmitter();

package/api/src/libs/util.ts

@@ -66,6 +66,7 @@ export function createCodeGenerator(prefix: string, size: number = 24) {
   return prefix ? () => `${prefix}_${generator()}` : generator;
 }
 
+// FIXME: merge with old metadata
 export function formatMetadata(metadata?: Record<string, any>): Record<string, any> {
   if (!metadata) {
     return {};
@@ -137,3 +138,7 @@ export const getNextRetry = (retryCount: number) => {
   const now = dayjs().unix();
   return now + delay;
 };
+
+export const getWebhookJobId = (eventId: string, webhookId: string) => {
+  return md5([eventId, webhookId].join('-'));
+};

package/api/src/routes/connect/pay.ts

@@ -8,7 +8,7 @@ import dayjs from '../../libs/dayjs';
 import { ensureInvoiceForCheckout, ensurePaymentIntent, getAuthPrincipalClaim } from './shared';
 
 export default {
-  action: 'pay',
+  action: 'payment',
   authPrincipal: false,
   claims: {
     authPrincipal: async ({ extraParams }: CallbackArgs) => {

package/api/src/routes/subscriptions.ts

@@ -8,6 +8,7 @@ import dayjs from '../libs/dayjs';
 import logger from '../libs/logger';
 import { authenticate } from '../libs/security';
 import { expandLineItems } from '../libs/session';
+import { formatMetadata } from '../libs/util';
 import { Customer } from '../store/models/customer';
 import { PaymentCurrency } from '../store/models/payment-currency';
 import { PaymentMethod } from '../store/models/payment-method';
@@ -302,4 +303,18 @@ router.put('/:id/resume', auth, async (req, res) => {
   return res.json(doc);
 });
 
+router.put('/:id', auth, async (req, res) => {
+  const doc = await Subscription.findByPk(req.params.id);
+
+  if (!doc) {
+    return res.status(404).json({ error: 'Subscription not found' });
+  }
+
+  if (req.body.metadata) {
+    await doc.update({ metadata: formatMetadata(req.body.metadata) });
+  }
+
+  return res.json(doc);
+});
+
 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.13.23
+version: 1.13.24
 logo: logo.png
 files:
   - dist
@@ -40,7 +40,7 @@ payment:
 timeout:
   start: 60
 requirements:
-  server: '>=1.16.15'
+  server: '>=1.16.10'
   os: '*'
   cpu: '*'
 scripts:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.23",
+  "version": "1.13.24",
   "scripts": {
     "dev": "blocklet dev",
     "eject": "vite eject",
@@ -64,6 +64,7 @@
     "axios": "^0.27.2",
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
+    "copy-to-clipboard": "^3.3.3",
     "cors": "^2.8.5",
     "dayjs": "^1.11.10",
     "dotenv-flow": "^3.3.0",
@@ -100,7 +101,7 @@
   "devDependencies": {
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.23",
+    "@did-pay/types": "1.13.24",
     "@types/cookie-parser": "^1.4.4",
     "@types/cors": "^2.8.14",
     "@types/dotenv-flow": "^3.3.1",
@@ -137,5 +138,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "a4ba80b4e2d020c912361af6fd555f8bfc52f54f"
+  "gitHead": "abe08b8cb109399d3b53b985f628d9688b561c0c"
 }

package/src/components/blockchain/tx.tsx

@@ -38,6 +38,14 @@ const getTxLink = (method: TPaymentMethod, details: PaymentDetails) => {
 };
 
 export default function TxLink(props: { details: PaymentDetails; method: TPaymentMethod }) {
+  if (!props.details) {
+    return (
+      <Typography component="small" color="text.secondary">
+        None
+      </Typography>
+    );
+  }
+
   const { text, link } = getTxLink(props.method, props.details);
   return (
     <Link href={link} target="_blank" rel="noopener noreferrer">

package/src/components/payment-link/actions.tsx

@@ -2,7 +2,9 @@ import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Toast from '@arcblock/ux/lib/Toast';
 import type { TPaymentLinkExpanded } from '@did-pay/types';
 import { useSetState } from 'ahooks';
+import Copy from 'copy-to-clipboard';
 import type { LiteralUnion } from 'type-fest';
+import { joinURL } from 'ufo';
 
 import api from '../../libs/api';
 import { formatError } from '../../libs/util';
@@ -54,7 +56,7 @@ export default function PaymentLinkActions({ data, variant, onChange }: Props) {
       setState({ loading: false, action: '' });
     }
   };
-  const noRemove = async () => {
+  const onRemove = async () => {
     try {
       setState({ loading: true });
       await api.delete(`/api/payment-links/${data.id}`).then((res) => res.data);
@@ -67,18 +69,27 @@ export default function PaymentLinkActions({ data, variant, onChange }: Props) {
       setState({ loading: false, action: '' });
     }
   };
+  const onCopyLink = () => {
+    Copy(joinURL(window.blocklet.appUrl, window.blocklet.prefix, `/checkout/pay/${data.id}`));
+    Toast.success(t('common.copied'));
+  };
 
   return (
     <ClickBoundary>
       <Actions
         variant={variant}
         actions={[
-          // {
-          //   label: t('admin.paymentLink.edit'),
-          //   handler: () => setState({ action: 'edit' }),
-          //   color: 'primary',
-          //   divider: true,
-          // },
+          {
+            label: t('admin.paymentLink.edit'),
+            handler: () => setState({ action: 'edit' }),
+            color: 'primary',
+            disabled: true,
+          },
+          {
+            label: t('admin.paymentLink.copyLink'),
+            handler: onCopyLink,
+            color: 'primary',
+          },
           { label: t('admin.paymentLink.rename'), handler: () => setState({ action: 'rename' }), color: 'primary' },
           { label: t('admin.paymentLink.archive'), handler: () => setState({ action: 'archive' }), color: 'primary' },
           { label: t('admin.paymentLink.remove'), handler: () => setState({ action: 'remove' }), color: 'error' },
@@ -103,7 +114,7 @@ export default function PaymentLinkActions({ data, variant, onChange }: Props) {
       )}
       {state.action === 'remove' && (
         <ConfirmDialog
-          onConfirm={noRemove}
+          onConfirm={onRemove}
           onCancel={() => setState({ action: '' })}
           title={t('admin.paymentLink.remove')}
           message={t('admin.paymentLink.removeTip')}

package/src/components/price/form.tsx

@@ -125,7 +125,10 @@ export default function PriceForm({ prefix, simple }: PriceFormProps) {
         <Controller
           name={getFieldName('unit_amount')}
           control={control}
-          rules={{ required: t('admin.price.unit_amount.required'), min: t('admin.price.unit_amount.positive') }}
+          rules={{
+            required: t('admin.price.unit_amount.required'),
+            validate: (v) => (Number(v) > 0 ? true : t('admin.price.unit_amount.positive')),
+          }}
           disabled={isLocked}
           render={({ field }) => (
             <Box>

package/src/libs/util.ts

@@ -132,11 +132,17 @@ export const formatProductPrice = (
   return 'No price';
 };
 
-export const formatPrice = (price: TPrice, currency: TPaymentCurrency, unit_label?: string, quantity: number = 1) => {
-  const amount = fromUnitToToken(
-    new BN(getPriceUintAmountByCurrency(price, currency)).mul(new BN(quantity)),
-    currency.decimal
-  ).toString();
+export const formatPrice = (
+  price: TPrice,
+  currency: TPaymentCurrency,
+  unit_label?: string,
+  quantity: number = 1,
+  bn: boolean = true
+) => {
+  const unit = getPriceUintAmountByCurrency(price, currency);
+  const amount = bn
+    ? fromUnitToToken(new BN(unit).mul(new BN(quantity)), currency.decimal).toString()
+    : +unit * quantity;
   if (price?.type === 'recurring' && price.recurring) {
     const recurring = formatRecurring(price.recurring, false, '/');
 

package/src/locales/en.tsx

@@ -44,6 +44,7 @@ export default flat({
     loadMore: 'View more {resource}',
     loadingMore: 'Loading more {resource}...',
     noMore: 'No more {resource}',
+    copied: 'Copied',
     metadata: {
       label: 'Metadata',
       add: 'Add more metadata',
@@ -173,6 +174,7 @@ export default flat({
       info: 'Payment link information',
       add: 'Create payment link',
       save: 'Create link',
+      copyLink: 'Copy URL',
       saved: 'Payment link successfully saved',
       additional: 'Additional options',
       beforePay: 'Payment page',

package/src/pages/admin/products/products/create.tsx

@@ -34,7 +34,7 @@ export default function ProductsCreate() {
       metadata: [],
     },
   });
-  const { control, handleSubmit } = methods;
+  const { control, handleSubmit, getValues } = methods;
 
   const prices = useFieldArray({ control, name: 'prices' });
   const getPrice = (index: number) => methods.getValues().prices[index];
@@ -79,10 +79,14 @@ export default function ProductsCreate() {
                 expanded
                 style={{ fontWeight: 'bold', width: '50%' }}
                 addons={<PriceActions onDuplicate={() => prices.append(price)} onRemove={() => prices.remove(index)} />}
-                trigger={(expanded: boolean) =>
+                trigger={(expanded: boolean) => {
+                  if (expanded) {
+                    return t('admin.price.detail');
+                  }
+
                   // @ts-ignore
-                  expanded ? t('admin.price.detail') : formatPrice(getPrice(index), settings.baseCurrency)
-                }>
+                  return formatPrice(getPrice(index), settings.baseCurrency, getValues().unit_label, 1, false);
+                }}>
                 <PriceForm prefix={`prices.${index}`} />
               </Collapse>
               <Divider sx={{ mt: 2, mb: 4 }} />