@abtnode/core 1.8.36 → 1.8.38

package/lib/api/node.js

@@ -7,24 +7,14 @@ 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');
 
 const IP = require('../util/ip');
 const { validateNodeInfo, validateUpdateGateway } = require('../validators/node');
 const { getAll } = require('../blocklet/manager/engine');
-const StoreUtil = require('../util/store');
 const { getDelegateState } = require('../util');
 
-const sanitizeUrl = (url) => {
-  if (!url) {
-    throw new Error('Registry URL should not be empty');
-  }
-
-  return url.trim();
-};
-
 class NodeAPI {
   /**
    *
@@ -37,69 +27,6 @@ class NodeAPI {
     this.state = state;
   }
 
-  // eslint-disable-next-line no-unused-vars
-  async addRegistry({ url }, context) {
-    logger.info('add registry', { 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) {
-      throw new Error(`Blocklet registry already exist: ${sanitized}`);
-    }
-
-    await StoreUtil.validateRegistryURL(sanitized);
-
-    const newBlockletRegistry = await StoreUtil.getRegistryMeta(sanitized);
-    const newBlockletRegistryList = info.blockletRegistryList.map((x) => ({ ...x, selected: false }));
-    newBlockletRegistryList.push({ ...newBlockletRegistry, url: sanitized, selected: true, protected: false });
-
-    return this.state.updateNodeInfo({ blockletRegistryList: newBlockletRegistryList });
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  async deleteRegistry({ url }, context) {
-    logger.info('delete registry', { url });
-    const sanitized = sanitizeUrl(url);
-    const info = await this.state.read();
-    const exist = info.blockletRegistryList.find((x) => x.url === sanitized);
-    if (!exist) {
-      throw new Error(`Blocklet registry does not exist: ${sanitized}`);
-    }
-
-    const blockletRegistryList = info.blockletRegistryList.filter((x) => x.url !== sanitized);
-    if (!blockletRegistryList.find((x) => x.selected)) {
-      blockletRegistryList[0].selected = true;
-    }
-    return this.state.updateNodeInfo({ blockletRegistryList });
-  }
-
-  // eslint-disable-next-line no-unused-vars
-  async selectRegistry({ url }, context) {
-    logger.info('select registry', { url });
-    const sanitized = sanitizeUrl(url);
-    const info = await this.state.read();
-    const exist = info.blockletRegistryList.find((x) => x.url === sanitized);
-    if (!exist) {
-      throw new Error(`Blocklet registry does not exist: ${sanitized}`);
-    }
-
-    return this.state.updateNodeInfo({
-      blockletRegistryList: info.blockletRegistryList.map((x) => ({ ...x, selected: x.url === sanitized })),
-    });
-  }
-
   async updateNodeInfo(entity = {}, context) {
     await validateNodeInfo(entity, context);
 

package/lib/api/team.js

@@ -11,6 +11,7 @@ const {
   PASSPORT_STATUS,
   WELLKNOWN_SERVICE_PATH_PREFIX,
   MAX_USER_PAGE_SIZE,
+  STORE_DETAIL_PAGE_PATH_PREFIX,
 } = require('@abtnode/constant');
 const { isValid: isValidDid } = require('@arcblock/did');
 const { BlockletEvents } = require('@blocklet/constant');
@@ -30,6 +31,15 @@ const { validateCreateRole, validateUpdateRole } = require('../validators/role')
 const { validateCreatePermission, validateUpdatePermission } = require('../validators/permission');
 
 const { getBlocklet } = require('../util/blocklet');
+const StoreUtil = require('../util/store');
+
+const sanitizeUrl = (url) => {
+  if (!url) {
+    throw new Error('Registry URL should not be empty');
+  }
+
+  return url.trim();
+};
 
 const validateReservedRole = (role) => {
   if (Object.values(ROLES).includes(role)) {
@@ -170,6 +180,7 @@ class TeamAPI extends EventEmitter {
             'lastLoginAt',
             'remark',
             'avatar',
+            'locale',
           ])
         // eslint-disable-next-line function-paren-newline
       ),
@@ -682,11 +693,7 @@ class TeamAPI extends EventEmitter {
   // Access Control
 
   async getRoles({ teamDid }) {
-    const rbac = await this.getRBAC(teamDid);
-
-    const roles = await rbac.getRoles();
-
-    return roles.map((d) => pick(d, ['name', 'grants', 'title', 'description']));
+    return this.teamManager.getRoles(teamDid);
   }
 
   async createRole({ teamDid, name, description, title, childName, permissions = [] }) {
@@ -855,6 +862,55 @@ class TeamAPI extends EventEmitter {
     );
   }
 
+  // eslint-disable-next-line no-unused-vars
+  async addStore({ teamDid, url }, context) {
+    logger.info('add registry', { 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 storeList = await this.teamManager.getStoreList(teamDid);
+
+    const exist = storeList.find((x) => x.url === sanitized);
+    if (exist) {
+      throw new Error(`Blocklet registry already exist: ${sanitized}`);
+    }
+
+    await StoreUtil.validateRegistryURL(sanitized);
+
+    const store = await StoreUtil.getRegistryMeta(sanitized);
+
+    storeList.push({ ...store, url: sanitized, protected: false });
+
+    return this.teamManager.updateStoreList(teamDid, storeList);
+  }
+
+  // eslint-disable-next-line no-unused-vars
+  async deleteStore({ teamDid, url }, context) {
+    logger.info('delete registry', { url });
+    const sanitized = sanitizeUrl(url);
+
+    const storeList = await this.teamManager.getStoreList(teamDid);
+    const exist = storeList.find((x) => x.url === sanitized);
+    if (!exist) {
+      throw new Error(`Blocklet registry does not exist: ${sanitized}`);
+    }
+
+    return this.teamManager.updateStoreList(
+      teamDid,
+      storeList.filter((x) => x.url !== sanitized)
+    );
+  }
+
   // =======
   // Private
   // =======