@abtnode/core 1.7.13 → 1.7.14

package/lib/index.js

@@ -426,7 +426,7 @@ function ABTNode(options) {
           action,
           args: {},
           context: formatContext({
-            user: { fullName: 'CLI', role: 'self', did: options.nodeDid },
+            user: { fullName: 'CLI', role: 'admin', did: options.nodeDid },
             headers: { 'user-agent': 'CLI' },
           }),
           result: null,

package/lib/states/audit-log.js

@@ -1,6 +1,7 @@
 /* eslint-disable no-async-promise-executor */
 const pick = require('lodash/pick');
 const get = require('lodash/get');
+const joinUrl = require('url-join');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
 const { BLOCKLET_SITE_GROUP_SUFFIX } = require('@abtnode/constant');
 const logger = require('@abtnode/logger')('@abtnode/core:states:audit-log');
@@ -10,8 +11,8 @@ const BaseState = require('./base');
 const { parse } = require('../util/ua');
 const { lookup } = require('../util/ip');
 
-const getServerInfo = (info) => `[${info.name}](${info.routing.adminPath}/settings/about)`;
-const getBlockletInfo = (blocklet, info) => `[${getDisplayName(blocklet)} v${blocklet.meta.version}](${info.routing.adminPath}/blocklets/${blocklet.meta.did})`; // prettier-ignore
+const getServerInfo = (info) => `[${info.name}](${joinUrl(info.routing.adminPath, '/settings/about')})`;
+const getBlockletInfo = (blocklet, info) => `[${getDisplayName(blocklet)} v${blocklet.meta.version}](${joinUrl(info.routing.adminPath, '/blocklets/', blocklet.meta.did, '/overview')})`; // prettier-ignore
 const expandTeam = async (teamDid, info, node) => {
   if (!teamDid) {
     return '';
@@ -64,10 +65,10 @@ const expandUser = async (teamDid, userDid, passportId, info, node) => {
   const passport = user.passports.find((x) => x.id === passportId);
 
   if (teamDid === info.did) {
-    return [`[${user.fullName}](${info.routing.adminPath}/team/members)`, passport ? passport.name : ''];
+    return [`[${user.fullName}](${joinUrl(info.routing.adminPath, '/team/members')})`, passport ? passport.name : ''];
   }
 
-  return [`[${user.fullName}](${info.routing.adminPath}/blocklets/${teamDid}/members)`, passport ? passport.name : ''];
+  return [`[${user.fullName}](${joinUrl(info.routing.adminPath, '/blocklets/', teamDid, '/members')})`, passport ? passport.name : '']; // prettier-ignore
 };
 
 /**
@@ -181,7 +182,7 @@ const getLogContent = async (action, args, context, result, info, node) => {
     case 'updateNodeInfo':
       return `updated basic server settings: \n${Object.keys(args).map(x => `- ${x}: ${args[x]}`).join('\n')}`; // prettier-ignore
     case 'upgradeNodeVersion':
-      return `triggered server upgrade to ${info.nextVersion}`;
+      return `upgrade server to ${info.nextVersion}`;
     case 'startServer':
       return 'server was started';
     case 'stopServer':
@@ -329,7 +330,7 @@ class AuditLogState extends BaseState {
     }
    * @return {object} new doc
    */
-  create({ action, args, context, result }, node) {
+  create({ action, args = {}, context = {}, result = {} }, node) {
     return new Promise(async (resolve) => {
       // Do not store secure configs in audit log
       if (Array.isArray(args.configs)) {

package/lib/util/upgrade.js

@@ -38,7 +38,7 @@ const checkNewVersion = async (params, context) => {
           entityType: 'node',
           severity: 'info',
           sticky: true,
-          action: '/settings/basic',
+          action: '/settings/about',
         });
 
         return latestVersion;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.13",
+  "version": "1.7.14",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,23 +19,23 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.7.13",
-    "@abtnode/constant": "1.7.13",
-    "@abtnode/cron": "1.7.13",
-    "@abtnode/db": "1.7.13",
-    "@abtnode/logger": "1.7.13",
-    "@abtnode/queue": "1.7.13",
-    "@abtnode/rbac": "1.7.13",
-    "@abtnode/router-provider": "1.7.13",
-    "@abtnode/static-server": "1.7.13",
-    "@abtnode/timemachine": "1.7.13",
-    "@abtnode/util": "1.7.13",
+    "@abtnode/certificate-manager": "1.7.14",
+    "@abtnode/constant": "1.7.14",
+    "@abtnode/cron": "1.7.14",
+    "@abtnode/db": "1.7.14",
+    "@abtnode/logger": "1.7.14",
+    "@abtnode/queue": "1.7.14",
+    "@abtnode/rbac": "1.7.14",
+    "@abtnode/router-provider": "1.7.14",
+    "@abtnode/static-server": "1.7.14",
+    "@abtnode/timemachine": "1.7.14",
+    "@abtnode/util": "1.7.14",
     "@arcblock/did": "^1.16.6",
     "@arcblock/did-motif": "^1.1.5",
     "@arcblock/event-hub": "1.16.6",
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/vc": "^1.16.6",
-    "@blocklet/meta": "1.7.13",
+    "@blocklet/meta": "1.7.14",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
@@ -78,5 +78,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "c35c485417df0e023c06c09557644b46a6c8c655"
+  "gitHead": "1f3855e6dc8b6d6c91526264e2f63215df6b962c"
 }