payment-kit 1.22.13 → 1.22.15

package/api/src/libs/notification/template/subscription-canceled.ts

@@ -162,7 +162,9 @@ export class SubscriptionCanceledEmailTemplate extends BaseSubscriptionEmailTemp
     ];
 
     const matchedCondition = conditions.find((item) => item.condition);
-    return matchedCondition ? translate(matchedCondition.key, locale) : '';
+    return matchedCondition
+      ? translate(matchedCondition.key, locale)
+      : translate('notification.subscriptionCanceled.adminCanceled', locale);
   }
 
   async getTemplate(): Promise<BaseEmailTemplateType> {

package/api/src/queues/vendors/return-processor.ts

@@ -36,6 +36,12 @@ async function handleReturnProcessorJob(job: ReturnProcessorJob): Promise<void>
     }
 
     const vendorInfoList = checkoutSession.vendor_info as VendorInfo[];
+
+    if (!vendorInfoList || vendorInfoList.length === 0) {
+      logger.warn('No vendor info found', { checkoutSessionId });
+      return;
+    }
+
     let hasChanges = false;
 
     let i = -1;

package/api/src/queues/vendors/return-scanner.ts

@@ -68,6 +68,7 @@ async function findSessionsNeedingVendorReturn(): Promise<CheckoutSession[]> {
       where: {
         fulfillment_status: { [Op.notIn]: ['returning', 'returned', 'failed'] },
         subscription_id: { [Op.in]: canceledSubscriptionIds },
+        vendor_info: { [Op.not]: null as any },
       },
       order: [['updated_at', 'DESC']],
       limit: 100,
@@ -136,9 +137,12 @@ events.on('customer.subscription.deleted', async (subscription: Subscription) =>
 
   const session = await CheckoutSession.findOne({
     where: { subscription_id: subscription.id },
+    attributes: ['id', 'vendor_info'],
   });
 
-  if (session) {
+  const isVendor = session?.vendor_info && session.vendor_info.length > 0;
+
+  if (session && isVendor) {
     const id = `vendor-return-process-${session.id}`;
     // eslint-disable-next-line no-await-in-loop
     const exists = await vendorReturnProcessorQueue.get(id);

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.22.13",
+  "version": "1.22.15",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -57,9 +57,9 @@
     "@blocklet/error": "^0.3.2",
     "@blocklet/js-sdk": "^1.17.2",
     "@blocklet/logger": "^1.17.2",
-    "@blocklet/payment-broker-client": "1.22.13",
-    "@blocklet/payment-react": "1.22.13",
-    "@blocklet/payment-vendor": "1.22.13",
+    "@blocklet/payment-broker-client": "1.22.15",
+    "@blocklet/payment-react": "1.22.15",
+    "@blocklet/payment-vendor": "1.22.15",
     "@blocklet/sdk": "^1.17.2",
     "@blocklet/ui-react": "^3.2.6",
     "@blocklet/uploader": "^0.3.11",
@@ -129,7 +129,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.17.2",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.22.13",
+    "@blocklet/payment-types": "1.22.15",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -176,5 +176,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "20ea282ac9d84c8d5a0e9549484462a6d46aebd3"
+  "gitHead": "4d8543567eb8958c55a8cf06d9031f3f64c57e27"
 }

package/src/components/subscription/actions/cancel.tsx

@@ -55,7 +55,13 @@ export default function SubscriptionCancelForm({ data }: { data: TSubscriptionEx
   const { decimal, symbol } = data.paymentCurrency;
 
   return (
-    <Root sx={{ width: 400 }}>
+    <Root
+      sx={{
+        width: {
+          xs: '100%',
+          sm: 450,
+        },
+      }}>
       <Stack
         direction="row"
         spacing={3}
@@ -230,6 +236,42 @@ export default function SubscriptionCancelForm({ data }: { data: TSubscriptionEx
           )}
         </>
       )}
+      <Divider sx={{ my: 1 }} />
+      <Stack
+        direction="row"
+        spacing={3}
+        sx={{
+          alignItems: 'flex-start',
+        }}>
+        <Typography className="form-title">{t('admin.subscription.cancel.comment.title')}</Typography>
+        <Controller
+          name="cancel.comment"
+          control={control}
+          rules={{
+            required: t('common.required'),
+            validate: (value) => value.trim() !== '' || t('common.required'),
+          }}
+          render={({ field }) => (
+            <TextField
+              {...field}
+              variant="outlined"
+              size="small"
+              fullWidth
+              multiline
+              minRows={2}
+              maxRows={4}
+              placeholder={t('admin.subscription.cancel.comment.placeholder')}
+              error={!!(formState.errors as any)?.cancel?.comment}
+              helperText={(formState.errors as any)?.cancel?.comment?.message}
+              slotProps={{
+                htmlInput: {
+                  maxLength: 200,
+                },
+              }}
+            />
+          )}
+        />
+      </Stack>
     </Root>
   );
 }

package/src/components/subscription/actions/index.tsx

@@ -209,6 +209,7 @@ export default function SubscriptionActions(rawProps: Props) {
         refund: 'none',
         staking: 'none',
         slashReason: '',
+        comment: '',
       },
       pause: {
         type: 'never',

package/src/locales/en.tsx

@@ -1386,6 +1386,10 @@ export default flat({
             'The remaining stake of this subscription {unused}{symbol} will be slashed, please confirm to continue?',
           slashTitle: 'Slash stake',
         },
+        comment: {
+          title: 'Reason',
+          placeholder: 'Please provide the reason for cancellation',
+        },
       },
       pause: {
         title: 'Pause payment collection',

package/src/locales/zh.tsx

@@ -1352,6 +1352,10 @@ export default flat({
           slashTip: '该订阅剩余的质押部分 {unused}{symbol} 将被罚没, 请确认是否继续？',
           slashTitle: '罚没质押',
         },
+        comment: {
+          title: '原因',
+          placeholder: '请填写取消订阅的原因',
+        },
       },
       pause: {
         title: '暂停付款',