@abtnode/core 1.16.25-beta-e3dbef52 → 1.16.25-beta-44800645

package/lib/api/team.js

@@ -233,6 +233,14 @@ class TeamAPI extends EventEmitter {
 
   async getUsers({ teamDid, query, paging: inputPaging, sort, dids }) {
     const state = await this.getUserState(teamDid);
+    const nodeInfo = await this.node.read();
+
+    // HACK: 如果查询的是 server 的数据库，则不应该查询 userSession 表
+    if (teamDid === nodeInfo.did) {
+      if (query) {
+        delete query.includeUserSessions;
+      }
+    }
 
     if (inputPaging?.pageSize > MAX_USER_PAGE_SIZE) {
       throw new Error(`Length of users should not exceed ${MAX_USER_PAGE_SIZE} per page`);
@@ -260,6 +268,7 @@ class TeamAPI extends EventEmitter {
     }
 
     return {
+      // FIXME: @zhanghan 这里做字段过滤的目的是？gql 本身已经对字段做了过滤了
       users: list.map(
         (d) =>
           pick(d, [
@@ -279,6 +288,7 @@ class TeamAPI extends EventEmitter {
             'avatar',
             'locale',
             'tags',
+            'userSessions',
             // oauth relate fields
             'sourceProvider',
             'sourceAppPid',
@@ -1393,7 +1403,7 @@ class TeamAPI extends EventEmitter {
 
     const userSessions = await state.model.findAll({
       where,
-      attributes: ['id', 'appPid', 'userDid', 'visitorId', 'passportId', 'updatedAt', 'extra'],
+      attributes: ['id', 'appPid', 'userDid', 'visitorId', 'passportId', 'updatedAt', 'extra', 'ua', 'lastLoginIp'],
       include: {
         model: userState.model,
         as: 'user',
@@ -1574,7 +1584,7 @@ class TeamAPI extends EventEmitter {
 
   async logoutUser({ teamDid, userDid, visitorId, appPid }) {
     const state = await this.getUserSessionState(teamDid);
-    const data = await state.update({ userDid, visitorId, appPid }, { status: 'offline' });
+    const data = await state.remove({ userDid, visitorId, appPid });
     const nodeInfo = await this.node.read();
     const blocklet = await getBlocklet({ did: teamDid, states: this.states, dataDirs: this.dataDirs });
     const { permanentWallet } = getBlockletInfo(blocklet, nodeInfo.sk);

package/lib/states/audit-log.js

@@ -420,6 +420,7 @@ const getLogCategory = (action) => {
     case 'switchProfile':
     case 'switchPassport':
     case 'login':
+    case 'logout':
     case 'configWhoCanAccess':
     case 'processPassportIssuance':
     case 'configPassportIssuance':

package/lib/states/user.js

@@ -188,7 +188,7 @@ class User extends ExtendBase {
   // eslint-disable-next-line require-await
   async getUsers({ query, sort, paging } = {}) {
     const where = {};
-    const { approved, role, search, tags, includeTags, includePassports } = query || {};
+    const { approved, role, search, tags, includeTags, includePassports, includeUserSessions } = query || {};
     const shouldIncludeTag = (tags && tags.length) || includeTags;
 
     if (isNullOrUndefined(approved) === false) {
@@ -236,8 +236,18 @@ class User extends ExtendBase {
         as: 'passports',
       });
     }
-
-    return this.paginate({ where, include }, sorting, paging);
+    if (includeUserSessions) {
+      include.push({
+        model: this.models.UserSession,
+        as: 'userSessions',
+        where: {
+          status: 'online',
+        },
+        required: false,
+      });
+    }
+    const result = await this.paginate({ where, include }, sorting, paging);
+    return result;
   }
 
   // eslint-disable-next-line require-await

package/lib/validators/router.js

@@ -71,7 +71,11 @@ const ruleSchema = {
     interfaceName: Joi.string() // root interface
       .label('interface name')
       .when('type', { is: ROUTING_RULE_TYPES.BLOCKLET, then: Joi.required() }),
-    response: Joi.object({ status: Joi.number().required(), contentType: Joi.string(), body: Joi.string().required() })
+    response: Joi.object({
+      status: Joi.number().required(),
+      contentType: Joi.string(),
+      body: Joi.string().max(4096).required(),
+    })
       .label('response')
       .when('type', {
         is: ROUTING_RULE_TYPES.DIRECT_RESPONSE,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.25-beta-e3dbef52",
+  "version": "1.16.25-beta-44800645",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.25-beta-e3dbef52",
-    "@abtnode/auth": "1.16.25-beta-e3dbef52",
-    "@abtnode/certificate-manager": "1.16.25-beta-e3dbef52",
-    "@abtnode/constant": "1.16.25-beta-e3dbef52",
-    "@abtnode/cron": "1.16.25-beta-e3dbef52",
-    "@abtnode/logger": "1.16.25-beta-e3dbef52",
-    "@abtnode/models": "1.16.25-beta-e3dbef52",
-    "@abtnode/queue": "1.16.25-beta-e3dbef52",
-    "@abtnode/rbac": "1.16.25-beta-e3dbef52",
-    "@abtnode/router-provider": "1.16.25-beta-e3dbef52",
-    "@abtnode/static-server": "1.16.25-beta-e3dbef52",
-    "@abtnode/timemachine": "1.16.25-beta-e3dbef52",
-    "@abtnode/util": "1.16.25-beta-e3dbef52",
+    "@abtnode/analytics": "1.16.25-beta-44800645",
+    "@abtnode/auth": "1.16.25-beta-44800645",
+    "@abtnode/certificate-manager": "1.16.25-beta-44800645",
+    "@abtnode/constant": "1.16.25-beta-44800645",
+    "@abtnode/cron": "1.16.25-beta-44800645",
+    "@abtnode/logger": "1.16.25-beta-44800645",
+    "@abtnode/models": "1.16.25-beta-44800645",
+    "@abtnode/queue": "1.16.25-beta-44800645",
+    "@abtnode/rbac": "1.16.25-beta-44800645",
+    "@abtnode/router-provider": "1.16.25-beta-44800645",
+    "@abtnode/static-server": "1.16.25-beta-44800645",
+    "@abtnode/timemachine": "1.16.25-beta-44800645",
+    "@abtnode/util": "1.16.25-beta-44800645",
     "@arcblock/did": "1.18.113",
     "@arcblock/did-auth": "1.18.113",
     "@arcblock/did-ext": "^1.18.113",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.113",
     "@arcblock/vc": "1.18.113",
-    "@blocklet/constant": "1.16.25-beta-e3dbef52",
-    "@blocklet/env": "1.16.25-beta-e3dbef52",
-    "@blocklet/meta": "1.16.25-beta-e3dbef52",
-    "@blocklet/resolver": "1.16.25-beta-e3dbef52",
-    "@blocklet/sdk": "1.16.25-beta-e3dbef52",
-    "@did-space/client": "^0.3.68",
+    "@blocklet/constant": "1.16.25-beta-44800645",
+    "@blocklet/env": "1.16.25-beta-44800645",
+    "@blocklet/meta": "1.16.25-beta-44800645",
+    "@blocklet/resolver": "1.16.25-beta-44800645",
+    "@blocklet/sdk": "1.16.25-beta-44800645",
+    "@did-space/client": "^0.3.69",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.113",
     "@ocap/util": "1.18.113",
@@ -102,5 +102,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "a740380dd98d1677f7da1233d753f28ea50f77ce"
+  "gitHead": "1352ebbd41c052c8d369f95570e97b30ecb5f4f0"
 }