payment-kit 1.18.15 → 1.18.17

package/api/src/index.ts

@@ -39,6 +39,7 @@ import setupHandlers from './routes/connect/setup';
 import subscribeHandlers from './routes/connect/subscribe';
 import delegationHandlers from './routes/connect/delegation';
 import overdraftProtectionHandlers from './routes/connect/overdraft-protection';
+import rechargeAccountHandlers from './routes/connect/recharge-account';
 import { initialize } from './store/models';
 import { sequelize } from './store/sequelize';
 import { initUserHandler } from './integrations/blocklet/user';
@@ -74,6 +75,7 @@ handlers.attach(Object.assign({ app: router }, subscribeHandlers));
 handlers.attach(Object.assign({ app: router }, changePaymentHandlers));
 handlers.attach(Object.assign({ app: router }, changePlanHandlers));
 handlers.attach(Object.assign({ app: router }, rechargeHandlers));
+handlers.attach(Object.assign({ app: router }, rechargeAccountHandlers));
 handlers.attach(Object.assign({ app: router }, delegationHandlers));
 handlers.attach(Object.assign({ app: router }, overdraftProtectionHandlers));
 router.use('/api', routes);

package/api/src/libs/invoice.ts

@@ -363,7 +363,7 @@ export async function getStakingInvoices(subscription: Subscription): Promise<In
 
 type BaseInvoiceProps = {
   customer: Customer;
-  subscription?: Subscription;
+  subscription?: Subscription | null;
   currency_id: string;
   livemode: boolean;
   period_start: number;
@@ -660,17 +660,19 @@ export async function ensureRechargeInvoice(
     currency_id: string;
     metadata?: any;
     payment_settings?: any;
+    livemode?: boolean;
   },
-  subscription: Subscription,
+  subscription: Subscription | null,
   paymentMethod: PaymentMethod,
   customer: Customer
 ) {
   try {
+    const { livemode = true } = invoiceProps;
     const { invoice } = await createInvoiceWithItems({
       customer,
       subscription,
       currency_id: invoiceProps.currency_id,
-      livemode: subscription.livemode,
+      livemode: subscription?.livemode ?? livemode,
       period_start: dayjs().unix(),
       period_end: dayjs().unix(),
       status: 'paid',

package/api/src/libs/notification/template/customer-reward-succeeded.ts

@@ -77,9 +77,12 @@ export class CustomerRewardSucceededEmailTemplate
       throw new Error(`CheckoutSession(${this.options.checkoutSessionId}) mode must be payment`);
     }
 
-    const customer = await Customer.findByPk(cs.customer_id);
-    if (!customer) {
-      throw new Error(`Customer not found: ${cs.customer_id}`);
+    let userDid = '';
+    if (cs.customer_id) {
+      const customer = await Customer.findByPk(cs.customer_id);
+      if (customer) {
+        userDid = customer.did;
+      }
     }
 
     await pWaitFor(
@@ -114,17 +117,31 @@ export class CustomerRewardSucceededEmailTemplate
       },
     })) as PaymentCurrency;
 
-    const userDid: string = customer.did;
-    const locale = await getUserLocale(userDid);
-    const at: string = formatTime(checkoutSession.created_at);
-
-    const paymentInfo: string = `${fromUnitToToken(checkoutSession?.amount_total, paymentCurrency.decimal)} ${paymentCurrency.symbol}`;
     const paymentIntent = await PaymentIntent.findByPk(checkoutSession!.payment_intent_id);
     if (!paymentIntent) {
       throw new Error(
         `Payment intent cannot be found for checkoutSession.payment_intent_id${checkoutSession!.payment_intent_id}`
       );
     }
+
+    // 如果没有从customer获取到userDid，尝试从支付详情中获取
+    if (!userDid) {
+      const paymentMethod = await PaymentMethod.findByPk(paymentIntent.payment_method_id);
+      if (paymentMethod) {
+        // @ts-expect-error
+        userDid = paymentIntent.payment_details?.[paymentMethod.type]?.payer || '';
+      }
+    }
+
+    if (!userDid) {
+      throw new Error('User DID not found for reward notification');
+    }
+
+    const locale = await getUserLocale(userDid);
+    const at: string = formatTime(checkoutSession.created_at);
+
+    const paymentInfo: string = `${fromUnitToToken(checkoutSession?.amount_total, paymentCurrency.decimal)} ${paymentCurrency.symbol}`;
+
     const rewardDetail = await this.getRewardDetail({
       paymentIntent,
       paymentCurrency,
@@ -141,11 +158,13 @@ export class CustomerRewardSucceededEmailTemplate
     const paymentMethod: PaymentMethod | null = await PaymentMethod.findByPk(paymentIntent!.payment_method_id);
     // @ts-expect-error
     const chainHost: string | undefined = paymentMethod?.settings?.[paymentMethod.type]?.api_host;
-    const viewInvoiceLink = getCustomerInvoicePageUrl({
-      invoiceId: checkoutSession.invoice_id!,
-      userDid,
-      locale,
-    });
+    const viewInvoiceLink = checkoutSession.invoice_id
+      ? getCustomerInvoicePageUrl({
+          invoiceId: checkoutSession.invoice_id,
+          userDid,
+          locale,
+        })
+      : '';
 
     // @ts-expect-error
     const txHash: string | undefined = paymentIntent?.payment_details?.[paymentMethod.type]?.tx_hash;
@@ -330,7 +349,6 @@ export class CustomerRewardSucceededEmailTemplate
         },
       ].filter(Boolean),
     };
