@abtnode/blocklet-services 1.16.8-next-d1e52353 → 1.16.8-next-c66e39c7

package/api/libs/connect/session.js

@@ -241,8 +241,8 @@ module.exports = {
         }
       } else if (action === 'exchangePassport') {
         const claim = claims.find((x) => x.type === 'asset');
-        const { users } = await node.getUsers({ teamDid, query: { connectedDid: claim.asset } });
-        if (users.length) {
+        const isConnected = await node.isConnectedAccount({ teamDid, did: claim.asset });
+        if (isConnected) {
           throw new Error(messages.nftAlreadyUsed[locale]);
         }
 

package/api/libs/jwt.js

@@ -1,11 +1,9 @@
 /* eslint-disable no-underscore-dangle */
 const jwt = require('jsonwebtoken');
 const { createAuthToken } = require('@abtnode/auth/lib/auth');
-const { isUserPassportRevoked } = require('@abtnode/auth/lib/passport');
 
-// FIXME: we need to test performance for this code
 const getUser = async (node, teamDid, userDid) => {
-  const user = await node.getUser({ teamDid, user: { did: userDid } });
+  const user = await node.getUserByDid({ teamDid, userDid });
   if (user && user.approved) {
     return user;
   }
@@ -44,8 +42,11 @@ const initJwt = (node, options) => {
           return reject(new Error('Invalid jwt token: invalid user'));
         }
 
-        if (passport && passport.id && isUserPassportRevoked(user, passport)) {
-          return reject(new Error(`Passport ${passport.name} has been revoked`));
+        if (passport && passport.id) {
+          const valid = await node.isPassportValid({ teamDid, passportId: passport.id });
+          if (valid === false) {
+            return reject(new Error(`Passport ${passport.name} has been revoked`));
+          }
         }
 
         user.role = role;

package/api/services/auth/session.js

@@ -15,12 +15,13 @@ module.exports = {
           return;
         }
 
-        const user = { ...req.user };
-        if (user.role) {
-          const teamDid = req.getBlockletDid();
+        const teamDid = req.getBlockletDid();
+        const user = await node.getUser({ teamDid, user: { did: req.user.did } });
+        if (req.user.role) {
           // FIXME: this code may have performance issue
           const rbac = await node.getRBAC(teamDid);
           user.permissions = await rbac.getScope(req.user.role);
+          user.role = req.user.role;
         }
 
         const encKey = '_ek_';

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.8-next-d1e52353",
+  "version": "1.16.8-next-c66e39c7",
   "description": "Provide unified services for every blocklet",
   "main": "api/index.js",
   "files": [
@@ -33,17 +33,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.8-next-d1e52353",
-    "@abtnode/client": "1.16.8-next-d1e52353",
-    "@abtnode/connect-storage": "1.16.8-next-d1e52353",
-    "@abtnode/constant": "1.16.8-next-d1e52353",
-    "@abtnode/core": "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/router-adapter": "1.16.8-next-d1e52353",
-    "@abtnode/router-templates": "1.16.8-next-d1e52353",
-    "@abtnode/util": "1.16.8-next-d1e52353",
+    "@abtnode/auth": "1.16.8-next-c66e39c7",
+    "@abtnode/client": "1.16.8-next-c66e39c7",
+    "@abtnode/connect-storage": "1.16.8-next-c66e39c7",
+    "@abtnode/constant": "1.16.8-next-c66e39c7",
+    "@abtnode/core": "1.16.8-next-c66e39c7",
+    "@abtnode/cron": "1.16.8-next-c66e39c7",
+    "@abtnode/logger": "1.16.8-next-c66e39c7",
+    "@abtnode/models": "1.16.8-next-c66e39c7",
+    "@abtnode/router-adapter": "1.16.8-next-c66e39c7",
+    "@abtnode/router-templates": "1.16.8-next-c66e39c7",
+    "@abtnode/util": "1.16.8-next-c66e39c7",
     "@arcblock/did": "^1.18.78",
     "@arcblock/did-auth": "1.18.78",
     "@arcblock/did-ext": "^1.18.78",
@@ -51,11 +51,11 @@
     "@arcblock/jwt": "1.18.78",
     "@arcblock/validator": "^1.18.78",
     "@arcblock/ws": "1.18.78",
-    "@blocklet/constant": "1.16.8-next-d1e52353",
+    "@blocklet/constant": "1.16.8-next-c66e39c7",
     "@blocklet/form-builder": "^0.1.11",
     "@blocklet/form-collector": "^0.1.6",
-    "@blocklet/meta": "1.16.8-next-d1e52353",
-    "@blocklet/sdk": "1.16.8-next-d1e52353",
+    "@blocklet/meta": "1.16.8-next-c66e39c7",
+    "@blocklet/sdk": "1.16.8-next-c66e39c7",
     "@did-connect/authenticator": "^2.1.54",
     "@did-connect/relay-adapter-express": "^2.1.54",
     "@did-connect/storage-nedb": "^2.1.54",
@@ -95,7 +95,7 @@
     "@nedb/core": "^2.1.2"
   },
   "devDependencies": {
-    "@abtnode/ux": "1.16.8-next-d1e52353",
+    "@abtnode/ux": "1.16.8-next-c66e39c7",
     "@arcblock/did-connect": "^2.5.39",
     "@arcblock/icons": "^2.5.39",
     "@arcblock/ux": "^2.5.39",
@@ -162,5 +162,5 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues",
     "email": "shijun@arcblock.io"
   },
-  "gitHead": "d357376aa3df9ef789befc7f548629deecb04d96"
+  "gitHead": "d769d1ab5bd56d258d4d1061e2c0f201dcef5676"
 }