payment-kit 1.21.11 → 1.21.13

package/api/src/integrations/stripe/handlers/subscription.ts

@@ -111,6 +111,14 @@ export async function handleSubscriptionEvent(event: TEventExpanded, _: Stripe)
       fields.push('trial_end');
     }
 
+    const isPaused = event.data.object.pause_collection && event.data.object.pause_collection.behavior === 'void';
+    const currentMethod = await PaymentMethod.findByPk(subscription.default_payment_method_id);
+    if (isPaused && currentMethod?.type !== 'stripe') {
+      logger.info('subscription paused on stripe event and payment method is not stripe, skip update', {
+        id: subscription.id,
+      });
+      return;
+    }
     await finalizeStripeSubscriptionUpdate({
       subscription,
       updates: pick(event.data.object, fields),
@@ -128,6 +136,11 @@ export async function handleSubscriptionEvent(event: TEventExpanded, _: Stripe)
       })),
     });
 
+    logger.info('subscription updated on stripe event', {
+      id: subscription.id,
+      updates: pick(event.data.object, fields),
+    });
+
     return;
   }
 

package/api/src/routes/connect/re-stake.ts

@@ -1,5 +1,5 @@
 import type { CallbackArgs } from '../../libs/auth';
-import { type TLineItemExpanded } from '../../store/models';
+import { PaymentMethod, type TLineItemExpanded } from '../../store/models';
 import { ensureReStakeContext, executeOcapTransactions, getAuthPrincipalClaim, getStakeTxClaim } from './shared';
 import { ensureStakeInvoice } from '../../libs/invoice';
 import logger from '../../libs/logger';
@@ -81,6 +81,18 @@ export default {
         customer!
       );
 
+      if (subscription.payment_details?.stripe?.subscription_id) {
+        const method = await PaymentMethod.findOne({ where: { type: 'stripe', livemode: subscription.livemode } });
+        if (method) {
+          const client = method.getStripeClient();
+          await client.subscriptions.update(subscription.payment_details.stripe.subscription_id, {
+            cancel_at_period_end: false,
+          });
+          await client.subscriptions.update(subscription.payment_details.stripe.subscription_id, {
+            cancel_at: null,
+          });
+        }
+      }
       await subscription.update({
         cancel_at_period_end: false,
         cancel_at: 0,

package/api/src/routes/subscriptions.ts

@@ -83,8 +83,8 @@ const authPortal = authenticate<Subscription>({
 
 const updateStripeSubscription = async (doc: Subscription, updates: any) => {
   if (doc.payment_details?.stripe?.subscription_id) {
-    const method = await PaymentMethod.findByPk(doc.default_payment_method_id);
-    if (method && method.type === 'stripe') {
+    const method = await PaymentMethod.findOne({ where: { type: 'stripe', livemode: doc.livemode } });
+    if (method) {
       const client = method.getStripeClient();
       await client.subscriptions.update(doc.payment_details.stripe.subscription_id, updates);
     }
@@ -533,14 +533,20 @@ router.put('/:id/recover', authPortal, async (req, res) => {
     }
   }
 
-  if (doc.cancel_at_period_end) {
-    await updateStripeSubscription(doc, { cancel_at_period_end: false });
-  } else {
-    await updateStripeSubscription(doc, { cancel_at: null });
-  }
+  const updates: any = {
+    cancel_at_period_end: false,
+    cancel_at: 0,
+  };
+
+  await updateStripeSubscription(doc, { cancel_at_period_end: false });
+  await updateStripeSubscription(doc, { cancel_at: null });
 
   // @ts-ignore
-  await doc.update({ cancel_at_period_end: false, cancel_at: 0, canceled_at: 0, cancelation_details: null });
+  await doc.update({
+    ...updates,
+    cancelation_details: null,
+    canceled_at: 0,
+  });
   await new SubscriptionWillCanceledSchedule().deleteScheduleSubscriptionJobs([doc]);
   // reschedule jobs
   subscriptionQueue

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.21.11",
+  "version": "1.21.13",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -56,9 +56,9 @@
     "@blocklet/error": "^0.2.5",
     "@blocklet/js-sdk": "^1.16.53-beta-20251011-054719-4ed2f6b7",
     "@blocklet/logger": "^1.16.53-beta-20251011-054719-4ed2f6b7",
-    "@blocklet/payment-broker-client": "1.21.11",
-    "@blocklet/payment-react": "1.21.11",
-    "@blocklet/payment-vendor": "1.21.11",
+    "@blocklet/payment-broker-client": "1.21.13",
+    "@blocklet/payment-react": "1.21.13",
+    "@blocklet/payment-vendor": "1.21.13",
     "@blocklet/sdk": "^1.16.53-beta-20251011-054719-4ed2f6b7",
     "@blocklet/ui-react": "^3.1.46",
     "@blocklet/uploader": "^0.2.15",
@@ -128,7 +128,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.53-beta-20251011-054719-4ed2f6b7",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.21.11",
+    "@blocklet/payment-types": "1.21.13",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -175,5 +175,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "8a8bfd7810c58143314585fd31bad3c97637a761"
+  "gitHead": "b101cbdeded522328ac7c5ccd2ba44930467fe25"
 }