-
     return template;
   }
 }

package/api/src/libs/session.ts

@@ -4,7 +4,7 @@ import { BN } from '@ocap/util';
 import cloneDeep from 'lodash/cloneDeep';
 import isEqual from 'lodash/isEqual';
 
-import type { TLineItemExpanded, TPaymentCurrency, TPaymentMethodExpanded } from '../store/models';
+import type { CheckoutSession, TLineItemExpanded, TPaymentCurrency, TPaymentMethodExpanded } from '../store/models';
 import type { Price, TPrice } from '../store/models/price';
 import type { Product } from '../store/models/product';
 import type { PaymentBeneficiary, PriceCurrency, PriceRecurring } from '../store/models/types';
@@ -375,3 +375,11 @@ export function createPaymentOutput(
     },
   ];
 }
+
+export function isDonationCheckoutSession(checkoutSession: CheckoutSession): boolean {
+  return (
+    checkoutSession.submit_type === 'donate' ||
+    checkoutSession.metadata?.type === 'donation' ||
+    !!checkoutSession.metadata?.is_donation
+  );
+}

package/api/src/libs/util.ts

@@ -220,7 +220,7 @@ export async function getBlockletJson(url?: string) {
         componentMountPoints: BLOCKLET_MOUNT_POINTS,
         appId: process.env.BLOCKLET_APP_ID,
         appName: process.env.BLOCKLET_APP_NAME,
-        appLogo: joinURL(process.env.BLOCKLET_APP_URL!, '.well-known/service/blocklet/logo'),
+        appLogo: '/.well-known/service/blocklet/logo',
         appUrl: process.env.BLOCKLET_APP_URL,
       };
     }
@@ -236,7 +236,7 @@ export async function getUserOrAppInfo(
     if (blockletJson?.appId === address) {
       return {
         name: blockletJson?.appName,
-        avatar: blockletJson?.appLogo,
+        avatar: `${blockletJson?.appUrl}${blockletJson?.appLogo}`,
         type: 'dapp',
         url: blockletJson?.appUrl,
       };
@@ -252,9 +252,17 @@ export async function getUserOrAppInfo(
     }
   }
   const { user } = await blocklet.getUser(address);
+  if (user) {
+    return {
+      name: user?.fullName,
+      avatar: joinURL(process.env.BLOCKLET_APP_URL!, user?.avatar),
+      type: 'user',
+      url: getCustomerProfileUrl({ userDid: address, locale: 'en' }),
+    };
+  }
   return {
-    name: user?.fullName,
-    avatar: joinURL(process.env.BLOCKLET_APP_URL!, user?.avatar),
+    name: 'anonymous',
+    avatar: getUrl('/methods/default.png'),
     type: 'user',
     url: getCustomerProfileUrl({ userDid: address, locale: 'en' }),
   };