payment-kit 1.15.11 → 1.15.13

package/api/src/integrations/stripe/handlers/payment-intent.ts

@@ -12,6 +12,7 @@ import { handleStripeInvoiceCreated } from './invoice';
 import { events } from '../../../libs/event';
 
 export async function handleStripePaymentSucceed(paymentIntent: PaymentIntent, event?: TEventExpanded) {
+  const triggerRenew = paymentIntent.status !== 'succeeded';
   await paymentIntent.update({
     status: 'succeeded',
     last_payment_error: null,
@@ -28,7 +29,7 @@ export async function handleStripePaymentSucceed(paymentIntent: PaymentIntent, e
     events.emit('checkout.session.pending_invoice', { checkoutSessionId, paymentIntentId: paymentIntent.id });
   }
 
-  await handlePaymentSucceed(paymentIntent);
+  await handlePaymentSucceed(paymentIntent, triggerRenew);
 }
 
 export async function syncStripePayment(paymentIntent: PaymentIntent) {
@@ -41,6 +42,7 @@ export async function syncStripePayment(paymentIntent: PaymentIntent) {
     return;
   }
 
+  const triggerRenew = paymentIntent.status !== 'succeeded';
   const client = await method.getStripeClient();
   const stripeIntent = await client.paymentIntents.retrieve(paymentIntent.metadata.stripe_id);
   if (stripeIntent) {
@@ -55,7 +57,7 @@ export async function syncStripePayment(paymentIntent: PaymentIntent) {
     logger.info('stripe payment intent synced', { locale: paymentIntent.id, remote: stripeIntent.id });
 
     if (stripeIntent.status === 'succeeded') {
-      await handlePaymentSucceed(paymentIntent);
+      await handlePaymentSucceed(paymentIntent, triggerRenew);
     }
   }
 }

package/api/src/libs/queue/index.ts

@@ -126,14 +126,14 @@ export default function createQueue<T = any>({ name, onJob, options = defaults }
 
     const onJobComplete = async (err: any, result: any) => {
       if (result === CANCELLED) {
+        await clearJob(jobId);
         emit('cancelled', { id: jobId, job });
-        clearJob(jobId);
         return;
       }
 
       if (!err) {
+        await clearJob(jobId);
         emit('finished', { id: jobId, job, result });
-        clearJob(jobId);
         return;
       }
       logger.error('job errored', { queue: name, id: jobId, job, result, error: err });

package/api/src/queues/payment.ts

@@ -56,7 +56,11 @@ async function updateQuantitySold(checkoutSession: CheckoutSession) {
   await Promise.all(updatePromises);
 }
 
-export const handlePaymentSucceed = async (paymentIntent: PaymentIntent, slashStake: boolean = false) => {
+export const handlePaymentSucceed = async (
+  paymentIntent: PaymentIntent,
+  triggerRenew: boolean = true,
+  slashStake: boolean = false
+) => {
   // FIXME: @wangshijun we should check stripe payment here before
 
   if (paymentIntent.beneficiaries?.length && !slashStake) {
@@ -206,8 +210,10 @@ export const handlePaymentSucceed = async (paymentIntent: PaymentIntent, slashSt
         }
       }
 
-      if (invoice.billing_reason === 'subscription_cycle' || paymentIntent.capture_method === 'manual') {
-        createEvent('Subscription', 'customer.subscription.renewed', subscription).catch(console.error);
+      if (triggerRenew) {
+        if (invoice.billing_reason === 'subscription_cycle' || paymentIntent.capture_method === 'manual') {
+          createEvent('Subscription', 'customer.subscription.renewed', subscription).catch(console.error);
+        }
       }
       if (invoice.billing_reason === 'subscription_update') {
         createEvent('Subscription', 'customer.subscription.upgraded', subscription).catch(console.error);
@@ -474,7 +480,7 @@ const handleStakeSlash = async (
       },
     },
   });
-  await handlePaymentSucceed(paymentIntent, true);
+  await handlePaymentSucceed(paymentIntent, true, true);
   const jobId = `${paymentIntent.id}-${subscription.id}`;
   const job = await notificationQueue.get(jobId);
   if (job) {
@@ -674,7 +680,7 @@ export const handlePayment = async (job: PaymentJob) => {
         },
       });
 
-      await handlePaymentSucceed(paymentIntent);
+      await handlePaymentSucceed(paymentIntent, true);
     }
   } catch (err) {
     logger.error('PaymentIntent capture failed', { error: err, id: paymentIntent.id });

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.15.11",
+  "version": "1.15.13",
   "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.11",
+    "@blocklet/payment-react": "1.15.13",
     "@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.11",
+    "@blocklet/payment-types": "1.15.13",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "5bd043b55fb78faab5da626eaf02519fa5f0fe9a"
+  "gitHead": "17f736f8f3ea85502eb19d7107b5a0b00d03b754"
 }