payment-kit 1.13.76 → 1.13.78

package/api/src/routes/subscriptions.ts

@@ -389,28 +389,22 @@ router.put('/:id', auth, async (req, res) => {
     if (!subscription) {
       return res.status(404).json({ error: 'Subscription not found' });
     }
-    if (['trailing', 'active'].includes(subscription.status) === false) {
-      return res.status(400).json({ error: 'Subscription can only be updated when in trailing or active mode' });
-    }
-
-    const lastInvoice = await Invoice.findByPk(subscription.latest_invoice_id);
-    if (!lastInvoice) {
-      throw new Error('Subscription should have latest invoice');
-    }
-    const paymentCurrency = await PaymentCurrency.findByPk(subscription.currency_id);
-    if (!paymentCurrency) {
-      throw new Error('Subscription should have payment currency');
-    }
-    const customer = await Customer.findByPk(subscription.customer_id);
-    if (!customer) {
-      throw new Error('Subscription should have customer');
-    }
 
     // handle updates
     const updates: Partial<TSubscription> = {};
     if (req.body.metadata) {
       updates.metadata = formatMetadata(req.body.metadata);
     }
+    if (subscription.isImmutable()) {
+      if (updates.metadata) {
+        await subscription.update(updates);
+        return res.json({ subscription });
+      }
+      return res.status(400).json({ error: 'Only metadata can be updated when subscription is immutable' });
+    }
+    if (subscription.isActive() === false) {
+      return res.status(400).json({ error: 'Subscription can only be updated when active' });
+    }
     if (req.body.description) {
       updates.description = req.body.description;
     }
@@ -421,6 +415,19 @@ router.put('/:id', auth, async (req, res) => {
       updates.proration_behavior = req.body.proration_behavior;
     }
 
+    const lastInvoice = await Invoice.findByPk(subscription.latest_invoice_id);
+    if (!lastInvoice) {
+      throw new Error('Subscription should have latest invoice');
+    }
+    const paymentCurrency = await PaymentCurrency.findByPk(subscription.currency_id);
+    if (!paymentCurrency) {
+      throw new Error('Subscription should have payment currency');
+    }
+    const customer = await Customer.findByPk(subscription.customer_id);
+    if (!customer) {
+      throw new Error('Subscription should have customer');
+    }
+
     let invoice: Invoice;
 
     await sequelize.transaction({ isolationLevel: Transaction.ISOLATION_LEVELS.READ_UNCOMMITTED }, async () => {
@@ -677,7 +684,7 @@ router.put('/:id', auth, async (req, res) => {
 // Clean up subscriptions that have invalid invoices and payments
 router.delete('/cleanup', auth, async (req, res) => {
   const status = String(req.query.status || 'uncollectible');
-  if (['open', 'uncollectible'].includes(status)) {
+  if (['open', 'uncollectible'].includes(status) === false) {
     res.json({ error: 'status must be either open or uncollectible' });
     return;
   }

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.76",
+  "version": "1.13.78",
   "scripts": {
     "dev": "COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -109,7 +109,7 @@
     "@abtnode/types": "^1.16.20",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.76",
+    "@did-pay/types": "1.13.78",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -148,5 +148,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "427ec4dcacd33fb24528e5f97c0a4f78c64d8cf2"
+  "gitHead": "a92496a9ecca1977ef963241fae4d2ac79510dbd"
 }