payment-kit 1.19.21 → 1.19.22

package/api/src/crons/metering-subscription-detection.ts

@@ -208,7 +208,7 @@ export async function createMeteringSubscriptionDetection() {
     const context = await template.getContext();
     const notification = await template.getTemplate();
 
-    await Notification.sendToUser(context.userDid, notification as any);
+    await Notification.sendToUser(context.userDid, notification as any, { allowUnsubscribe: false });
     logger.info('Metering subscription detection created', context);
   } catch (error) {
     logger.error('Failed to create metering subscription detection', error);

package/api/src/integrations/blocklet/notification.ts

@@ -63,16 +63,18 @@ export async function sendNotification({
   message,
   actions,
   attachments = [],
+  allowUnsubscribe = false, // 是否允许用户取消订阅，如果为false，则用户无法取消订阅，用户总会收到邮件
 }: {
   to: string;
   title: string;
   message: string;
   actions: any[];
   attachments: any[];
+  allowUnsubscribe?: boolean;
 }) {
   try {
     const payload = { title, body: message, actions: actions || [], attachments: [...attachments] };
-    await Notification.sendToUser(to, payload);
+    await Notification.sendToUser(to, payload, { allowUnsubscribe });
     logger.info('text message was sent', { to, payload: JSON.stringify(payload, null, 2) });
   } catch (error) {
     logger.error('send text message failed', { error, to, message, actions, attachments });

package/api/src/libs/auth.ts

@@ -1,7 +1,7 @@
 import path from 'path';
 
 import AuthStorage from '@arcblock/did-connect-storage-nedb';
-import AuthService from '@blocklet/sdk/lib/service/auth';
+import AuthService from '@blocklet/sdk/service/auth';
 import getWallet from '@blocklet/sdk/lib/wallet';
 import WalletAuthenticator from '@blocklet/sdk/lib/wallet-authenticator';
 import WalletHandler from '@blocklet/sdk/lib/wallet-handler';

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

@@ -17,7 +17,7 @@ export class Notification {
     }
   }
 
-  async send() {
+  async send(allowUnsubscribe: boolean = false) {
     const template: BaseEmailTemplateType | null = await this.template.getTemplate();
 
     if (!template) {
@@ -62,7 +62,8 @@ export class Notification {
     } catch (error) {
       logger.error('Check notification settings error', error);
     }
-    await BlockletNotification.sendToUser(userDid, template as any);
+
+    await BlockletNotification.sendToUser(userDid, template as any, { allowUnsubscribe });
   }
   private async getEntityFromOptions(options: Record<string, any>) {
     if (options.subscriptionId) {

package/api/src/libs/util.ts

@@ -436,7 +436,7 @@ export async function getDidListByRole(role: string | string[]) {
       await Promise.all(
         role.map(async (r: string) => {
           const { users } = await blocklet.getUsers({ query: { role: r } });
-          users.forEach((u) => didSet.add(u.did));
+          users.forEach((u: any) => didSet.add(u.did));
         })
       );
       return Array.from(didSet);

package/api/third.d.ts

@@ -2,6 +2,8 @@ declare module 'vite-plugin-blocklet';
 
 declare module '@blocklet/sdk/service/notification';
 
+declare module '@blocklet/sdk/service/auth';
+
 declare module 'express-history-api-fallback';
 
 declare module 'express-async-errors';

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.19.21",
+  "version": "1.19.22",
   "scripts": {
     "dev": "blocklet dev --open",
     "lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
@@ -55,7 +55,7 @@
     "@blocklet/error": "^0.2.5",
     "@blocklet/js-sdk": "^1.16.48",
     "@blocklet/logger": "^1.16.48",
-    "@blocklet/payment-react": "1.19.21",
+    "@blocklet/payment-react": "1.19.22",
     "@blocklet/sdk": "^1.16.48",
     "@blocklet/ui-react": "^3.1.32",
     "@blocklet/uploader": "^0.2.7",
@@ -124,7 +124,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.48",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.19.21",
+    "@blocklet/payment-types": "1.19.22",
     "@types/cookie-parser": "^1.4.9",
     "@types/cors": "^2.8.19",
     "@types/debug": "^4.1.12",
@@ -171,5 +171,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "66941895c869b90d0635b9d2a56593b2c85a3e3e"
+  "gitHead": "53d092fa1c88542b297c6333b810ba29751eef19"
 }