@abtnode/core 1.7.26 → 1.8.1

package/lib/api/node.js

@@ -7,6 +7,7 @@ const isGitpod = require('@abtnode/util/lib/is-gitpod');
 const getFolderSize = require('@abtnode/util/lib/get-folder-size');
 const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
 const { toDelegateAddress } = require('@arcblock/did-util');
+const { STORE_DETAIL_PAGE_PATH_PREFIX } = require('@abtnode/constant');
 
 const logger = require('@abtnode/logger')('@abtnode/core:api:node');
 
@@ -40,7 +41,19 @@ class NodeAPI {
   // eslint-disable-next-line no-unused-vars
   async addRegistry({ url }, context) {
     logger.info('add registry', { url });
-    const sanitized = sanitizeUrl(url);
+
+    const urlObj = new URL(url);
+    let newUrl = urlObj.origin;
+
+    // if the pathname is store blocklet list or blocklet detail
+    if (urlObj.pathname?.includes(STORE_DETAIL_PAGE_PATH_PREFIX)) {
+      const lastIndex = urlObj.pathname.lastIndexOf(STORE_DETAIL_PAGE_PATH_PREFIX);
+      const pathnamePrefix = urlObj.pathname.substring(0, lastIndex);
+      newUrl = `${newUrl}${pathnamePrefix || ''}`;
+    }
+
+    const sanitized = sanitizeUrl(newUrl);
+
     const info = await this.state.read();
     const exist = info.blockletRegistryList.find((x) => x.url === sanitized);
     if (exist) {

package/lib/api/team.js

@@ -1,13 +1,15 @@
 const { EventEmitter } = require('events');
 const pick = require('lodash/pick');
 const logger = require('@abtnode/logger')('@abtnode/core:api:team');
-const { ROLES, genPermissionName, EVENTS, WHO_CAN_ACCESS } = require('@abtnode/constant');
+const { ROLES, genPermissionName, EVENTS, WHO_CAN_ACCESS, PASSPORT_STATUS } = require('@abtnode/constant');
 const { isValid: isValidDid } = require('@arcblock/did');
 const { BlockletEvents } = require('@blocklet/meta/lib/constants');
 const { validateTrustedPassportIssuers } = require('../validators/trusted-passport');
 const { validateCreateRole, validateUpdateRole } = require('../validators/role');
 const { validateCreatePermission, validateUpdatePermission } = require('../validators/permission');
 
+const MAX_USER_PAGE_SIZE = 100;
+
 const validateReservedRole = (role) => {
   if (Object.values(ROLES).includes(role)) {
     throw new Error(`The role ${role} is reserved`);
@@ -68,29 +70,37 @@ class TeamAPI extends EventEmitter {
     return doc;
   }
 
-  async getUsers({ teamDid }) {
+  async getUsers({ teamDid, query, paging: inputPaging, sort }) {
     const state = await this.getUserState(teamDid);
 
-    const list = await state.getUsers();
-
-    return list.map(
-      (d) =>
-        pick(d, [
-          'did',
-          'pk',
-          'role',
-          'email',
-          'fullName',
-          'approved',
-          'createdAt',
-          'updatedAt',
-          'passports',
-          'firstLoginAt',
-          'lastLoginAt',
-          'remark',
-        ])
-      // eslint-disable-next-line function-paren-newline
-    );
+    if (inputPaging?.pageSize > MAX_USER_PAGE_SIZE) {
+      throw new Error(`Length of users should not exceed ${MAX_USER_PAGE_SIZE} per page`);
+    }
+
+    const { list, paging } = await state.getUsers({ query, sort, paging: { pageSize: 20, ...inputPaging } });
+
+    return {
+      users: list.map(
+        (d) =>
+          pick(d, [
+            'did',
+            'pk',
+            'role',
+            'email',
+            'fullName',
+            'approved',
+            'createdAt',
+            'updatedAt',
+            'passports',
+            'firstLoginAt',
+            'lastLoginAt',
+            'remark',
+            'avatar',
+          ])
+        // eslint-disable-next-line function-paren-newline
+      ),
+      paging,
+    };
   }
 
   async getUsersCount({ teamDid }) {
@@ -99,6 +109,28 @@ class TeamAPI extends EventEmitter {
     return state.count();
   }
 
+  async getUsersCountPerRole({ teamDid }) {
+    const roles = await this.getRoles({ teamDid });
+
+    const state = await this.getUserState(teamDid);
+
+    const res = [];
+
+    const all = await state.count();
+    res.push({ key: '$all', value: all });
+
+    for (const { name } of roles) {
+      // eslint-disable-next-line no-await-in-loop
+      const count = await state.count({ passports: { $elemMatch: { name, status: PASSPORT_STATUS.VALID } } });
+      res.push({ key: name, value: count });
+    }
+
+    const none = await state.count({ passports: { $size: 0 } });
+    res.push({ key: '$none', value: none });
+
+    return res;
+  }
+
   async getUser({ teamDid, user }) {
     const state = await this.getUserState(teamDid);