payment-kit 1.13.138 → 1.13.140

package/api/src/routes/subscriptions.ts

@@ -228,25 +228,26 @@ router.put('/:id/cancel', authPortal, async (req, res) => {
       comment: `Requested by ${req.user?.role}:${req.user?.did}`,
     },
   };
+  const now = dayjs().unix() + 3;
   if (req.user?.via === 'portal') {
     updates.cancel_at_period_end = true;
     updates.cancel_at = subscription.current_period_end;
     updates.cancelation_details = { reason: 'cancellation_requested', feedback, comment };
-    updates.canceled_at = dayjs().unix();
+    updates.canceled_at = now;
     await addSubscriptionJob(subscription, 'cancel', true, updates.cancel_at);
   } else if (at === 'now') {
     updates.status = 'canceled';
-    updates.cancel_at = dayjs().unix();
-    updates.canceled_at = dayjs().unix();
+    updates.cancel_at = now;
+    updates.canceled_at = now;
     await addSubscriptionJob(subscription, 'cancel', true, updates.cancel_at);
   } else if (at === 'current_period_end') {
     updates.cancel_at_period_end = true;
     updates.cancel_at = subscription.current_period_end;
-    updates.canceled_at = dayjs().unix();
+    updates.canceled_at = now;
     await addSubscriptionJob(subscription, 'cancel', true, updates.cancel_at);
   } else {
     updates.cancel_at = dayjs(time).unix();
-    updates.canceled_at = dayjs().unix();
+    updates.canceled_at = now;
     await addSubscriptionJob(
       subscription,
       'cancel',
@@ -259,15 +260,20 @@ router.put('/:id/cancel', authPortal, async (req, res) => {
     const method = await PaymentMethod.findByPk(subscription.default_payment_method_id);
     if (method && method.type === 'stripe') {
       const client = method.getStripeClient();
-      if (updates.cancel_at_period_end) {
-        await client.subscriptions.update(subscription.payment_details.stripe.subscription_id, {
-          cancel_at_period_end: updates.cancel_at_period_end,
-        });
-      } else {
-        await client.subscriptions.update(subscription.payment_details.stripe.subscription_id, {
-          cancel_at: updates.cancel_at,
-          proration_behavior: 'none',
-        });
+      try {
+        if (updates.cancel_at_period_end) {
+          await client.subscriptions.update(subscription.payment_details.stripe.subscription_id, {
+            cancel_at_period_end: updates.cancel_at_period_end,
+          });
+        } else {
+          await client.subscriptions.update(subscription.payment_details.stripe.subscription_id, {
+            cancel_at: updates.cancel_at,
+            proration_behavior: 'none',
+          });
+        }
+      } catch (err) {
+        // FIXME: how do we handle failure here?
+        logger.error('subscription cancel failed on stripe', { subscription: req.params.id, updates, error: err });
       }
     }
   }
@@ -619,9 +625,6 @@ router.put('/:id', authPortal, async (req, res) => {
     if (!paymentMethod) {
       throw new Error('Subscription should have payment method');
     }
-    if (paymentMethod.type === 'stripe') {
-      throw new Error('Update is not supported for subscriptions paid with stripe');
-    }
 
     const paymentCurrency = await PaymentCurrency.findByPk(subscription.currency_id);
     if (!paymentCurrency) {
@@ -643,6 +646,10 @@ router.put('/:id', authPortal, async (req, res) => {
     }
 
     if (Array.isArray(req.body.items) && req.body.items.length > 0) {
+      if (paymentMethod.type === 'stripe') {
+        throw new Error('Update is not supported for subscriptions paid with stripe');
+      }
+
       // validate the request
       const { existingItems, addedItems, updatedItems, deletedItems, newItems } =
         await validateSubscriptionUpdateRequest(subscription, req.body.items);

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.138",
+  "version": "1.13.140",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev --open",
     "eject": "vite eject",
@@ -50,7 +50,7 @@
     "@arcblock/jwt": "^1.18.110",
     "@arcblock/ux": "^2.9.29",
     "@blocklet/logger": "1.16.23",
-    "@blocklet/payment-react": "1.13.138",
+    "@blocklet/payment-react": "1.13.140",
     "@blocklet/sdk": "1.16.23",
     "@blocklet/ui-react": "^2.9.29",
     "@blocklet/uploader": "^0.0.73",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.23",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.138",
+    "@blocklet/payment-types": "1.13.140",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "2865a4ed4a06029cd97a4f0914c1c3c61b5182cb"
+  "gitHead": "7b3ce2e76dfaab3fb7a445c014b73d898cbd5481"
 }