@abtnode/core 1.16.24-beta-a02d4e5e → 1.16.24-beta-64150e24

package/lib/api/team.js

@@ -1380,7 +1380,7 @@ class TeamAPI extends EventEmitter {
   }
 
   // user-session management
-  async getUserSession({ teamDid, userDid, visitorId }) {
+  async getUserSession({ teamDid, userDid, visitorId, appPid }) {
     const state = await this.getUserSessionState(teamDid);
     const userState = await this.getUserState(teamDid);
 
@@ -1389,6 +1389,7 @@ class TeamAPI extends EventEmitter {
     };
     if (userDid) where.userDid = userDid;
     if (visitorId) where.visitorId = visitorId;
+    if (appPid) where.appPid = appPid;
 
     const userSessions = await state.model.findAll({
       where,

package/lib/blocklet/manager/helper/install-component-from-dev.js

@@ -43,7 +43,7 @@ const installComponentFromDev = async ({ folder, meta, rootDid, mountPoint, mana
 
   const component = {
     meta: ensureMeta(meta),
-    mountPoint: mountPoint || `/${defaultPath}`,
+    mountPoint: (mountPoint || `/${defaultPath}`).toLowerCase(),
     source: BlockletSource.local,
     deployedFrom: folder,
     status: BlockletStatus.installed,

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 } = query || {};
+    const { approved, role, search, tags, includeTags, includePassports } = query || {};
     const shouldIncludeTag = (tags && tags.length) || includeTags;
 
     if (isNullOrUndefined(approved) === false) {
@@ -224,18 +224,39 @@ class User extends ExtendBase {
     if (!Object.keys(sorting).length) {
       sorting.createdAt = -1;
     }
+    const include = [];
+    if (shouldIncludeTag) {
+      include.push(this.getTagInclude(tags));
+    }
+    if (includePassports) {
+      include.push({
+        model: this.models.Passport,
+        as: 'passports',
+      });
+    }
 
-    return this.paginate({ where, include: shouldIncludeTag ? [this.getTagInclude(tags)] : [] }, sorting, paging);
+    return this.paginate({ where, include }, sorting, paging);
   }
 
   // eslint-disable-next-line require-await
   async getUsersByDids({ dids, query }) {
-    const { approved, includeTags } = query || {};
+    const { approved, includeTags, includePassports } = query || {};
     const condition = { did: dids };
     if (isNullOrUndefined(approved) === false) {
       condition.approved = !!approved;
     }
-    return this.find({ where: condition, include: includeTags ? [this.getTagInclude()] : [] });
+    const include = [];
+    if (includeTags) {
+      include.push(this.getTagInclude());
+    }
+    if (includePassports) {
+      include.push({
+        model: this.models.Passport,
+        as: 'passports',
+      });
+    }
+
+    return this.find({ where: condition, include });
   }
 
   // eslint-disable-next-line require-await

package/lib/util/router.js

@@ -58,12 +58,14 @@ const revokeAndDeleteNFTDomainRecord = async ({ name, blocklet, nodeInfo }) => {
   const { wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
 
   const payload = {
-    delegatee: wallet.address,
+    delegatee: blocklet.appPid,
     domain: name,
   };
 
   const nftDomainServiceUrl = await getDidDomainServiceURL(nodeInfo.nftDomainUrl);
 
+  logger.info('will revoke and delete nft domain record', { name, appPid: blocklet.appPid, payload });
+
   try {
     const { data } = await axios({
       method: 'DELETE',

package/lib/webhook/sender/wallet/index.js

@@ -11,6 +11,7 @@ class WalletSender extends BaseSender {
       const sender = {
         appDid: nodeInfo.did,
         appSk: nodeInfo.sk,
+        type: 'server',
       };
 
       const message = {
@@ -18,7 +19,11 @@ class WalletSender extends BaseSender {
         body: description,
       };
 
-      const { users } = await node.getUsers({ teamDid: nodeInfo.did, paging: { pageSize: 100 } });
+      const { users } = await node.getUsers({
+        teamDid: nodeInfo.did,
+        paging: { pageSize: 100 },
+        query: { includePassports: true },
+      });
       const adminUsers = users
         .filter(
           (x) =>

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.24-beta-a02d4e5e",
+  "version": "1.16.24-beta-64150e24",
   "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.24-beta-a02d4e5e",
-    "@abtnode/auth": "1.16.24-beta-a02d4e5e",
-    "@abtnode/certificate-manager": "1.16.24-beta-a02d4e5e",
-    "@abtnode/constant": "1.16.24-beta-a02d4e5e",
-    "@abtnode/cron": "1.16.24-beta-a02d4e5e",
-    "@abtnode/logger": "1.16.24-beta-a02d4e5e",
-    "@abtnode/models": "1.16.24-beta-a02d4e5e",
-    "@abtnode/queue": "1.16.24-beta-a02d4e5e",
-    "@abtnode/rbac": "1.16.24-beta-a02d4e5e",
-    "@abtnode/router-provider": "1.16.24-beta-a02d4e5e",
-    "@abtnode/static-server": "1.16.24-beta-a02d4e5e",
-    "@abtnode/timemachine": "1.16.24-beta-a02d4e5e",
-    "@abtnode/util": "1.16.24-beta-a02d4e5e",
+    "@abtnode/analytics": "1.16.24-beta-64150e24",
+    "@abtnode/auth": "1.16.24-beta-64150e24",
+    "@abtnode/certificate-manager": "1.16.24-beta-64150e24",
+    "@abtnode/constant": "1.16.24-beta-64150e24",
+    "@abtnode/cron": "1.16.24-beta-64150e24",
+    "@abtnode/logger": "1.16.24-beta-64150e24",
+    "@abtnode/models": "1.16.24-beta-64150e24",
+    "@abtnode/queue": "1.16.24-beta-64150e24",
+    "@abtnode/rbac": "1.16.24-beta-64150e24",
+    "@abtnode/router-provider": "1.16.24-beta-64150e24",
+    "@abtnode/static-server": "1.16.24-beta-64150e24",
+    "@abtnode/timemachine": "1.16.24-beta-64150e24",
+    "@abtnode/util": "1.16.24-beta-64150e24",
     "@arcblock/did": "1.18.110",
     "@arcblock/did-auth": "1.18.110",
     "@arcblock/did-ext": "^1.18.110",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.110",
     "@arcblock/vc": "1.18.110",
-    "@blocklet/constant": "1.16.24-beta-a02d4e5e",
-    "@blocklet/env": "1.16.24-beta-a02d4e5e",
-    "@blocklet/meta": "1.16.24-beta-a02d4e5e",
-    "@blocklet/resolver": "1.16.24-beta-a02d4e5e",
-    "@blocklet/sdk": "1.16.24-beta-a02d4e5e",
-    "@did-space/client": "^0.3.60",
+    "@blocklet/constant": "1.16.24-beta-64150e24",
+    "@blocklet/env": "1.16.24-beta-64150e24",
+    "@blocklet/meta": "1.16.24-beta-64150e24",
+    "@blocklet/resolver": "1.16.24-beta-64150e24",
+    "@blocklet/sdk": "1.16.24-beta-64150e24",
+    "@did-space/client": "^0.3.64",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.110",
     "@ocap/util": "1.18.110",
@@ -102,5 +102,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "bfe534f98c5a21bec765cb441a648e9f4edfe607"
+  "gitHead": "30c91a8e2790a0527ba336497f5032ba54ed4225"
 }