payment-kit 1.22.10 → 1.22.11

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

@@ -1470,7 +1470,10 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
       req.body.payment_method,
       req.body.payment_currency
     );
-    await checkoutSession.update({ currency_id: paymentCurrency.id });
+    await checkoutSession.update({
+      currency_id: paymentCurrency.id,
+      metadata: { ...checkoutSession.metadata, preferred_locale: req.locale },
+    });
 
     let customer = await Customer.findOne({ where: { did: req.user.did } });
     if (!customer) {

package/api/src/routes/index.ts

@@ -34,6 +34,7 @@ import usageRecords from './usage-records';
 import webhookAttempts from './webhook-attempts';
 import webhookEndpoints from './webhook-endpoints';
 import vendor from './vendor';
+import tool from './tool';
 
 const router = Router();
 
@@ -89,5 +90,6 @@ router.use('/usage-records', usageRecords);
 router.use('/webhook-attempts', webhookAttempts);
 router.use('/webhook-endpoints', webhookEndpoints);
 router.use('/vendors', vendor);
+router.use('/tool', tool);
 
 export default router;

package/api/src/routes/tool.ts

@@ -0,0 +1,35 @@
+import dayjs from 'dayjs';
+import { Router } from 'express';
+import Joi from 'joi';
+
+import { authenticate } from '../libs/security';
+import { formatToShortUrl } from '../libs/url';
+import { CheckoutSession } from '../store/models';
+
+const loginAuth = authenticate<CheckoutSession>({ component: false, ensureLogin: true, mine: true });
+
+const router = Router();
+
+const shortUrlSchema = Joi.object({
+  url: Joi.string().uri().required(),
+  timeoutMin: Joi.number().optional(),
+  maxVisits: Joi.number().optional(),
+});
+
+router.get('/short-url', loginAuth, 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 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/api/src/routes/vendor.ts

@@ -476,8 +476,12 @@ async function processVendorOrders(
   return {
     payment_status: doc.payment_status,
     session_status: doc.status,
+    preferred_locale: doc.metadata?.preferred_locale,
     vendors: await Promise.all(vendors),
     subscriptionId: doc.subscription_id,
+    data: {
+      preferredLocale: doc.metadata?.preferred_locale,
+    },
     error: null,
   };
 }

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.22.10",
+  "version": "1.22.11",
   "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.1",
     "@blocklet/logger": "^1.17.1",
-    "@blocklet/payment-broker-client": "1.22.10",
-    "@blocklet/payment-react": "1.22.10",
-    "@blocklet/payment-vendor": "1.22.10",
+    "@blocklet/payment-broker-client": "1.22.11",
+    "@blocklet/payment-react": "1.22.11",
+    "@blocklet/payment-vendor": "1.22.11",
     "@blocklet/sdk": "^1.17.1",
     "@blocklet/ui-react": "^3.2.1",
     "@blocklet/uploader": "^0.3.8",
@@ -129,7 +129,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.17.1",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.22.10",
+    "@blocklet/payment-types": "1.22.11",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -176,5 +176,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "6f1df451a18678f0398b13a7120305f8deb0c6f4"
+  "gitHead": "d90e964e8aba2c288fe2960365df20f4159a56a1"
 }