payment-kit 1.25.5 → 1.25.7

package/api/src/libs/wallet-migration.ts

@@ -34,11 +34,6 @@ export async function getMigratedFromList(client: OcapClient): Promise<string[]>
     cachedMigratedFrom &&
     cachedMigratedFrom.length > 0
   ) {
-    logger.info('wallet-migration: using cached migratedFrom list', {
-      walletAddress: wallet.address,
-      chainHost,
-      migratedFromCount: cachedMigratedFrom.length,
-    });
     return cachedMigratedFrom;
   }
 
@@ -49,13 +44,13 @@ export async function getMigratedFromList(client: OcapClient): Promise<string[]>
     cachedWalletAddress = wallet.address;
     cachedChainHost = chainHost;
 
-    logger.info('wallet-migration: loaded migratedFrom list', {
-      walletAddress: wallet.address,
-      chainHost,
-      migratedFromCount: cachedMigratedFrom.length,
-      migratedFrom: cachedMigratedFrom,
-      migratedTo: state?.migratedTo,
-    });
+    if (cachedMigratedFrom.length > 0) {
+      logger.info('wallet-migration: loaded migratedFrom list', {
+        walletAddress: wallet.address,
+        chainHost,
+        migratedFrom: cachedMigratedFrom,
+      });
+    }
 
     return cachedMigratedFrom;
   } catch (err) {
@@ -108,23 +103,11 @@ export async function getDelegationAddressWithFallback({
   // @ts-ignore - OcapClient has host property
   const chainHost = client?.config?.httpEndpoint || 'unknown';
 
-  logger.info('wallet-migration: getDelegationAddressWithFallback called', {
-    delegator,
-    storedAddress: storedAddress || null,
-    walletAddress: wallet.address,
-    chainHost,
-  });
-
   // 1. Check stored delegation_address first - but verify it has valid state
   if (storedAddress) {
     try {
       const { state: storedState } = await client.getDelegateState({ address: storedAddress });
       if (storedState?.ops?.length > 0) {
-        logger.info('wallet-migration: found valid delegation at stored address', {
-          storedAddress,
-          delegator,
-          opsCount: storedState.ops.length,
-        });
         return { address: storedAddress, needsBackfill: false, source: 'stored' };
       }
       logger.warn('wallet-migration: stored delegation address has no valid state, falling back', {
@@ -156,12 +139,6 @@ export async function getDelegationAddressWithFallback({
       opsCount: currentState?.ops?.length || 0,
     };
     if (currentState?.ops?.length > 0) {
-      logger.info('wallet-migration: found valid delegation at current address', {
-        currentAddress,
-        delegator,
-        walletAddress: wallet.address,
-        opsCount: currentState.ops.length,
-      });
       return { address: currentAddress, needsBackfill: true, source: 'current' };
     }
   } catch (err) {
@@ -380,8 +357,8 @@ export async function backfillDelegationAddress(subId: string, address: string):
 
     // Backfill the address (only if arcblock payment_details exists with required fields)
     const existingArcblock = subscription.payment_details?.arcblock;
-    if (!existingArcblock?.tx_hash || !existingArcblock?.payer) {
-      logger.warn('wallet-migration: cannot backfill delegation_address - missing arcblock payment_details', {
+    if (!existingArcblock) {
+      logger.info('migration: cannot backfill delegation_address - missing arcblock payment_details', {
         subscriptionId: subscription.id,
       });
       return false;

package/api/src/routes/subscriptions.ts

@@ -3142,4 +3142,165 @@ router.post('/:id/update-stripe-payment-method', authPortal, async (req, res) =>
   }
 });
 
+/**
+ * Fix subscription after payment method migration from Stripe to non-Stripe
+ * This API is used to fix legacy subscriptions that were migrated but the migration
+ * was incomplete (missing payment_settings/payment_details updates)
+ *
+ * This API will:
+ * 1. Pause the Stripe subscription (if not already paused)
+ * 2. Update payment_settings to use arcblock
+ * 3. Update payment_details to add arcblock info
+ * 4. Recalculate cancel_at if needed
+ */
+router.put('/:id/fix-stripe-migration', auth, async (req, res) => {
+  try {
+    const subscription = await Subscription.findByPk(req.params.id);
+    if (!subscription) {
+      return res.status(404).json({ error: 'Subscription not found' });
+    }
+
+    const stripeSubscriptionId = subscription.payment_details?.stripe?.subscription_id;
+    if (!stripeSubscriptionId) {
+      return res.status(400).json({ error: 'Subscription does not have Stripe subscription_id' });
+    }
+
+    // Get customer for payer DID
+    const customer = await Customer.findByPk(subscription.customer_id);
+    if (!customer) {
+      return res.status(404).json({ error: 'Customer not found' });
+    }
+
+    // Find arcblock payment method
+    const arcblockMethod = await PaymentMethod.findOne({
+      where: { type: 'arcblock', livemode: subscription.livemode },
+    });
+    if (!arcblockMethod) {
+      return res.status(400).json({ error: 'ArcBlock payment method not found' });
+    }
+
+    // Find Stripe payment method to pause subscription
+    const stripeMethod = await PaymentMethod.findOne({
+      where: { type: 'stripe', livemode: subscription.livemode },
+    });
+
+    // 1. Pause Stripe subscription if not already paused
+    let stripePaused = false;
+    if (stripeMethod) {
+      try {
+        const client = stripeMethod.getStripeClient();
+        const stripeSubscription = await client.subscriptions.retrieve(stripeSubscriptionId);
+        if (stripeSubscription && !stripeSubscription.pause_collection) {
+          await client.subscriptions.update(stripeSubscriptionId, {
+            pause_collection: { behavior: 'void' },
+          });
+          stripePaused = true;
+          logger.info('Stripe subscription paused during fix', {
+            subscriptionId: subscription.id,
+            stripeSubscriptionId,
+          });
+        } else if (stripeSubscription?.pause_collection) {
+          logger.info('Stripe subscription already paused', {
+            subscriptionId: subscription.id,
+            stripeSubscriptionId,
+          });
+        }
+      } catch (stripeErr) {
+        logger.warn('Failed to pause Stripe subscription during fix, continuing anyway', {
+          subscriptionId: subscription.id,
+          stripeSubscriptionId,
+          error: stripeErr,
+        });
+      }
+    }
+
+    const updates: Partial<TSubscription> = {};
+
+    // 2. Update payment_settings to use arcblock (matching change-payment behavior)
+    updates.payment_settings = {
+      payment_method_types: ['arcblock'],
+      payment_method_options: {
+        arcblock: { payer: customer.did },
+      },
+    };
+
+    // 3. Update payment_details.arcblock.payer if not already present
+    if (!subscription.payment_details?.arcblock?.payer) {
+      const existingArcblock = subscription.payment_details?.arcblock;
+      updates.payment_details = {
+        ...subscription.payment_details,
+        arcblock: {
+          ...existingArcblock,
+          payer: customer.did,
+          type: existingArcblock?.type || 'delegate',
+          tx_hash: existingArcblock?.tx_hash || '',
+        },
+      };
+    }
+
+    // 4. Update default_payment_method_id to arcblock
+    updates.default_payment_method_id = arcblockMethod.id;
+
+    // 5. Recalculate cancel_at if subscription has cancelation_details but no cancel_at
+    if (req.body.recalculate_cancel_at !== false) {
+      if (subscription.cancelation_details && !subscription.cancel_at) {
+        const daysUntilCancel = subscription.days_until_cancel || 0;
+        if (daysUntilCancel > 0) {
+          const dueUnit = 24 * 60 * 60; // 1 day in seconds
+          updates.cancel_at = subscription.current_period_start + daysUntilCancel * dueUnit;
+        } else {
+          updates.cancel_at_period_end = true;
+          updates.cancel_at = subscription.current_period_end;
+        }
+      }
+    }
+
+    // Allow manual override of cancel_at
+    if (typeof req.body.cancel_at === 'number') {
+      updates.cancel_at = req.body.cancel_at;
+    }
+
+    await subscription.update(updates);
+
+    logger.info('Subscription stripe migration fixed', {
+      subscriptionId: subscription.id,
+      customerDid: customer.did,
+      updates: {
+        ...updates,
+        payment_details: '(updated)',
+      },
+      stripePaused,
+      stripeSubscriptionId,
+    });
+
+    // Reload subscription to return updated data
+    await subscription.reload();
+
+    return res.json({
+      success: true,
+      stripePaused,
+      subscription: pick(subscription, [
+        'id',
+        'status',
+        'cancel_at',
+        'cancel_at_period_end',
+        'canceled_at',
+        'cancelation_details',
+        'payment_details',
+        'payment_settings',
+        'default_payment_method_id',
+        'days_until_cancel',
+        'current_period_start',
+        'current_period_end',
+      ]),
+    });
+  } catch (err) {
+    logger.error('Failed to fix subscription stripe migration', {
+      error: err,
+      subscriptionId: req.params.id,
+    });
+    return res.status(400).json({ error: err.message });
+  }
+});
+
 export default router;

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.25.5",
+  "version": "1.25.7",
   "scripts": {
     "dev": "blocklet dev --open",
     "prelint": "npm run types",
@@ -59,9 +59,9 @@
     "@blocklet/error": "^0.3.5",
     "@blocklet/js-sdk": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@blocklet/logger": "^1.17.8-beta-20260104-120132-cb5b1914",
-    "@blocklet/payment-broker-client": "1.25.5",
-    "@blocklet/payment-react": "1.25.5",
-    "@blocklet/payment-vendor": "1.25.5",
+    "@blocklet/payment-broker-client": "1.25.7",
+    "@blocklet/payment-react": "1.25.7",
+    "@blocklet/payment-vendor": "1.25.7",
     "@blocklet/sdk": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@blocklet/ui-react": "^3.4.7",
     "@blocklet/uploader": "^0.3.19",
@@ -132,7 +132,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.17.8-beta-20260104-120132-cb5b1914",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.25.5",
+    "@blocklet/payment-types": "1.25.7",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -179,5 +179,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "fc70dce73c8d46dd6cd7936d188d551316cd02db"
+  "gitHead": "0aa950a5d3f01a150ec21c66e2efeaf81ee1cc69"
 }