payment-kit 1.18.6 → 1.18.8

package/api/src/libs/auth.ts

@@ -26,7 +26,7 @@ export const handlers = new WalletHandler({
 export const blocklet = new AuthService();
 
 export type CallbackArgs = {
-  request: Request;
+  request: Request & { context: Record<string, any> };
   userDid: string;
   userPk: string;
   didwallet: {

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

@@ -12,6 +12,7 @@ import {
 } from './shared';
 import { ensureStakeInvoice } from '../../libs/invoice';
 import { EVM_CHAIN_TYPES } from '../../libs/constants';
+import logger from '../../libs/logger';
 
 export default {
   action: 'change-payment',
@@ -26,17 +27,15 @@ export default {
     const { subscriptionId } = extraParams;
     const { subscription, paymentMethod, paymentCurrency } = await ensureChangePaymentContext(subscriptionId);
 
-    const claims: { [type: string]: [string, object] } = {};
-
+    const claimsList: any[] = [];
     // @ts-ignore
     const items = subscription!.items as TLineItemExpanded[];
     const trialing = true;
     const billingThreshold = Number(subscription.billing_thresholds?.amount_gte || 0);
 
     if (paymentMethod.type === 'arcblock') {
-      claims.delegation = [
-        'signature',
-        await getDelegationTxClaim({
+      claimsList.push({
+        signature: await getDelegationTxClaim({
           mode: 'setup',
           userDid,
           userPk,
@@ -48,12 +47,10 @@ export default {
           billingThreshold,
           items,
         }),
-      ];
+      });
 
-      // we always need to stake for the subscription
-      claims.staking = [
-        'prepareTx',
-        await getStakeTxClaim({
+      claimsList.push({
+        prepareTx: await getStakeTxClaim({
           userDid,
           userPk,
           paymentCurrency,
@@ -61,9 +58,9 @@ export default {
           items,
           subscription,
         }),
-      ];
+      });
 
-      return claims;
+      return claimsList;
     }
 
     if (EVM_CHAIN_TYPES.includes(paymentMethod.type)) {
@@ -71,9 +68,8 @@ export default {
         throw new Error(`Payment currency ${paymentMethod.type}:${paymentCurrency.id} does not support subscription`);
       }
 
-      claims.delegation = [
-        'signature',
-        await getDelegationTxClaim({
+      claimsList.push({
+        signature: await getDelegationTxClaim({
           mode: 'subscription',
           userDid,
           userPk,
@@ -85,19 +81,48 @@ export default {
           billingThreshold,
           items,
         }),
-      ];
+      });
 
-      return claims;
+      return claimsList;
     }
 
-    throw new Error(`ChangeMethod: Payment method ${paymentMethod.type} not supported`);
+    throw new Error(`ChangePayment: Payment method ${paymentMethod.type} not supported`);
   },
 
-  onAuth: async ({ request, userDid, userPk, claims, extraParams }: CallbackArgs) => {
+  onAuth: async ({ request, userDid, userPk, claims, extraParams, updateSession, step }: CallbackArgs) => {
     const { subscriptionId } = extraParams;
-    const { subscription, setupIntent, paymentCurrency, paymentMethod, customer } =
+    const { setupIntent, subscription, paymentMethod, paymentCurrency, customer } =
       await ensureChangePaymentContext(subscriptionId);
 
+    const result = request?.context?.store?.result || [];
+    result.push({
+      step,
+      claim: claims?.[0],
+    });
+
+    // 判断是否为最后一步
+    const staking = result.find((x: any) => x.claim?.type === 'prepareTx' && x.claim?.meta?.purpose === 'staking');
+    const isFinalStep = (paymentMethod.type === 'arcblock' && staking) || paymentMethod.type !== 'arcblock';
+
+    if (!isFinalStep) {
+      await updateSession({
+        result,
+      });
+      return { result };
+    }
+
+    // 清理 session
+    try {
+      await updateSession({
+        result: [],
+      });
+    } catch (error) {
+      logger.error('updateSession', {
+        error,
+      });
+    }
+    const claimsList = result.map((x: any) => x.claim);
+
     const prepareTxExecution = async () => {
       await subscription?.update({
         payment_settings: {
@@ -141,7 +166,7 @@ export default {
       const { stakingAmount, ...paymentDetails } = await executeOcapTransactions(
         userDid,
         userPk,
-        claims,
+        claimsList,
         paymentMethod,
         request,
         subscription?.id,
@@ -172,7 +197,7 @@ export default {
 
     if (EVM_CHAIN_TYPES.includes(paymentMethod.type)) {
       await prepareTxExecution();
-      const paymentDetails = await executeEvmTransaction('approve', userDid, claims, paymentMethod);
+      const paymentDetails = await executeEvmTransaction('approve', userDid, claimsList, paymentMethod);
       waitForEvmTxConfirm(paymentMethod.getEvmClient(), +paymentDetails.block_height, paymentMethod.confirmation.block)
         .then(async () => {
           await afterTxExecution(paymentDetails);

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

@@ -16,6 +16,7 @@ import {
 } from './shared';
 import { ensureStakeInvoice } from '../../libs/invoice';
 import { EVM_CHAIN_TYPES } from '../../libs/constants';
+import logger from '../../libs/logger';
 
 export default {
   action: 'change-plan',
@@ -30,7 +31,7 @@ export default {
     const { subscriptionId } = extraParams;
     const { paymentMethod, paymentCurrency, subscription, customer } = await ensureSubscription(subscriptionId);
 
-    const claims: { [type: string]: [string, object] } = {};
+    const claimsList: any[] = [];
     // @ts-ignore
     const items = subscription!.items as TLineItemExpanded[];
     const trialing = false;
@@ -45,11 +46,9 @@ export default {
         amount: fastCheckoutAmount,
       });
 
-      // if we can complete purchase without any wallet interaction
       if (delegation.sufficient === false) {
-        claims.delegation = [
-          'signature',
-          await getDelegationTxClaim({
+        claimsList.push({
+          signature: await getDelegationTxClaim({
             mode: 'subscription',
             userDid,
             userPk,
@@ -61,13 +60,11 @@ export default {
             billingThreshold,
             items,
           }),
-        ];
+        });
       }
 
-      // we always need to stake for the subscription
-      claims.staking = [
-        'prepareTx',
-        await getStakeTxClaim({
+      claimsList.push({
+        prepareTx: await getStakeTxClaim({
           userDid,
           userPk,
           paymentCurrency,
@@ -75,9 +72,9 @@ export default {
           items,
           subscription: subscription!,
         }),
-      ];
+      });
 
-      return claims;
+      return claimsList;
     }
 
     if (EVM_CHAIN_TYPES.includes(paymentMethod.type)) {
@@ -85,9 +82,8 @@ export default {
         throw new Error(`Payment currency ${paymentMethod.type}:${paymentCurrency.id} does not support subscription`);
       }
 
-      claims.delegation = [
-        'signature',
-        await getDelegationTxClaim({
+      claimsList.push({
+        signature: await getDelegationTxClaim({
           mode: 'subscription',
           userDid,
           userPk,
@@ -99,19 +95,48 @@ export default {
           billingThreshold,
           items,
         }),
-      ];
+      });
 
-      return claims;
+      return claimsList;
     }
 
     throw new Error(`ChangePlan: Payment method ${paymentMethod.type} not supported`);
   },
 
-  onAuth: async ({ request, userDid, userPk, claims, extraParams }: CallbackArgs) => {
+  onAuth: async ({ request, userDid, userPk, claims, extraParams, updateSession, step }: CallbackArgs) => {
     const { subscriptionId } = extraParams;
     const { invoice, paymentMethod, subscription, paymentCurrency, customer } =
       await ensureSubscription(subscriptionId);
 
+    const result = request?.context?.store?.result || [];
+    result.push({
+      step,
+      claim: claims?.[0],
+    });
+
+    // 判断是否为最后一步
+    const staking = result.find((x: any) => x.claim?.type === 'prepareTx' && x.claim?.meta?.purpose === 'staking');
+    const isFinalStep = (paymentMethod.type === 'arcblock' && staking) || paymentMethod.type !== 'arcblock';
+
+    if (!isFinalStep) {
+      await updateSession({
+        result,
+      });
+      return { result };
+    }
+
+    // 清理 session
+    try {
+      await updateSession({
+        result: [],
+      });
+    } catch (error) {
+      logger.error('updateSession', {
+        error,
+      });
+    }
+    const claimsList = result.map((x: any) => x.claim);
+
     const prepareTxExecution = async () => {
       await subscription?.update({
         payment_settings: {
@@ -148,7 +173,7 @@ export default {
       const { stakingAmount, ...paymentDetails } = await executeOcapTransactions(
         userDid,
         userPk,
-        claims,
+        claimsList,
         paymentMethod,
         request,
         subscription?.id,
@@ -181,7 +206,7 @@ export default {
     if (EVM_CHAIN_TYPES.includes(paymentMethod.type)) {
       await prepareTxExecution();
 
-      const paymentDetails = await executeEvmTransaction('approve', userDid, claims, paymentMethod);
+      const paymentDetails = await executeEvmTransaction('approve', userDid, claimsList, paymentMethod);
       waitForEvmTxConfirm(paymentMethod.getEvmClient(), +paymentDetails.block_height, paymentMethod.confirmation.block)
         .then(async () => {
           await afterTxExecution(paymentDetails);

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

@@ -39,10 +39,9 @@ export default {
       throw new Error('Subscription for checkoutSession not found');
     }
 
-    const claims: { [type: string]: [string, object] } = {};
+    const claimsList: any[] = [];
     const now = dayjs().unix();
     const items = checkoutSession.line_items as TLineItemExpanded[];
-
     const { trialEnd, trialInDays } = getSubscriptionTrialSetup(
       checkoutSession.subscription_data as any,
       paymentCurrency.id
@@ -62,9 +61,8 @@ export default {
       });
       // if we can complete purchase without any wallet interaction
       if (delegation.sufficient === false) {
-        claims.delegation = [
-          'signature',
-          await getDelegationTxClaim({
+        claimsList.push({
+          signature: await getDelegationTxClaim({
             mode: checkoutSession.mode,
             userDid,
             userPk,
@@ -76,13 +74,12 @@ export default {
             billingThreshold: Math.max(minStakeAmount, billingThreshold),
             items,
           }),
-        ];
+        });
       }
 
       // we always need to stake for the subscription
-      claims.staking = [
-        'prepareTx',
-        await getStakeTxClaim({
+      claimsList.push({
+        prepareTx: await getStakeTxClaim({
           userDid,
           userPk,
           paymentCurrency,
@@ -90,9 +87,9 @@ export default {
           items,
           subscription,
         }),
-      ];
+      });
 
-      return claims;
+      return claimsList;
     }
 
     if (EVM_CHAIN_TYPES.includes(paymentMethod.type)) {
@@ -100,9 +97,8 @@ export default {
         throw new Error(`Payment currency ${paymentMethod.type}:${paymentCurrency.id} does not support setup`);
       }
 
-      claims.delegation = [
-        'signature',
-        await getDelegationTxClaim({
+      claimsList.push({
+        signature: await getDelegationTxClaim({
           mode: checkoutSession.mode,
           userDid,
           userPk,
@@ -114,15 +110,15 @@ export default {
           billingThreshold,
           items,
         }),
-      ];
+      });
 
-      return claims;
+      return claimsList;
     }
 
     throw new Error(`Payment method ${paymentMethod.type} not supported`);
   },
   onAuth: async (args: CallbackArgs) => {
-    const { request, userDid, userPk, claims, extraParams } = args;
+    const { request, userDid, userPk, claims, extraParams, updateSession, step } = args;
     const { checkoutSessionId, connectedDid, sessionUserDid } = extraParams;
     const { setupIntent, checkoutSession, paymentMethod, subscription, invoice, paymentCurrency, customer } =
       await ensureSetupIntent(checkoutSessionId, connectedDid || sessionUserDid || userDid);
@@ -131,6 +127,35 @@ export default {
       throw new Error('Subscription for checkoutSession not found');
     }
 
+    const result = request?.context?.store?.result || [];
+    result.push({
+      step,
+      claim: claims?.[0],
+    });
+
+    // 判断是否为最后一步
+    const staking = result.find((x: any) => x.claim?.type === 'prepareTx' && x.claim?.meta?.purpose === 'staking');
+    const isFinalStep = (paymentMethod.type === 'arcblock' && staking) || paymentMethod.type !== 'arcblock';
+
+    if (!isFinalStep) {
+      await updateSession({
+        result,
+      });
+      return { result };
+    }
+
+    // 清理 session
+    try {
+      await updateSession({
+        result: [],
+      });
+    } catch (error) {
+      logger.error('updateSession', {
+        error,
+      });
+    }
+    const claimsList = result.map((x: any) => x.claim);
+
     const paymentSettings = {
       payment_method_types: [paymentMethod.type],
       payment_method_options: {
@@ -177,7 +202,7 @@ export default {
         const { stakingAmount, ...paymentDetails } = await executeOcapTransactions(
           userDid,
           userPk,
-          claims,
+          claimsList,
           paymentMethod,
           request,
           subscription?.id,
@@ -216,12 +241,12 @@ export default {
 
     if (EVM_CHAIN_TYPES.includes(paymentMethod.type)) {
       await prepareTxExecution();
-      broadcastEvmTransaction(checkoutSessionId, 'pending', claims);
-      const paymentDetails = await executeEvmTransaction('approve', userDid, claims, paymentMethod);
+      broadcastEvmTransaction(checkoutSessionId, 'pending', claimsList);
+      const paymentDetails = await executeEvmTransaction('approve', userDid, claimsList, paymentMethod);
       waitForEvmTxConfirm(paymentMethod.getEvmClient(), +paymentDetails.block_height, paymentMethod.confirmation.block)
         .then(async () => {
           await afterTxExecution(paymentDetails);
-          broadcastEvmTransaction(checkoutSessionId, 'confirmed', claims);
+          broadcastEvmTransaction(checkoutSessionId, 'confirmed', claimsList);
         })
         .catch(console.error);
 

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

@@ -40,7 +40,6 @@ export default {
       throw new Error('Subscription for checkoutSession not found');
     }
 
-    const claims: { [type: string]: [string, object] } = {};
     const now = dayjs().unix();
     const items = checkoutSession.line_items as TLineItemExpanded[];
     const { trialEnd, trialInDays } = getSubscriptionTrialSetup(
@@ -51,7 +50,7 @@ export default {
     const billingThreshold = Number(checkoutSession.subscription_data?.billing_threshold_amount || 0);
     const minStakeAmount = Number(checkoutSession.subscription_data?.min_stake_amount || 0);
     const fastCheckoutAmount = getFastCheckoutAmount(items, checkoutSession.mode, paymentCurrency.id, trialing);
-
+    const claimsList: any[] = [];
     if (paymentMethod.type === 'arcblock') {
       const delegation = await isDelegationSufficientForPayment({
         paymentMethod,
@@ -62,9 +61,8 @@ export default {
 
       // if we can complete purchase without any wallet interaction
       if (delegation.sufficient === false) {
-        claims.delegation = [
-          'signature',
-          await getDelegationTxClaim({
+        claimsList.push({
+          signature: await getDelegationTxClaim({
             mode: checkoutSession.mode,
             userDid,
             userPk,
@@ -76,13 +74,12 @@ export default {
             billingThreshold: Math.max(minStakeAmount, billingThreshold),
             items,
           }),
-        ];
+        });
       }
 
       // we always need to stake for the subscription
-      claims.staking = [
-        'prepareTx',
-        await getStakeTxClaim({
+      claimsList.push({
+        prepareTx: await getStakeTxClaim({
           userDid,
           userPk,
           paymentCurrency,
@@ -90,9 +87,9 @@ export default {
           items,
           subscription,
         }),
-      ];
+      });
 
-      return claims;
+      return claimsList;
     }
 
     if (EVM_CHAIN_TYPES.includes(paymentMethod.type)) {
@@ -100,9 +97,8 @@ export default {
         throw new Error(`Payment currency ${paymentMethod.type}:${paymentCurrency.id} does not support subscription`);
       }
 
-      claims.delegation = [
-        'signature',
-        await getDelegationTxClaim({
+      claimsList.push({
+        signature: await getDelegationTxClaim({
           mode: checkoutSession.mode,
           userDid,
           userPk,
@@ -114,20 +110,43 @@ export default {
           billingThreshold,
           items,
         }),
-      ];
+      });
 
-      return claims;
+      return claimsList;
     }
 
     throw new Error(`subscription: Payment method ${paymentMethod.type} not supported`);
   },
   onAuth: async (args: CallbackArgs) => {
-    const { request, userDid, userPk, claims, extraParams } = args;
+    const { request, userDid, userPk, claims, extraParams, updateSession, step } = args;
     const { checkoutSessionId, connectedDid, sessionUserDid } = extraParams;
     const { checkoutSession, customer, paymentMethod, subscription, paymentCurrency } = await ensurePaymentIntent(
       checkoutSessionId,
       connectedDid || sessionUserDid || userDid
     );
+    const result = request?.context?.store?.result || [];
+    result.push({
+      step,
+      claim: claims?.[0],
+    });
+    const staking = result.find((x: any) => x.claim?.type === 'prepareTx' && x.claim?.meta?.purpose === 'staking');
+    const isFinalStep = (paymentMethod.type === 'arcblock' && staking) || paymentMethod.type !== 'arcblock';
+    if (!isFinalStep) {
+      await updateSession({
+        result,
+      });
+      return { result };
+    }
+    try {
+      await updateSession({
+        result: [],
+      });
+    } catch (error) {
+      logger.error('updateSession', {
+        error,
+      });
+    }
+    const claimsList = result.map((x: any) => x.claim);
 
     if (!subscription) {
       throw new Error('Subscription for checkoutSession not found');
@@ -164,7 +183,7 @@ export default {
       const { stakingAmount, ...paymentDetails } = await executeOcapTransactions(
         userDid,
         userPk,
-        claims,
+        claimsList,
         paymentMethod,
         request,
         subscription?.id,
@@ -198,9 +217,9 @@ export default {
     if (EVM_CHAIN_TYPES.includes(paymentMethod.type)) {
       await prepareTxExecution();
       const { invoice } = await ensureInvoiceForCheckout({ checkoutSession, customer, subscription });
-      broadcastEvmTransaction(checkoutSessionId, 'pending', claims);
+      broadcastEvmTransaction(checkoutSessionId, 'pending', claimsList);
 
-      const paymentDetails = await executeEvmTransaction('approve', userDid, claims, paymentMethod);
+      const paymentDetails = await executeEvmTransaction('approve', userDid, claimsList, paymentMethod);
       waitForEvmTxConfirm(
         paymentMethod.getEvmClient(),
         Number(paymentDetails.block_height),
@@ -208,7 +227,7 @@ export default {
       )
         .then(async () => {
           await afterTxExecution(invoice!, paymentDetails);
-          broadcastEvmTransaction(checkoutSessionId, 'confirmed', claims);
+          broadcastEvmTransaction(checkoutSessionId, 'confirmed', claimsList);
         })
         .catch(console.error);
 

package/api/src/routes/payment-links.ts

@@ -146,7 +146,7 @@ export async function createPaymentLink(payload: any) {
 }
 
 const PaymentLinkCreateSchema = Joi.object({
-  name: Joi.string().required(),
+  name: Joi.string().optional(),
   line_items: Joi.array()
     .items(
       Joi.object({

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.6",
+  "version": "1.18.8",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -44,29 +44,29 @@
   },
   "dependencies": {
     "@abtnode/cron": "^1.16.38",
-    "@arcblock/did": "^1.19.9",
+    "@arcblock/did": "^1.19.10",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.11.34",
-    "@arcblock/did-util": "^1.19.9",
-    "@arcblock/jwt": "^1.19.9",
-    "@arcblock/ux": "^2.11.34",
-    "@arcblock/validator": "^1.19.9",
+    "@arcblock/did-connect": "^2.11.44",
+    "@arcblock/did-util": "^1.19.10",
+    "@arcblock/jwt": "^1.19.10",
+    "@arcblock/ux": "^2.11.44",
+    "@arcblock/validator": "^1.19.10",
     "@blocklet/js-sdk": "^1.16.38",
     "@blocklet/logger": "^1.16.38",
-    "@blocklet/payment-react": "1.18.6",
+    "@blocklet/payment-react": "1.18.8",
     "@blocklet/sdk": "^1.16.38",
-    "@blocklet/ui-react": "^2.11.34",
-    "@blocklet/uploader": "^0.1.67",
-    "@blocklet/xss": "^0.1.23",
+    "@blocklet/ui-react": "^2.11.44",
+    "@blocklet/uploader": "^0.1.70",
+    "@blocklet/xss": "^0.1.25",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
     "@mui/material": "^5.16.6",
     "@mui/system": "^5.16.6",
-    "@ocap/asset": "^1.19.9",
-    "@ocap/client": "^1.19.9",
-    "@ocap/mcrypto": "^1.19.9",
-    "@ocap/util": "^1.19.9",
-    "@ocap/wallet": "^1.19.9",
+    "@ocap/asset": "^1.19.10",
+    "@ocap/client": "^1.19.10",
+    "@ocap/mcrypto": "^1.19.10",
+    "@ocap/util": "^1.19.10",
+    "@ocap/wallet": "^1.19.10",
     "@stripe/react-stripe-js": "^2.7.3",
     "@stripe/stripe-js": "^2.4.0",
     "ahooks": "^3.8.0",
@@ -121,7 +121,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.38",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.6",
+    "@blocklet/payment-types": "1.18.8",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -151,7 +151,7 @@
     "vite": "^5.3.5",
     "vite-node": "^2.0.4",
     "vite-plugin-babel-import": "^2.0.5",
-    "vite-plugin-blocklet": "^0.9.20",
+    "vite-plugin-blocklet": "^0.9.21",
     "vite-plugin-node-polyfills": "^0.21.0",
     "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "^4.3.2",
@@ -167,5 +167,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "784ba57910d780a44d0792ef503b666ee8f8d9c3"
+  "gitHead": "0815493ffd53c977d2d14779703d85f2e0e34299"
 }