@abtnode/auth 1.7.17 → 1.7.20

package/lib/invitation.js

@@ -0,0 +1,76 @@
+const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
+const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/meta/lib/constants');
+const { getDisplayName } = require('@blocklet/meta/lib/util');
+const logger = require('@abtnode/logger')(require('../package.json').name);
+const joinUrl = require('url-join');
+
+module.exports = {
+  init(server, node, { prefix, type } = {}) {
+    server.get(`${prefix}/invitation`, async (req, res) => {
+      const { inviteId } = req.query;
+      const groupPathPrefix = req.headers['x-group-path-prefix'] || '/';
+
+      try {
+        let info;
+        if (type === 'blocklet') {
+          const blockletInfo = await req.getBlocklet();
+          info = {
+            did: blockletInfo.meta.did,
+            appDid: blockletInfo.appDid,
+            url: blockletInfo.environmentObj[BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_URL],
+            name: getDisplayName(blockletInfo),
+            version: blockletInfo.meta.version,
+            logo: joinUrl(groupPathPrefix, WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo'),
+            // TODO: 需要将 CHAIN_HOST 纳入标准
+            chainHost: blockletInfo.configObj.CHAIN_HOST,
+            passportColor: blockletInfo.configObj[BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_PASSPORT_COLOR],
+          };
+        } else {
+          const nodeInfo = await node.getNodeInfo();
+          info = {
+            did: nodeInfo.did,
+            appDid: nodeInfo.did,
+            url: '/',
+            name: nodeInfo.name,
+            version: nodeInfo.version,
+          };
+        }
+
+        const teamDid = info.did;
+        const invitations = await node.getInvitations({ teamDid });
+        const invitation = invitations.find((v) => v.inviteId === inviteId);
+        if (!invitation) {
+          res.status(404).send('Invitation not found or invitation has been used');
+          return;
+        }
+
+        const roles = await node.getRoles({ teamDid });
+        const role = roles.find((v) => v.name === invitation.role);
+        try {
+          role.permissions = await node.getPermissionsByRole({
+            teamDid,
+            role: { name: role.name },
+          });
+        } catch (err) {
+          logger.error('failed to get role permission', { teamDid, role: role.name, error: err });
+          role.permissions = [];
+        }
+
+        res.json({
+          ...invitation,
+          info,
+          inviter: {
+            did: invitation.inviter.did,
+            email: invitation.inviter.email,
+            fullName: invitation.inviter.fullName,
+            role: invitation.inviter.role,
+          },
+          role: role || {},
+        });
+      } catch (err) {
+        logger.error('failed to get invitation info', { inviteId, error: err });
+        res.status(500).end();
+      }
+    });
+  },
+};

package/lib/lost-passport.js

@@ -111,11 +111,7 @@ const createLostPassportListRoute = ({ node, type }) => ({
         if (x.issuer.id !== issuerDid) {
           return false;
         }
-        if (x.expirationDate && Date.now() > new Date(x.expirationDate).getTime()) {
-          return false;
-        }
-
-        return true;
+        return !(x.expirationDate && Date.now() > new Date(x.expirationDate).getTime());
       }),
       'name'
     );

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.17",
+  "version": "1.7.20",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,17 +20,17 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.7.17",
-    "@abtnode/logger": "1.7.17",
-    "@abtnode/util": "1.7.17",
-    "@arcblock/did": "^1.16.9",
-    "@arcblock/vc": "^1.16.9",
-    "@blocklet/meta": "1.7.17",
-    "@ocap/client": "1.16.9",
-    "@ocap/mcrypto": "^1.16.9",
-    "@ocap/util": "^1.16.9",
-    "@ocap/wallet": "^1.16.9",
-    "axios": "^0.26.1",
+    "@abtnode/constant": "1.7.20",
+    "@abtnode/logger": "1.7.20",
+    "@abtnode/util": "1.7.20",
+    "@arcblock/did": "^1.16.15",
+    "@arcblock/vc": "^1.16.15",
+    "@blocklet/meta": "1.7.20",
+    "@ocap/client": "1.16.15",
+    "@ocap/mcrypto": "^1.16.15",
+    "@ocap/util": "^1.16.15",
+    "@ocap/wallet": "^1.16.15",
+    "axios": "^0.27.2",
     "joi": "^17.6.0",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
@@ -40,5 +40,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "142a5b1e83ea03647ef9bea8de9bb269c9c82928"
+  "gitHead": "7e579415aa56cc422f3e26d902cf029fbc92e47a"
 }