payment-kit 1.15.14 → 1.15.15

package/api/src/integrations/stripe/resource.ts

@@ -326,6 +326,9 @@ export async function forwardUsageRecordToStripe(
   if (!method) {
     return null;
   }
+  if (method.type !== 'stripe') {
+    return null;
+  }
 
   const client = method.getStripeClient();
   const result = await client.subscriptionItems.createUsageRecord(subscriptionItem.metadata.stripe_id, {

package/api/src/routes/subscriptions.ts

@@ -510,7 +510,7 @@ router.put('/:id/resume', auth, async (req, res) => {
   if (!doc) {
     return res.status(404).json({ error: 'Subscription not found' });
   }
-  if (doc.status !== 'paused') {
+  if (doc.status !== 'paused' || doc.pause_collection === null) {
     return res.status(400).json({ error: 'Subscription not paused' });
   }
 
@@ -1486,22 +1486,6 @@ router.post('/:id/change-payment', authPortal, async (req, res) => {
         });
       }
     } else {
-      // changing from stripe to crypto: pause stripe subscription
-      if (previousPaymentMethod!.type === 'stripe') {
-        const client = await previousPaymentMethod?.getStripeClient();
-        const stripeSubscriptionId = subscription.payment_details?.stripe?.subscription_id as string;
-        const result = await client?.subscriptions.update(stripeSubscriptionId, {
-          pause_collection: {
-            behavior: 'void',
-          },
-        });
-        logger.info('stripe subscription paused on payment change', {
-          subscription: subscription.id,
-          stripeSubscription: stripeSubscriptionId,
-          result,
-        });
-      }
-
       // changing from crypto to crypto: just update the subscription
       delegation = await isDelegationSufficientForPayment({
         paymentMethod,
@@ -1528,6 +1512,23 @@ router.post('/:id/change-payment', authPortal, async (req, res) => {
           intent: setupIntent.id,
         });
       }
+
+      // NOTE: this should only happen when local subscription is updated
+      // changing from stripe to crypto: pause stripe subscription
+      if (previousPaymentMethod!.type === 'stripe') {
+        const client = await previousPaymentMethod?.getStripeClient();
+        const stripeSubscriptionId = subscription.payment_details?.stripe?.subscription_id as string;
+        const result = await client?.subscriptions.update(stripeSubscriptionId, {
+          pause_collection: {
+            behavior: 'void',
+          },
+        });
+        logger.info('stripe subscription paused on payment change', {
+          subscription: subscription.id,
+          stripeSubscription: stripeSubscriptionId,
+          result,
+        });
+      }
     }
 
     return res.json({

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.15.14",
+  "version": "1.15.15",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -52,7 +52,7 @@
     "@arcblock/validator": "^1.18.135",
     "@blocklet/js-sdk": "^1.16.32",
     "@blocklet/logger": "^1.16.32",
-    "@blocklet/payment-react": "1.15.14",
+    "@blocklet/payment-react": "1.15.15",
     "@blocklet/sdk": "^1.16.32",
     "@blocklet/ui-react": "^2.10.39",
     "@blocklet/uploader": "^0.1.40",
@@ -118,7 +118,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.32",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.15.14",
+    "@blocklet/payment-types": "1.15.15",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "0e93a9f3a6dfd750b07b4ba05be018ae54919b30"
+  "gitHead": "a4661fedeb5c77d1c89736f9030f89cb2fc03474"
 }

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

@@ -110,7 +110,7 @@ function SubscriptionActionsInner({ data, variant, onChange }: Props) {
       color: 'primary',
       disabled: data.status === 'canceled',
     },
-    data.status === 'paused' ? resume : pause,
+    data.status === 'paused' || data.pause_collection ? resume : pause,
     {
       label: t('admin.subscription.cancel.title'),
       handler: () => setState({ action: 'cancel' }),