@abtnode/auth 1.16.23-beta-47ca27f8 → 1.16.23-beta-c9c4e08e

package/lib/auth.js

@@ -799,9 +799,13 @@ const handleIssuePassportResponse = async ({
   await updateSession({ passportId: vc.id });
 
   return {
-    disposition: 'attachment',
-    type: 'VerifiableCredential',
-    data: vc,
+    response: {
+      disposition: 'attachment',
+      type: 'VerifiableCredential',
+      data: vc,
+    },
+    role,
+    passport,
   };
 };
 

package/lib/invitation.js

@@ -7,10 +7,120 @@ const { getDisplayName } = require('@blocklet/meta/lib/util');
 const logger = require('@abtnode/logger')(require('../package.json').name);
 const { getUserAvatarUrl } = require('@abtnode/util/lib/user');
 
+/**
+ * @typedef {Object} InvitationInfo
+ * @property {string} inviteId
+ * @property {string} teamDid
+ * @property {number} expireDate
+ * @property {Object} info
+ * @property {Object} inviter
+ * @property {Object} receiver
+ * @property {Object} role
+ * @property {string} remark
+ */
+/**
+ * @typedef {Object} InvitationData
+ * @property {string} inviteId
+ * @property {string} teamDid
+ * @property {Date} expireDate
+ * @property {Object} inviter
+ * @property {Object} role
+ * @property {string} remark
+ */
+
+/**
+ * @typedef {Object} IssuePassportData
+ * @property {string} id
+ * @property {'passport-issuance'} type
+ * @property {string} key - 实际上是颁发者的 userDid
+ * @property {string} name
+ * @property {string} title
+ * @property {string} ownerDid
+ * @property {string} teamDid
+ * @property {number} expireDate
+ * @property {Date} createdAt
+ * @property {Date} updatedAt
+ */
+
+/**
+ * @typedef {Object} Role
+ * @property {string} name
+ * @property {string} title
+ * @property {string} description
+ * @property {Arrary} permissions
+ * @property {Arrary} grants
+ */
+
+async function getInvitation({ node, teamDid, inviteId, roles }) {
+  /**
+   * @type {InvitationData}
+   */
+  const invitationData = await node.getInvitation({ teamDid, inviteId });
+  if (invitationData) {
+    /**
+     * @type {Role}
+     */
+    const role = roles.find((v) => v.name === invitationData.role);
+    const invitation = {
+      ...invitationData,
+      expireDate: new Date(invitationData.expireDate).getTime(),
+      receiver: null,
+    };
+
+    return {
+      invitation,
+      role,
+    };
+  }
+  return {
+    invitation: null,
+    role: null,
+  };
+}
+
+/**
+ * 通过指定用户颁发通行证获得 invitation 数据结构
+ * @returns {Promise<{invitation: InvitationInfo, role: Role}>}
+ */
+async function getInvitationByIssuePassport({ node, teamDid, inviteId, roles }) {
+  /**
+   * @type {IssuePassportData}
+   */
+  const passportIssuance = await node.getPassportIssuance({ teamDid, sessionId: inviteId });
+  if (passportIssuance) {
+    const role = roles.find((v) => v.name === passportIssuance.name);
+
+    const invitation = {
+      inviteId: passportIssuance.id,
+      teamDid,
+      expireDate: new Date(passportIssuance.expireDate).getTime(),
+      inviter: {
+        did: passportIssuance.key,
+      },
+      remark: '',
+      role: {
+        name: passportIssuance.name,
+        title: passportIssuance.title,
+      },
+      receiver: {
+        did: passportIssuance.ownerDid,
+      },
+    };
+    return {
+      invitation,
+      role,
+    };
+  }
+  return {
+    invitation: null,
+    role: null,
+  };
+}
+
 module.exports = {
   init(server, node, { prefix, type } = {}) {
     server.get(`${prefix}/invitation`, async (req, res) => {
-      const { inviteId } = req.query;
+      const { inviteId, mode = 'invite' } = req.query;
       const groupPathPrefix = req.headers['x-group-path-prefix'] || '/';
 
       const nodeInfo = await node.getNodeInfo();
@@ -43,15 +153,28 @@ module.exports = {
         }
 
         const teamDid = info.did;
-        const invitations = await node.getInvitations({ teamDid, filter: () => true });
-        const invitation = invitations.find((v) => v.inviteId === inviteId);
+        const roles = await node.getRoles({ teamDid });
+        let invitation;
+        let role;
+        if (mode === 'invite') {
+          ({ invitation, role } = await getInvitation({
+            node,
+            inviteId,
+            teamDid,
+            roles,
+          }));
+        } else if (mode === 'issue-passport') {
+          ({ invitation, role } = await getInvitationByIssuePassport({ node, inviteId, teamDid, roles }));
+        } else {
+          res.status(400).send('Invitation mode is invalid');
+          return;
+        }
+
         if (!invitation || Date.now() > new Date(invitation.expireDate).getTime()) {
           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) {
@@ -71,10 +194,10 @@ module.exports = {
         }
 
         const inviter = {
-          did: invitation.inviter.did,
-          email: invitation.inviter.email,
-          fullName: invitation.inviter.fullName || user?.fullName,
-          role: invitation.inviter.role,
+          did: user.did,
+          email: user.email,
+          fullName: user.fullName,
+          role: user.role,
           avatar: getUserAvatarUrl(baseUrl, user.avatar, nodeInfo, isServer),
         };
 
@@ -82,7 +205,6 @@ module.exports = {
           ...invitation,
           info: omit(info, 'dataDir'),
           inviter,
-          inviterRaw: invitation.inviter,
           role: role || {},
         });
       } catch (err) {

package/lib/lost-passport.js

@@ -9,7 +9,7 @@ const getNodeWallet = require('@abtnode/util/lib/get-app-wallet');
 const { getDisplayName, getBlockletAppIdList } = require('@blocklet/meta/lib/util');
 const { VC_TYPE_NODE_PASSPORT, PASSPORT_STATUS, NODE_DATA_DIR_NAME } = require('@abtnode/constant');
 const get = require('lodash/get');
-const { getUserAvatarUrl, getAppAvatarUrl, getServerAvatarUrl } = require('@abtnode/util/lib/user');
+const { getUserAvatarUrl, getAppAvatarUrl, getServerAvatarUrl, extractUserAvatar } = require('@abtnode/util/lib/user');
 const { getWalletDid } = require('@blocklet/meta/lib/did-utils');
 
 const logger = require('./logger');
@@ -176,7 +176,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
         const { locale, passportName, receiverDid } = extraParams;
         checkWalletVersion({ didwallet, locale });
 
-        const { teamDid, issuerDid, issuerName, issuerLogo, passportColor, info } = await getApplicationInfo({
+        const { teamDid, issuerDid, issuerName, issuerLogo, passportColor, info, dataDir } = await getApplicationInfo({
           node,
           req: request,
           type,
@@ -185,6 +185,8 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
         const user = await getUser(node, teamDid, receiverDid, { enableConnectedAccount: true });
         const passport = await createPassport({ name: passportName, node, teamDid, locale });
 
+        const avatar = await extractUserAvatar(user.avatar, { dataDir });
+
         return {
           description: messages.receivePassport[locale],
           data: getRandomMessage(),
@@ -198,7 +200,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
               issuerAvatarUrl: issuerLogo,
               ownerDid: receiverDid,
               ownerName: user.fullName || '',
-              ownerAvatarUrl: getUserAvatarUrl(baseUrl, user.avatar, info, info.did === teamDid),
+              ownerAvatarUrl: getUserAvatarUrl(baseUrl, avatar, info, info.did === teamDid),
               preferredColor: passportColor,
             }),
           }),
@@ -210,7 +212,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
   onAuth: async ({ claims, userDid, userPk, extraParams, updateSession, baseUrl, req }) => {
     const { locale = 'en', receiverDid, passportName } = extraParams;
 
-    const { teamDid, issuerDidList, issuerName, issuerLogo, issuerWallet, passportColor, info } =
+    const { teamDid, issuerDidList, issuerName, issuerLogo, issuerWallet, passportColor, info, dataDir } =
       await getApplicationInfo({ node, req, type, baseUrl });
     const statusEndpointBaseUrl = getStatusEndpointBaseUrl(type, baseUrl, authServicePrefix);
 
@@ -261,6 +263,8 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
       );
     }
 
+    const avatar = await extractUserAvatar(user.avatar, { dataDir });
+
     const vcParams = {
       issuerName,
       issuerWallet,
@@ -279,7 +283,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
         teamDid,
       }),
       types: [],
-      ownerProfile: { ...user, avatar: getUserAvatarUrl(baseUrl, user.avatar, info, info.did === teamDid) },
+      ownerProfile: { ...user, avatar: getUserAvatarUrl(baseUrl, avatar, info, info.did === teamDid) },
       preferredColor: passportColor,
     };
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.23-beta-47ca27f8",
+  "version": "1.16.23-beta-c9c4e08e",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,15 +20,15 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.23-beta-47ca27f8",
-    "@abtnode/logger": "1.16.23-beta-47ca27f8",
-    "@abtnode/util": "1.16.23-beta-47ca27f8",
+    "@abtnode/constant": "1.16.23-beta-c9c4e08e",
+    "@abtnode/logger": "1.16.23-beta-c9c4e08e",
+    "@abtnode/util": "1.16.23-beta-c9c4e08e",
     "@arcblock/did": "1.18.110",
     "@arcblock/nft-display": "2.9.24",
     "@arcblock/validator": "^1.18.110",
     "@arcblock/vc": "1.18.110",
-    "@blocklet/constant": "1.16.23-beta-47ca27f8",
-    "@blocklet/meta": "1.16.23-beta-47ca27f8",
+    "@blocklet/constant": "1.16.23-beta-c9c4e08e",
+    "@blocklet/meta": "1.16.23-beta-c9c4e08e",
     "@ocap/client": "^1.18.110",
     "@ocap/mcrypto": "1.18.110",
     "@ocap/util": "1.18.110",
@@ -49,5 +49,5 @@
   "devDependencies": {
     "jest": "^29.7.0"
   },
-  "gitHead": "d0a1e85532a1826150275067f55e0f3873ea39d6"
+  "gitHead": "f2db6cfe9a6a64fc9921bfbbe2878dd343004703"
 }