payment-kit 1.22.14 → 1.22.15

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.22.14",
+  "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.14",
-    "@blocklet/payment-react": "1.22.14",
-    "@blocklet/payment-vendor": "1.22.14",
+    "@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.14",
+    "@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": "fc9395e0eaf4472b42192835fb4933da469939c6"
+  "gitHead": "4d8543567eb8958c55a8cf06d9031f3f64c57e27"
 }