payment-kit 1.15.12 → 1.15.14

package/api/src/routes/connect/change-plan.ts

@@ -5,7 +5,7 @@ import { getFastCheckoutAmount } from '../../libs/session';
 import { onSubscriptionUpdateConnected } from '../../libs/subscription';
 import { getTxMetadata } from '../../libs/util';
 import { invoiceQueue } from '../../queues/invoice';
-import { addSubscriptionJob } from '../../queues/subscription';
+import { addSubscriptionJob, subscriptionQueue } from '../../queues/subscription';
 import type { TLineItemExpanded } from '../../store/models';
 import {
   ensureSubscription,
@@ -134,6 +134,7 @@ export default {
       }
       if (subscription) {
         await onSubscriptionUpdateConnected(subscriptionId);
+        await subscriptionQueue.delete(subscription.id);
         await addSubscriptionJob(subscription, 'cycle', false, subscription.trial_end);
       }
     };

package/api/src/routes/connect/shared.ts

@@ -107,6 +107,7 @@ export async function ensurePaymentIntent(checkoutSessionId: string, userDid?: s
     if (!user) {
       throw new Error('Seems you have not connected to this app before');
     }
+
     if (customer.did !== user.did) {
       throw new Error('This is not your payment intent');
     }
@@ -174,6 +175,10 @@ export async function ensureSetupIntent(checkoutSessionId: string, userDid?: str
   }
   if (userDid) {
     const { user } = await blocklet.getUser(userDid, { enableConnectedAccount: true });
+    if (!user) {
+      throw new Error('Seems you have not connected to this app before');
+    }
+
     if (customer.did !== user.did) {
       throw new Error('This is not your setupIntent');
     }
@@ -740,7 +745,14 @@ export async function getStakeTxClaim({
   const threshold = fromTokenToUnit(Math.max(billingThreshold, minStakeAmount), paymentCurrency.decimal);
   const staking = getSubscriptionStakeSetup(items, paymentCurrency.id, threshold.toString());
   const amount = staking.licensed.add(staking.metered).toString();
-  logger.info('getStakeTxClaim', { subscriptionId: subscription.id, billingThreshold, minStakeAmount, threshold: threshold.toString(), staking, amount: amount.toString() });
+  logger.info('getStakeTxClaim', {
+    subscriptionId: subscription.id,
+    billingThreshold,
+    minStakeAmount,
+    threshold: threshold.toString(),
+    staking,
+    amount: amount.toString(),
+  });
 
   if (paymentMethod.type === 'arcblock') {
     // create staking data

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.15.12",
+  "version": "1.15.14",
   "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.12",
+    "@blocklet/payment-react": "1.15.14",
     "@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.12",
+    "@blocklet/payment-types": "1.15.14",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "522f94d0b960bc6e1bfdb3cf6738ecb077183ca1"
+  "gitHead": "0e93a9f3a6dfd750b07b4ba05be018ae54919b30"
 }