@abtnode/core 1.16.52-beta-20250909-073849-4e392ab1 → 1.16.52-beta-20250911-023851-d988be85

package/lib/states/audit-log.js

@@ -5,6 +5,11 @@ const get = require('lodash/get');
 const uniq = require('lodash/uniq');
 const isEqual = require('lodash/isEqual');
 const isNil = require('lodash/isNil');
+const isObject = require('lodash/isObject');
+const isArray = require('lodash/isArray');
+const isString = require('lodash/isString');
+const mapValues = require('lodash/mapValues');
+const map = require('lodash/map');
 const { joinURL } = require('ufo');
 const { Op } = require('sequelize');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
@@ -197,6 +202,36 @@ const getResponseHeaderPolicyInfo = (policy) => {
     .join(', ');
 };
 
+/**
+ * 隐藏私密信息，主要字段有
+ * 1. email
+ */
+const hidePrivateInfo = (result) => {
+  const emailRegex =
+    /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
+
+  const processValue = (value, key) => {
+    // 如果字段名包含 email 或值是邮箱格式，则隐藏
+    if ((key && /email/i.test(key)) || (isString(value) && emailRegex.test(value))) {
+      return '***';
+    }
+
+    // 递归处理对象
+    if (isObject(value) && !isArray(value)) {
+      return mapValues(value, processValue);
+    }
+
+    // 递归处理数组
+    if (isArray(value)) {
+      return map(value, (item) => processValue(item));
+    }
+
+    return value;
+  };
+
+  return processValue(result);
+};
+
 /**
  * Create log content in markdown format
  *
@@ -211,7 +246,13 @@ const getResponseHeaderPolicyInfo = (policy) => {
 const getLogContent = async (action, args, context, result, info, node) => {
   const [site, [user, passport]] = await Promise.all([
     expandSite(args.id, info, node),
-    expandUser(args.teamDid, args.userDid || get(args, 'user.did') || args.ownerDid, args.passportId, info, node),
+    expandUser(
+      args.teamDid,
+      args.userDid || get(args, 'user.did') || args.ownerDid || args.did,
+      args.passportId,
+      info,
+      node
+    ),
   ]);
 
   switch (action) {
@@ -369,6 +410,55 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `${args.user.approved ? 'enabled' : 'disabled'} user ${user}`;
     case 'updateUserTags':
       return `set tags to ${args.tags} for user ${user}`;
+    case 'updateUserExtra':
+      let type = args.type || '';
+      const extraResult = result.extra || result;
+      let resultStr = '\n';
+      let isFormat = false;
+      if (type === 'privacy' || Object.prototype.hasOwnProperty.call(extraResult, 'privacy')) {
+        resultStr += Object.keys(extraResult.privacy)
+          .map((x) => {
+            const value = extraResult.privacy[x];
+            let v = value;
+            if (value === true || value === 'all') {
+              v = 'public';
+            } else if (value === false || value === 'private') {
+              v = 'private';
+            } else if (value === 'follower-only') {
+              v = 'follower-only';
+            } else {
+              v = value;
+            }
+            return `- ${x}: ${v}`;
+          })
+          .join('\n');
+        isFormat = true;
+        type = 'privacy';
+      }
+      if (type === 'notifications' || Object.prototype.hasOwnProperty.call(extraResult, 'notifications')) {
+        resultStr += Object.keys(extraResult?.notifications || {})
+          .map((x) => `- ${x}: ${extraResult.notifications[x]}`)
+          .join('\n');
+        isFormat = true;
+        type = 'notifications';
+      }
+      if (type === 'webhooks' || Object.prototype.hasOwnProperty.call(extraResult, 'webhooks')) {
+        resultStr += (extraResult?.webhooks || []).length
+          ? extraResult.webhooks.map((x) => `- ${x.type}: ${x.url}`).join('\n')
+          : 'removed all webhooks';
+        isFormat = true;
+        type = 'webhooks';
+      }
+      if (!isFormat) {
+        resultStr = JSON.stringify(hidePrivateInfo(extraResult));
+        type = 'extra';
+      }
+      return `updated user ${type} for user ${user}: \n${resultStr}`;
+    case 'updateUserAddress':
+      const addressResult = Object.prototype.hasOwnProperty.call(result, 'address') ? result.address : result;
+      return `updated user address for user ${user}: \n${JSON.stringify(hidePrivateInfo(addressResult))}`;
+    case 'updateUserInfo':
+      return `update user info for user ${user}: \n\n${JSON.stringify(hidePrivateInfo(result))}`;
     case 'deletePassportIssuance':
       return `removed passport issuance ${args.sessionId}`;
     case 'createMemberInvitation':
@@ -551,6 +641,19 @@ const getLogContent = async (action, args, context, result, info, node) => {
       return `Update Blocklet Extras Settings:(${args.did} to ${changes.join(', ')})`;
     }
 
+    // user follow
+    case 'followUser':
+    case 'unfollowUser':
+      const followerUser = await node.getUser({ teamDid: args.teamDid, user: { did: args.followerDid } });
+      const prefix = process.env.NODE_ENV === 'production' ? info.routing.adminPath : '';
+      return `[${followerUser.fullName}](${joinURL(prefix, '/team/members')}) ${action === 'followUser' ? 'followed' : 'unfollowed'} user ${user}`;
+
+    // connect to aigne
+    case 'connectToAigne':
+      return `Connect to Aigne(${args.baseUrl})`;
+    case 'disconnectToAigne':
+      return `Disconnect to Aigne(${args.url})`;
+
     default:
       return action;
   }
@@ -599,6 +702,8 @@ const getLogCategory = (action) => {
     case 'createOAuthClient':
     case 'updateOAuthClient':
     case 'updateBlockletSettings':
+    case 'connectToAigne':
+    case 'disconnectToAigne':
       return 'blocklet';
 
     case 'addUploadEndpoint':
@@ -648,6 +753,11 @@ const getLogCategory = (action) => {
     case 'loginFederatedMaster':
     case 'migrateFederatedAccount':
     case 'destroySelf':
+    case 'updateUserExtra':
+    case 'updateUserAddress':
+    case 'updateUserInfo':
+    case 'followUser':
+    case 'unfollowUser':
       return 'team';
 
     // accessKeys

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.52-beta-20250909-073849-4e392ab1",
+  "version": "1.16.52-beta-20250911-023851-d988be85",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,21 +19,21 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@abtnode/auth": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@abtnode/certificate-manager": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@abtnode/constant": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@abtnode/cron": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@abtnode/db-cache": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@abtnode/docker-utils": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@abtnode/logger": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@abtnode/models": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@abtnode/queue": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@abtnode/rbac": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@abtnode/router-provider": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@abtnode/static-server": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@abtnode/timemachine": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@abtnode/util": "1.16.52-beta-20250909-073849-4e392ab1",
+    "@abtnode/analytics": "1.16.52-beta-20250911-023851-d988be85",
+    "@abtnode/auth": "1.16.52-beta-20250911-023851-d988be85",
+    "@abtnode/certificate-manager": "1.16.52-beta-20250911-023851-d988be85",
+    "@abtnode/constant": "1.16.52-beta-20250911-023851-d988be85",
+    "@abtnode/cron": "1.16.52-beta-20250911-023851-d988be85",
+    "@abtnode/db-cache": "1.16.52-beta-20250911-023851-d988be85",
+    "@abtnode/docker-utils": "1.16.52-beta-20250911-023851-d988be85",
+    "@abtnode/logger": "1.16.52-beta-20250911-023851-d988be85",
+    "@abtnode/models": "1.16.52-beta-20250911-023851-d988be85",
+    "@abtnode/queue": "1.16.52-beta-20250911-023851-d988be85",
+    "@abtnode/rbac": "1.16.52-beta-20250911-023851-d988be85",
+    "@abtnode/router-provider": "1.16.52-beta-20250911-023851-d988be85",
+    "@abtnode/static-server": "1.16.52-beta-20250911-023851-d988be85",
+    "@abtnode/timemachine": "1.16.52-beta-20250911-023851-d988be85",
+    "@abtnode/util": "1.16.52-beta-20250911-023851-d988be85",
     "@aigne/aigne-hub": "^0.8.10",
     "@arcblock/did": "1.24.0",
     "@arcblock/did-connect-js": "1.24.0",
@@ -45,15 +45,15 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.24.0",
     "@arcblock/vc": "1.24.0",
-    "@blocklet/constant": "1.16.52-beta-20250909-073849-4e392ab1",
+    "@blocklet/constant": "1.16.52-beta-20250911-023851-d988be85",
     "@blocklet/did-space-js": "^1.1.23",
-    "@blocklet/env": "1.16.52-beta-20250909-073849-4e392ab1",
+    "@blocklet/env": "1.16.52-beta-20250911-023851-d988be85",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@blocklet/resolver": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@blocklet/sdk": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@blocklet/server-js": "1.16.52-beta-20250909-073849-4e392ab1",
-    "@blocklet/store": "1.16.52-beta-20250909-073849-4e392ab1",
+    "@blocklet/meta": "1.16.52-beta-20250911-023851-d988be85",
+    "@blocklet/resolver": "1.16.52-beta-20250911-023851-d988be85",
+    "@blocklet/sdk": "1.16.52-beta-20250911-023851-d988be85",
+    "@blocklet/server-js": "1.16.52-beta-20250911-023851-d988be85",
+    "@blocklet/store": "1.16.52-beta-20250911-023851-d988be85",
     "@blocklet/theme": "^3.1.37",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.24.0",
@@ -118,5 +118,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "3b4b1551b181606f84799ba8b294fb36b483c9c3"
+  "gitHead": "90c5cf74138797733868312beb5e509c9db3a8f8"
 }