@abtnode/core 1.16.8-next-d1e52353 → 1.16.8-next-f9099675

package/lib/api/team.js

@@ -261,6 +261,26 @@ class TeamAPI extends EventEmitter {
     return state.getUser(user.did, options);
   }
 
+  async getUserByDid({ teamDid, userDid }) {
+    const state = await this.getUserState(teamDid);
+    return state.getUserByDid(userDid);
+  }
+
+  async isUserValid({ teamDid, userDid }) {
+    const state = await this.getUserState(teamDid);
+    return state.isUserValid(userDid);
+  }
+
+  async isPassportValid({ teamDid, passportId }) {
+    const state = await this.getUserState(teamDid);
+    return state.isPassportValid(passportId);
+  }
+
+  async isConnectedAccount({ teamDid, did }) {
+    const state = await this.getUserState(teamDid);
+    return state.isConnectedAccount(did);
+  }
+
   async getOwner({ teamDid }) {
     const owner = await this.teamManager.getOwner(teamDid);
 

package/lib/index.js

@@ -342,6 +342,9 @@ function ABTNode(options) {
     updateUser: teamAPI.updateUser.bind(teamAPI),
     updateUserApproval: teamAPI.updateUserApproval.bind(teamAPI),
     updateUserRole: teamAPI.updateUserRole.bind(teamAPI),
+    getUserByDid: teamAPI.getUserByDid.bind(teamAPI),
+    isPassportValid: teamAPI.isPassportValid.bind(teamAPI),
+    isConnectedAccount: teamAPI.isConnectedAccount.bind(teamAPI),
 
     // Access Control
     getRBAC: (did = options.nodeDid) => teamManager.getRBAC(did),

package/lib/states/blocklet.js

@@ -140,6 +140,8 @@ class BlockletState extends BaseState {
   constructor(model, config = {}) {
     super(model, config);
     this.defaultPort = config.blockletPort || 5555;
+    // @didMap: { [did: string]: metaDid: string }
+    this.didMap = new Map();
   }
 
   async getBlocklet(did, { decryptSk = true } = {}) {
@@ -152,8 +154,17 @@ class BlockletState extends BaseState {
   }
 
   async getBlockletMetaDid(did) {
+    if (this.didMap.has(did)) {
+      return this.didMap.get(did);
+    }
+
     const doc = await this.getBlocklet(did);
-    return doc ? doc.meta.did : null;
+    if (doc?.meta?.did) {
+      this.didMap.set(did, doc.meta.did);
+      return doc.meta.did;
+    }
+
+    return null;
   }
 
   async getBlockletStatus(did) {
@@ -182,6 +193,10 @@ class BlockletState extends BaseState {
     }
 
     await this.remove({ id: doc.id });
+
+    this.didMap.delete(doc.meta?.did);
+    this.didMap.delete(doc.appDid);
+
     this.emit('remove', doc);
     return formatBlocklet(doc, 'onRead', this.config.dek);
   }

package/lib/states/user.js

@@ -159,19 +159,8 @@ class User extends ExtendBase {
    * Get blocklet service user list
    */
   async getUsers({ query, sort, paging } = {}) {
-    const { approved, role, search, connectedDid } = query || {};
-
     const where = {};
-    const include = [
-      {
-        model: this.models.Passport,
-        as: 'passports',
-      },
-      {
-        model: this.models.ConnectedAccount,
-        as: 'connectedAccounts',
-      },
-    ];
+    const { approved, role, search } = query || {};
 
     if (isNullOrUndefined(approved) === false) {
       where.approved = approved;
@@ -188,29 +177,26 @@ class User extends ExtendBase {
       }
     }
 
-    if (role && role !== '$all') {
+    if (role && role !== '$all' && !where.did) {
       if (role === '$none') {
-        include[0].required = false;
-        include[0].where = {
-          [Op.or]: [{ name: null }, { id: null }],
+        where.did = {
+          [Op.notIn]: Sequelize.literal('(SELECT DISTINCT userDid FROM passports)'),
         };
       } else {
-        include[0].where = { name: role };
-        include[0].required = true;
+        where.did = {
+          [Op.in]: Sequelize.literal(
+            `(SELECT DISTINCT userDid FROM passports WHERE name = '${role}' AND status = '${PASSPORT_STATUS.VALID}')`
+          ),
+        };
       }
     }
 
-    if (connectedDid) {
-      include[1].where = { did: connectedDid };
-      include[1].required = true;
-    }
-
     const sorting = pickBy(sort, (x) => !isNullOrUndefined(x));
     if (!Object.keys(sorting).length) {
       sorting.createdAt = -1;
     }
 
-    return this.paginate({ where, include }, sorting, paging);
+    return this.paginate({ where }, sorting, paging);
   }
 
   async getUsersByDids({ dids, query }) {
@@ -220,19 +206,7 @@ class User extends ExtendBase {
       condition.approved = !!approved;
     }
 
-    return this.find({
-      where: condition,
-      include: [
-        {
-          model: this.models.ConnectedAccount,
-          as: 'connectedAccounts',
-        },
-        {
-          model: this.models.Passport,
-          as: 'passports',
-        },
-      ],
-    });
+    return this.find({ where: condition });
   }
 
   async countByPassport({ name, status = PASSPORT_STATUS.VALID }) {
@@ -253,14 +227,13 @@ class User extends ExtendBase {
     return this.count({
       distinct: true,
       col: 'did',
-      include: [
-        {
-          model: this.models.Passport,
-          as: 'passports',
-          attributes: [],
-          where: { name, status },
+      where: {
+        did: {
+          [Op.in]: Sequelize.literal(
+            `(SELECT DISTINCT userDid FROM passports WHERE name = '${name}' AND status = '${status}')`
+          ),
         },
-      ],
+      },
     });
   }
 
@@ -269,40 +242,26 @@ class User extends ExtendBase {
    * @param {string} did user's did
    */
   async getUser(did, { enableConnectedAccount = false } = {}) {
-    let user = await this.findOne({
-      where: { did },
-      include: [
-        {
-          model: this.models.ConnectedAccount,
-          as: 'connectedAccounts',
-        },
-        {
-          model: this.models.Passport,
-          as: 'passports',
-        },
-      ],
-    });
-
-    if (enableConnectedAccount && !user) {
-      user = await this.findOne({
-        include: [
-          {
-            model: this.models.ConnectedAccount,
-            as: 'connectedAccounts',
-            where: { did },
-            required: true,
-          },
-          {
-            model: this.models.Passport,
-            as: 'passports',
-          },
-        ],
-      });
+    let user = await this.findOne({ did });
+    let connectedAccounts = [];
+    let passports = [];
+
+    // search in connected accounts
+    if (!user && enableConnectedAccount) {
+      const connectedAccount = await this.connectedAccount.findOne({ did });
+      if (connectedAccount) {
+        user = await this.findOne({ did: connectedAccount.userDid });
+      }
     }
 
-    // Normalize
-    if (user && !user.passports) {
-      user.passports = [];
+    if (user) {
+      [connectedAccounts, passports] = await Promise.all([
+        this.connectedAccount.find({ userDid: user.did }),
+        this.passport.find({ userDid: user.did }),
+      ]);
+
+      user.connectedAccounts = connectedAccounts;
+      user.passports = passports;
     }
 
     return user;
@@ -376,6 +335,25 @@ class User extends ExtendBase {
 
     return { ...updated, _action: exist ? 'update' : 'add' };
   }
+
+  async getUserByDid(did) {
+    return this.findOne({ did }, { did: 1, pk: 1, fullName: 1, email: 1, role: 1, approved: 1 });
+  }
+
+  async isUserValid(did) {
+    const count = await super.count({ did, approved: true });
+    return count > 0;
+  }
+
+  async isConnectedAccount(did) {
+    const count = await this.connectedAccount.count({ did });
+    return count > 0;
+  }
+
+  async isPassportValid(passportId) {
+    const count = await this.passport.count({ id: passportId, status: PASSPORT_STATUS.VALID });
+    return count > 0;
+  }
 }
 
 module.exports = User;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.8-next-d1e52353",
+  "version": "1.16.8-next-f9099675",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,18 +19,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.8-next-d1e52353",
-    "@abtnode/certificate-manager": "1.16.8-next-d1e52353",
-    "@abtnode/constant": "1.16.8-next-d1e52353",
-    "@abtnode/cron": "1.16.8-next-d1e52353",
-    "@abtnode/logger": "1.16.8-next-d1e52353",
-    "@abtnode/models": "1.16.8-next-d1e52353",
-    "@abtnode/queue": "1.16.8-next-d1e52353",
-    "@abtnode/rbac": "1.16.8-next-d1e52353",
-    "@abtnode/router-provider": "1.16.8-next-d1e52353",
-    "@abtnode/static-server": "1.16.8-next-d1e52353",
-    "@abtnode/timemachine": "1.16.8-next-d1e52353",
-    "@abtnode/util": "1.16.8-next-d1e52353",
+    "@abtnode/auth": "1.16.8-next-f9099675",
+    "@abtnode/certificate-manager": "1.16.8-next-f9099675",
+    "@abtnode/constant": "1.16.8-next-f9099675",
+    "@abtnode/cron": "1.16.8-next-f9099675",
+    "@abtnode/logger": "1.16.8-next-f9099675",
+    "@abtnode/models": "1.16.8-next-f9099675",
+    "@abtnode/queue": "1.16.8-next-f9099675",
+    "@abtnode/rbac": "1.16.8-next-f9099675",
+    "@abtnode/router-provider": "1.16.8-next-f9099675",
+    "@abtnode/static-server": "1.16.8-next-f9099675",
+    "@abtnode/timemachine": "1.16.8-next-f9099675",
+    "@abtnode/util": "1.16.8-next-f9099675",
     "@arcblock/did": "1.18.78",
     "@arcblock/did-auth": "1.18.78",
     "@arcblock/did-ext": "^1.18.78",
@@ -41,9 +41,9 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.78",
     "@arcblock/vc": "1.18.78",
-    "@blocklet/constant": "1.16.8-next-d1e52353",
-    "@blocklet/meta": "1.16.8-next-d1e52353",
-    "@blocklet/sdk": "1.16.8-next-d1e52353",
+    "@blocklet/constant": "1.16.8-next-f9099675",
+    "@blocklet/meta": "1.16.8-next-f9099675",
+    "@blocklet/sdk": "1.16.8-next-f9099675",
     "@did-space/client": "^0.2.91",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.78",
@@ -96,5 +96,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "d357376aa3df9ef789befc7f548629deecb04d96"
+  "gitHead": "02702513382f0b2297eff3520fc77f630eec578f"
 }