@abtnode/core 1.16.8-beta-81db8efa → 1.16.8-beta-186fd5aa

package/lib/blocklet/manager/disk.js

@@ -1227,14 +1227,26 @@ class BlockletManager extends BaseBlockletManager {
   }
 
   async configNotification({ did, notification = {} }) {
-    const newConfig = JSON.parse(notification);
-    const { error, value: validateConfig } = emailConfigSchema.validate(newConfig);
-    if (error) {
-      logger.error('configNotification validate error', { error });
-      throw new Error(error.message);
+    let newConfig = {};
+    try {
+      newConfig = JSON.parse(notification);
+    } catch (error) {
+      logger.error('parse configNotification error', { error });
+      throw new Error('parse configNotification error');
+    }
+    const enabled = newConfig?.email?.enabled;
+    if (enabled) {
+      const { error } = emailConfigSchema.validate(
+        pick(newConfig?.email || {}, ['from', 'host', 'port', 'user', 'password'])
+      );
+      if (error) {
+        logger.error('configNotification validate error', { error });
+        throw new Error(error.message);
+      }
     }
     const oldConfig = await states.blockletExtras.getSettings(did, 'notification', {});
-    const mergeConfig = { ...oldConfig, ...validateConfig };
+    // NOTICE：validate 本身没有做任何字段规范化处理，所以处理后的结果跟处理前是一样的，最终结果的合并先使用原始值
+    const mergeConfig = { ...oldConfig, ...newConfig };
     await states.blockletExtras.setSettings(did, { notification: mergeConfig });
     const newState = await this.getBlocklet(did);
     this.emit(BlockletEvents.updated, newState);

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.8-beta-81db8efa",
+  "version": "1.16.8-beta-186fd5aa",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.8-beta-81db8efa",
-    "@abtnode/certificate-manager": "1.16.8-beta-81db8efa",
-    "@abtnode/constant": "1.16.8-beta-81db8efa",
-    "@abtnode/cron": "1.16.8-beta-81db8efa",
-    "@abtnode/db": "1.16.8-beta-81db8efa",
-    "@abtnode/logger": "1.16.8-beta-81db8efa",
-    "@abtnode/queue": "1.16.8-beta-81db8efa",
-    "@abtnode/rbac": "1.16.8-beta-81db8efa",
-    "@abtnode/router-provider": "1.16.8-beta-81db8efa",
-    "@abtnode/static-server": "1.16.8-beta-81db8efa",
-    "@abtnode/timemachine": "1.16.8-beta-81db8efa",
-    "@abtnode/util": "1.16.8-beta-81db8efa",
+    "@abtnode/auth": "1.16.8-beta-186fd5aa",
+    "@abtnode/certificate-manager": "1.16.8-beta-186fd5aa",
+    "@abtnode/constant": "1.16.8-beta-186fd5aa",
+    "@abtnode/cron": "1.16.8-beta-186fd5aa",
+    "@abtnode/db": "1.16.8-beta-186fd5aa",
+    "@abtnode/logger": "1.16.8-beta-186fd5aa",
+    "@abtnode/queue": "1.16.8-beta-186fd5aa",
+    "@abtnode/rbac": "1.16.8-beta-186fd5aa",
+    "@abtnode/router-provider": "1.16.8-beta-186fd5aa",
+    "@abtnode/static-server": "1.16.8-beta-186fd5aa",
+    "@abtnode/timemachine": "1.16.8-beta-186fd5aa",
+    "@abtnode/util": "1.16.8-beta-186fd5aa",
     "@arcblock/did": "1.18.78",
     "@arcblock/did-auth": "1.18.78",
     "@arcblock/did-ext": "^1.18.78",
@@ -41,9 +41,9 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.78",
     "@arcblock/vc": "1.18.78",
-    "@blocklet/constant": "1.16.8-beta-81db8efa",
-    "@blocklet/meta": "1.16.8-beta-81db8efa",
-    "@blocklet/sdk": "1.16.8-beta-81db8efa",
+    "@blocklet/constant": "1.16.8-beta-186fd5aa",
+    "@blocklet/meta": "1.16.8-beta-186fd5aa",
+    "@blocklet/sdk": "1.16.8-beta-186fd5aa",
     "@did-space/client": "^0.2.91",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.78",
@@ -95,5 +95,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "8c4e3190de79a1fb2aaa14646255d938324cc5c2"
+  "gitHead": "3150c3a5c3e041fe7f5a3902418d9d62adee3173"
 }