payment-kit 1.13.136 → 1.13.138

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

@@ -256,6 +256,8 @@ export default function createQueue<T = any>({ name, onJob, options = defaults }
           const jobs = await store.getScheduledJobs();
           for (const x of jobs) {
             if (x.job && x.id) {
+              // fix: https://github.com/blocklet/payment-kit/issues/287
+              await cancel(x.id);
               push({ job: x.job, id: x.id, persist: false });
             } else {
               logger.info('skip invalid job from db', { job: x });

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

@@ -17,7 +17,7 @@ export default function createQueueStore(queue: string) {
     },
     getScheduledJobs(): Promise<TJob[]> {
       return Job.findAll({
-        where: { queue, delay: { [Op.not]: -1 }, will_run_at: { [Op.lte]: Date.now() } },
+        where: { queue, delay: { [Op.not]: -1 }, will_run_at: { [Op.lte]: Date.now() }, cancelled: false },
         order: [['created_at', 'ASC']],
         transaction: null,
       });

package/api/src/libs/security.ts

@@ -90,6 +90,6 @@ export function authenticate<T extends Model>({ component, roles, record, mine }
       }
     }
 
-    return res.status(401).json({ error: 'Not authorized to perform this action' });
+    return res.status(403).json({ error: 'Not authorized to perform this action' });
   };
 }

package/api/src/libs/subscription.ts

@@ -1,5 +1,8 @@
+import querystring from 'querystring';
+
 import component from '@blocklet/sdk/lib/component';
 import { BN } from '@ocap/util';
+import type { LiteralUnion } from 'type-fest';
 
 import {
   Customer,
@@ -14,9 +17,22 @@ import {
 import dayjs from './dayjs';
 import logger from './logger';
 import { getPriceUintAmountByCurrency, getRecurringPeriod } from './session';
-
-export function getCustomerSubscriptionPageUrl(subscriptionId: string, locale: string = 'en') {
-  return component.getUrl(`customer/subscription/${subscriptionId}?locale=${locale}`);
+import { getConnectQueryParam } from './util';
+
+export function getCustomerSubscriptionPageUrl({
+  subscriptionId,
+  locale = 'en',
+  userDid,
+}: {
+  subscriptionId: string;
+  locale: LiteralUnion<'en' | 'zh', string>;
+  userDid: string;
+}) {
+  return component.getUrl(
+    `customer/subscription/${subscriptionId}?locale=${locale}&${querystring.stringify(
+      getConnectQueryParam({ userDid })
+    )}`
+  );
 }
 
 // FIXME: make this configurable from preferences

package/api/src/libs/util.ts

@@ -205,3 +205,36 @@ export function getExplorerLink(
     return undefined;
   }
 }
+
+type DIDConnectCustomQuery = {
+  // 填写用户的 DID
+  forceConnected: string;
+  sourceAppPid?: string;
+  // auto 代表引导切换（进行弹窗提示，用户可选择不切换）；
+  // disabled 代表不提示（适用于支付页面，允许用户不以当前登录账户来进行支付）；
+  // required 代表强制要求切换（进行页面跳转强制切换账号）
+  // switchAccount?: boolean || 'auto'; // 默认 'auto'
+  switchBehavior?: 'auto' | 'disabled' | 'required';
+  showClose?: true | false;
+};
+/**
+ * @see https://github.com/blocklet/payment-kit/issues/315#issuecomment-1902978895
+ * @description
+ * @export
+ * @param {{ userDid: string }} { userDid }
+ * @return {*}  {string}
+ */
+export function getConnectQueryParam({ userDid }: { userDid: string }): {
+  '__did-connect__': string;
+} {
+  const data: DIDConnectCustomQuery = {
+    forceConnected: userDid,
+    sourceAppPid: env.appPid,
+    switchBehavior: 'auto',
+    showClose: false,
+  };
+
+  return {
+    '__did-connect__': Buffer.from(JSON.stringify(data), 'utf8').toString('base64'),
+  };
+}

package/api/src/locales/en.ts

@@ -5,14 +5,17 @@ export default flat({
     common: {
       account: 'Account',
       product: 'Product',
-      paymentInfo: 'Payment Info',
-      validityPeriod: 'Validity period',
+      paymentInfo: 'Paid',
+      refundAmount: 'Refund amount',
+      refundPeriod: 'Refund period',
+      validityPeriod: 'Service period',
       trialPeriod: 'Trail period',
       viewSubscription: 'View subscription',
       viewInvoice: 'View invoice',
       viewTxHash: 'View transaction',
       trialDuration: 'Trial duration',
       duration: 'Duration',
+      permanent: 'Permanent',
       nftAddress: 'NFT Address',
       month: 'month',
       months: 'months',
@@ -20,6 +23,8 @@ export default flat({
       days: 'days',
       minute: 'minute',
       minutes: 'minutes',
+      cancellationReason: 'Cancellation reason',
+      renewNow: 'Renew now',
     },
 
     sendTo: 'Sent to',
@@ -45,17 +50,28 @@ export default flat({
       body: 'Thank you for successfully subscribing to {productName} on {at}. We will be happy to provide you with excellent service, and we wish you a pleasant experience.',
     },
 
+    oneTimePaymentSucceeded: {
+      title: 'Congratulations! Your purchase of {productName} was successful',
+      body: 'Thank you for successfully purchasing {productName} on {at}. We will provide you with excellent service, and we wish you a pleasant experience!',
+    },
+
+    subscriptionUpgraded: {
+      title: 'Congratulations! Your subscription plan for {productName} has been successfully upgraded',
+      body: 'Your subscription plan for {productName} has been successfully upgraded at {at}, thank you for your support, we wish you a pleasant experience!',
+    },
+
     subscriptionWillRenew: {
       title: '{productName} will be auto-renewed soon',
       body: 'Your subscription to {productName} expires in {willRenewDuration}. Please make sure you have enough balance in your account to auto-renew your subscription when it expires ({at}). We wish you all the best!',
       unableToPayBody:
         'Your subscription to {productName} expires in {willRenewDuration}. <span style="color: red;">Your current balance is {balance}, which is less than {price}</span>, so please make sure you have enough balance in your account to automatically renew your subscription when it expires ({at}). We wish you all the best!',
-      renewAmount: 'Amount',
+      renewAmount: 'Renewal amount',
     },
 
     subscriptionRenewed: {
-      title: '{productName} Renewal Successful',
+      title: '{productName} renewal successful',
       body: 'Your {productName} was successfully renewed on {at}. Thank you for your continued support and trust, have a great day!',
+      noExpenseIncurred: 'No charges were incurred during the service period',
     },
 
     subscriptionRenewFailed: {
@@ -80,5 +96,23 @@ export default flat({
         txSendFailed: 'Failed to send transaction when try to collect payment.',
       },
     },
+
+    subscriptionRefundSucceeded: {
+      title: '{productName} refund successful',
+      body: 'Your subscription to {productName} has been successfully refunded on {at}, with a refund amount of {refundInfo}. If you have any questions, please feel free to contact us.',
+    },
+
+    subscriptWillCanceled: {
+      title: '{productName} subscription is about to be automatically canceled',
+      body: 'Due to the long period of unsuccessful automatic renewal, your subscription to {productName} will be automatically canceled by the system on {at} ({willCancelDuration} later). Please handle the renewal issue manually in time to avoid any inconvenience. If you have any questions, please feel free to contact us.',
+      renewAmount: 'Renewal Amount',
+    },
+
+    subscriptionCanceled: {
+      title: '{productName} subscription canceled',
+      body: 'Your subscription to {productName} has been canceled on {at}. If you have any questions, please feel free to contact us.',
+      adminCanceled: 'Admin canceled',
+      adminCanceledAndRefunded: 'Admin canceled and refunded, please check for the refund email',
+    },
   },
 });

package/api/src/locales/zh.ts

@@ -5,14 +5,17 @@ export default flat({
     common: {
       account: '账号',
       product: '商品',
-      paymentInfo: '支付信息',
-      validityPeriod: '有效期',
+      paymentInfo: '已支付',
+      refundAmount: '退款金额',
+      refundPeriod: '退款周期',
+      validityPeriod: '服务周期',
       trialPeriod: '试用期',
       viewSubscription: '查看订阅',
       viewInvoice: '查看发票',
       viewTxHash: '查看交易',
       trialDuration: '试用期时长',
       duration: '时长',
+      permanent: '永久',
       nftAddress: 'NFT 地址',
       month: '个月',
       months: '个月',
@@ -20,6 +23,8 @@ export default flat({
       days: '天',
       minute: '分钟',
       minutes: '分钟',
+      cancellationReason: '取消原因',
+      renewNow: '立即续费',
     },
 
     sendTo: '发送给',
@@ -45,6 +50,16 @@ export default flat({
       body: '感谢您于 {at} 成功订阅了 {productName}。我们将竭诚为您提供优质的服务，祝您使用愉快！',
     },
 
+    oneTimePaymentSucceeded: {
+      title: '恭喜！您已购买 {productName} 成功',
+      body: '感谢您于 {at} 成功购买了 {productName}。我们将竭诚为您提供优质的服务，祝您使用愉快！',
+    },
+
+    subscriptionUpgraded: {
+      title: '恭喜！您订阅的 {productName} 套餐已成功变更',
+      body: '您订阅的 {productName} 套餐已于 {at} 变更成功，感谢您的支持，祝您使用愉快！',
+    },
+
     subscriptionWillRenew: {
       title: '{productName} 即将自动续费',
       body: '您订阅的 {productName} 还有 {willRenewDuration} 到期。请确保您的账户余额充足，以便在到期后({at})自动续费。祝您一切顺利！',
@@ -56,6 +71,7 @@ export default flat({
     subscriptionRenewed: {
       title: '{productName} 续费成功',
       body: '您的 {productName} 已于 {at} 成功续费。感谢您的持续支持与信任，祝您使用愉快！',
+      noExpenseIncurred: '服务期间未产生费用',
     },
 
     subscriptionRenewFailed: {
@@ -75,5 +91,23 @@ export default flat({
         txSendFailed: '扣款交易发送失败',
       },
     },
+
+    subscriptionRefundSucceeded: {
+      title: '{productName} 退款成功',
+      body: '您订阅的 {productName} 在 {at} 已退款成功，退款金额为 {refundInfo}。如有任何疑问，请随时与我们联系。',
+    },
+
+    subscriptWillCanceled: {
+      title: '{productName} 订阅即将自动取消',
+      body: '由于长时间未能自动完成续费，您订阅的 {productName} 将于 {at} ({willCancelDuration}后) 被系统自动取消订阅。请您及时手动处理续费问题，以免影响使用。如有任何疑问，请随时与我们联系。',
+      renewAmount: '续费金额',
+    },
+
+    subscriptionCanceled: {
+      title: '{productName} 订阅已取消',
+      body: '您订阅的 {productName} 在 {at} 已取消。如有任何疑问，请随时与我们联系。',
+      adminCanceled: '管理员取消',
+      adminCanceledAndRefunded: '管理员取消并已退款,请留意后续的退款邮件',
+    },
   },
 });

package/api/src/queues/notification.ts

@@ -1,7 +1,20 @@
+/* eslint-disable @typescript-eslint/indent */
 import { events } from '../libs/event';
 import logger from '../libs/logger';
 import { Notification } from '../libs/notification';
 import type { BaseEmailTemplate } from '../libs/notification/template/base';
+import {
+  OneTimePaymentSucceededEmailTemplate,
+  OneTimePaymentSucceededEmailTemplateOptions,
+} from '../libs/notification/template/one-time-payment-succeeded';
+import {
+  SubscriptionCanceledEmailTemplate,
+  SubscriptionCanceledEmailTemplateOptions,
+} from '../libs/notification/template/subscription-cacceled';
+import {
+  SubscriptionRefundSucceededEmailTemplate,
+  SubscriptionRefundSucceededEmailTemplateOptions,
+} from '../libs/notification/template/subscription-refund-succeeded';
 import {
   SubscriptionRenewFailedEmailTemplate,
   SubscriptionRenewFailedEmailTemplateOptions,
@@ -22,16 +35,31 @@ import {
   SubscriptionTrailWilEndEmailTemplate,
   SubscriptionTrialWillEndEmailTemplateOptions,
 } from '../libs/notification/template/subscription-trial-will-end';
+import {
+  SubscriptionUpgradedEmailTemplate,
+  SubscriptionUpgradedEmailTemplateOptions,
+} from '../libs/notification/template/subscription-upgraded';
+import {
+  SubscriptionWillCanceledEmailTemplate,
+  SubscriptionWillCanceledEmailTemplateOptions,
+} from '../libs/notification/template/subscription-will-canceled';
 import {
   SubscriptionWillRenewEmailTemplate,
   SubscriptionWillRenewEmailTemplateOptions,
 } from '../libs/notification/template/subscription-will-renew';
 import createQueue from '../libs/queue';
-import { EventType, Invoice, Subscription } from '../store/models';
+import { CheckoutSession, EventType, Invoice, Refund, Subscription } from '../store/models';
 
 export type NotificationQueueJobOptions = any;
+
+export type NotificationQueueJobType =
+  | EventType
+  | 'customer.subscription.will_renew'
+  | 'customer.subscription.trial_will_end'
+  | 'customer.subscription.will_canceled';
+
 export type NotificationQueueJob = {
-  type: EventType | 'customer.subscription.will_renew' | 'customer.subscription.trial_will_end';
+  type: NotificationQueueJobType;
   options: NotificationQueueJobOptions;
 };
 
@@ -39,6 +67,12 @@ function getNotificationTemplate(job: NotificationQueueJob): BaseEmailTemplate {
   if (job.type === 'customer.subscription.started') {
     return new SubscriptionSucceededEmailTemplate(job.options as SubscriptionSucceededEmailTemplateOptions);
   }
+  if (job.type === 'checkout.session.completed') {
+    return new OneTimePaymentSucceededEmailTemplate(job.options as OneTimePaymentSucceededEmailTemplateOptions);
+  }
+  if (job.type === 'customer.subscription.upgraded') {
+    return new SubscriptionUpgradedEmailTemplate(job.options as SubscriptionUpgradedEmailTemplateOptions);
+  }
   if (job.type === 'customer.subscription.renewed') {
     return new SubscriptionRenewedEmailTemplate(job.options as SubscriptionRenewedEmailTemplateOptions);
   }
@@ -54,6 +88,15 @@ function getNotificationTemplate(job: NotificationQueueJob): BaseEmailTemplate {
   if (job.type === 'customer.subscription.trial_will_end') {
     return new SubscriptionTrailWilEndEmailTemplate(job.options as SubscriptionTrialWillEndEmailTemplateOptions);
   }
+  if (job.type === 'customer.subscription.will_canceled') {
+    return new SubscriptionWillCanceledEmailTemplate(job.options as SubscriptionWillCanceledEmailTemplateOptions);
+  }
+  if (job.type === 'customer.subscription.canceled') {
+    return new SubscriptionCanceledEmailTemplate(job.options as SubscriptionCanceledEmailTemplateOptions);
+  }
+  if (job.type === 'refund.succeeded') {
+    return new SubscriptionRefundSucceededEmailTemplate(job.options as SubscriptionRefundSucceededEmailTemplateOptions);
+  }
 
   throw new Error(`Unknown job type: ${job.type}`);
 }
@@ -87,6 +130,7 @@ export const notificationQueue = createQueue<NotificationQueueJob>({
  */
 // eslint-disable-next-line require-await
 export async function startNotificationQueue() {
+  // 试用期开始
   events.on('customer.subscription.trial_start', (subscription: Subscription) => {
     notificationQueue.push({
       job: {
@@ -112,6 +156,18 @@ export async function startNotificationQueue() {
     }
   });
 
+  // 一次性购买成功
+  events.on('checkout.session.completed', (checkoutSession: CheckoutSession) => {
+    notificationQueue.push({
+      job: {
+        type: 'checkout.session.completed',
+        options: {
+          checkoutSessionId: checkoutSession.id,
+        },
+      },
+    });
+  });
+
   events.on('customer.subscription.renewed', (subscription: Subscription) => {
     notificationQueue.push({
       job: {
@@ -138,4 +194,37 @@ export async function startNotificationQueue() {
       });
     }
   });
+
+  events.on('customer.subscription.upgraded', (subscription: Subscription) => {
+    notificationQueue.push({
+      job: {
+        type: 'customer.subscription.upgraded',
+        options: {
+          subscriptionId: subscription.id,
+        },
+      },
+    });
+  });
+
+  events.on('refund.succeeded', (refund: Refund) => {
+    notificationQueue.push({
+      job: {
+        type: 'refund.succeeded',
+        options: {
+          refundId: refund.id,
+        },
+      },
+    });
+  });
+
+  events.on('customer.subscription.canceled', (subscription: Subscription) => {
+    notificationQueue.push({
+      job: {
+        type: 'customer.subscription.canceled',
+        options: {
+          subscriptionId: subscription.id,
+        },
+      },
+    });
+  });
 }

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

@@ -16,8 +16,8 @@ export default {
   action: 'setup',
   authPrincipal: false,
   claims: {
-    authPrincipal: async ({ extraParams }: CallbackArgs) => {
-      const { paymentMethod } = await ensureSetupIntent(extraParams.checkoutSessionId);
+    authPrincipal: async ({ extraParams, userDid }: CallbackArgs) => {
+      const { paymentMethod } = await ensureSetupIntent(extraParams.checkoutSessionId, userDid);
       return getAuthPrincipalClaim(paymentMethod, 'subscribe');
     },
   },

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

@@ -133,7 +133,7 @@ export async function ensurePaymentIntent(checkoutSessionId: string, userDid?: s
   };
 }
 
-export async function ensureSetupIntent(checkoutSessionId: string, userDid?: string) {
+export async function ensureSetupIntent(checkoutSessionId: string, userDid: string) {
   const checkoutSession = await ensureCheckoutSession(checkoutSessionId);
 
   let customerId;
@@ -357,7 +357,7 @@ export async function ensureInvoiceAndItems({
   applyCredit = true,
 }: {
   customer: Customer;
-    currency: PaymentCurrency;
+  currency: PaymentCurrency;
   subscription?: Subscription;
   props: TInvoice;
   lineItems: TLineItemExpanded[];

package/api/src/store/models/subscription.ts

@@ -314,6 +314,11 @@ export class Subscription extends Model<InferAttributes<Subscription>, InferCrea
               }
             }
 
+            // 发射 canceled 事件
+            if (model.status === 'canceled' && model.previous('status') !== model.status) {
+              createEvent('Subscription', 'customer.subscription.canceled', model, options).catch(console.error);
+            }
+
             createStatusEvent(
               'Subscription',
               'customer.subscription',

package/api/src/store/models/types.ts

@@ -422,6 +422,7 @@ export type EventType = LiteralUnion<
   | 'customer.subscription.trial_end'
   | 'customer.subscription.started'
   | 'customer.subscription.updated'
+  | 'customer.subscription.canceled'
   | 'customer.tax_id.created'
   | 'customer.tax_id.deleted'
   | 'customer.tax_id.updated'
@@ -514,6 +515,8 @@ export type EventType = LiteralUnion<
   | 'recipient.updated'
   | 'refund.created'
   | 'refund.updated'
+  | 'refund.succeeded'
+  | 'refund.canceled'
   | 'reporting.report_run.failed'
   | 'reporting.report_run.succeeded'
   | 'reporting.report_type.updated'

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

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "payment-kit",
-  "version": "1.13.136",
+  "version": "1.13.138",
   "scripts": {
-    "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
+    "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev --open",
     "eject": "vite eject",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
     "lint:fix": "npm run lint -- --fix",
@@ -42,31 +42,31 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "1.16.23-beta-aeb9f5bd",
-    "@arcblock/did": "^1.18.108",
+    "@abtnode/cron": "1.16.23",
+    "@arcblock/did": "^1.18.110",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.9.23",
-    "@arcblock/did-util": "^1.18.108",
-    "@arcblock/jwt": "^1.18.108",
-    "@arcblock/ux": "^2.9.23",
-    "@blocklet/logger": "1.16.23-beta-aeb9f5bd",
-    "@blocklet/payment-react": "1.13.136",
-    "@blocklet/sdk": "1.16.23-beta-aeb9f5bd",
-    "@blocklet/ui-react": "^2.9.23",
-    "@blocklet/uploader": "^0.0.69",
-    "@mui/icons-material": "^5.15.6",
-    "@mui/lab": "^5.0.0-alpha.162",
-    "@mui/material": "^5.15.6",
-    "@mui/styles": "^5.15.6",
-    "@mui/system": "^5.15.6",
-    "@ocap/asset": "^1.18.108",
-    "@ocap/client": "^1.18.108",
-    "@ocap/mcrypto": "^1.18.108",
-    "@ocap/util": "^1.18.108",
-    "@ocap/wallet": "^1.18.108",
+    "@arcblock/did-connect": "^2.9.29",
+    "@arcblock/did-util": "^1.18.110",
+    "@arcblock/jwt": "^1.18.110",
+    "@arcblock/ux": "^2.9.29",
+    "@blocklet/logger": "1.16.23",
+    "@blocklet/payment-react": "1.13.138",
+    "@blocklet/sdk": "1.16.23",
+    "@blocklet/ui-react": "^2.9.29",
+    "@blocklet/uploader": "^0.0.73",
+    "@mui/icons-material": "^5.15.8",
+    "@mui/lab": "^5.0.0-alpha.164",
+    "@mui/material": "^5.15.7",
+    "@mui/styles": "^5.15.8",
+    "@mui/system": "^5.15.8",
+    "@ocap/asset": "^1.18.110",
+    "@ocap/client": "^1.18.110",
+    "@ocap/mcrypto": "^1.18.110",
+    "@ocap/util": "^1.18.110",
+    "@ocap/wallet": "^1.18.110",
     "@stripe/react-stripe-js": "^2.4.0",
-    "@stripe/stripe-js": "^2.2.0",
-    "ahooks": "^3.7.8",
+    "@stripe/stripe-js": "^2.4.0",
+    "ahooks": "^3.7.10",
     "axios": "^0.27.2",
     "body-parser": "^1.20.2",
     "cls-hooked": "^4.2.2",
@@ -78,12 +78,12 @@
     "express": "^4.18.2",
     "express-async-errors": "^3.1.1",
     "express-history-api-fallback": "^2.2.1",
-    "fastq": "^1.15.0",
+    "fastq": "^1.17.1",
     "flat": "^5.0.2",
-    "google-libphonenumber": "^3.2.33",
+    "google-libphonenumber": "^3.2.34",
     "iframe-resizer-react": "^1.1.0",
-    "joi": "^17.11.0",
-    "json-stable-stringify": "^1.1.0",
+    "joi": "^17.12.1",
+    "json-stable-stringify": "^1.1.1",
     "lodash": "^4.17.21",
     "morgan": "^1.10.0",
     "nanoid": "3",
@@ -92,32 +92,32 @@
     "pretty-ms-i18n": "^1.0.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-error-boundary": "^4.0.11",
-    "react-hook-form": "^7.48.2",
+    "react-error-boundary": "^4.0.12",
+    "react-hook-form": "^7.50.1",
     "react-international-phone": "^3.1.2",
-    "react-router-dom": "^6.20.1",
+    "react-router-dom": "^6.22.0",
     "rimraf": "^3.0.2",
-    "sequelize": "^6.35.1",
+    "sequelize": "^6.36.0",
     "sql-where-parser": "^2.2.1",
     "sqlite3": "^5.1.7",
     "stripe": "^13.11.0",
     "typewriter-effect": "^2.21.0",
-    "ufo": "^1.3.2",
-    "umzug": "^3.4.0",
+    "ufo": "^1.4.0",
+    "umzug": "^3.6.1",
     "use-bus": "^2.5.2",
     "validator": "^13.11.0"
   },
   "devDependencies": {
-    "@abtnode/types": "1.16.23-beta-aeb9f5bd",
+    "@abtnode/types": "1.16.23",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.136",
+    "@blocklet/payment-types": "1.13.138",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
     "@types/express": "^4.17.21",
-    "@types/node": "^18.19.2",
-    "@types/react": "^18.2.42",
-    "@types/react-dom": "^18.2.17",
+    "@types/node": "^18.19.14",
+    "@types/react": "^18.2.55",
+    "@types/react-dom": "^18.2.18",
     "@vitejs/plugin-react": "^2.2.0",
     "bumpp": "^8.2.1",
     "cross-env": "^7.0.3",
@@ -130,10 +130,10 @@
     "prettier": "^2.8.8",
     "prettier-plugin-import-sort": "^0.0.7",
     "ts-jest": "^29.1.2",
-    "ts-node": "^10.9.1",
-    "type-fest": "^4.8.3",
+    "ts-node": "^10.9.2",
+    "type-fest": "^4.10.2",
     "typescript": "^4.9.5",
-    "vite": "^4.5.1",
+    "vite": "^4.5.2",
     "vite-plugin-blocklet": "^0.7.2",
     "vite-plugin-node-polyfills": "^0.7.0",
     "vite-plugin-svgr": "^2.4.0",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "ab601e3842610993e41ac2951acaf040a0d345b6"
+  "gitHead": "2865a4ed4a06029cd97a4f0914c1c3c61b5182cb"
 }

package/src/contexts/session.ts

@@ -3,8 +3,8 @@ import { useContext } from 'react';
 
 const { SessionProvider, SessionContext, SessionConsumer, withSession } = createAuthServiceSessionContext();
 
-export function useSessionContext(): any {
-  return useContext(SessionContext);
+export function useSessionContext() {
+  return useContext<import('@arcblock/did-connect/lib/types').SessionContext>(SessionContext);
 }
 
 export { SessionProvider, SessionContext, SessionConsumer, withSession };

package/src/pages/admin/payments/links/create.tsx

@@ -158,7 +158,7 @@ export default function CreatePaymentLink() {
             <Typography variant="h6" sx={{ mb: 2, fontWeight: 600 }}>
               {t('common.preview')}
             </Typography>
-            {stashed && <PaymentLinkPreview id={`plink_${session.user.did}`} version={stashed} />}
+            {stashed && <PaymentLinkPreview id={`plink_${session?.user?.did}`} version={stashed} />}
           </Stack>
         </Stack>
       </FormProvider>

package/src/pages/admin/products/pricing-tables/create.tsx

@@ -132,7 +132,7 @@ export default function CreatePricingTable() {
               <Typography variant="h6" sx={{ mb: 2, fontWeight: 600 }}>
                 {t('common.preview')}
               </Typography>
-              {stashed && <PricingTablePreview id={`prctbl_${session.user.did}`} version={stashed} />}
+              {stashed && <PricingTablePreview id={`prctbl_${session?.user?.did}`} version={stashed} />}
             </Box>
           </Stack>
         </ProductsProvider>