@abtnode/auth 1.5.5 → 1.5.9

package/lib/auth.js

@@ -172,27 +172,32 @@ const getRandomMessage = (len = 16) => {
   return hex.replace(/^0x/, '').toUpperCase();
 };
 
-const getIssuer = async ({ node, nodeInfo, teamDid }) => {
-  let issuerName;
-  let issuerWallet;
-  let issuerType;
+const getTeamInfo = async ({ node, nodeInfo, teamDid }) => {
+  let type;
+  let name;
+  let wallet;
+  let description;
 
   if (teamDid === nodeInfo.did) {
-    issuerName = nodeInfo.name;
-    issuerWallet = getNodeWallet(nodeInfo.sk);
-    issuerType = 'node';
+    name = nodeInfo.name;
+    description = nodeInfo.description;
+    wallet = getNodeWallet(nodeInfo.sk);
+    type = 'node';
   } else {
     const blocklet = await node.getBlocklet({ did: teamDid, attachRuntimeInfo: false });
-    const { name, wallet } = getBlockletInfo(blocklet, nodeInfo.sk);
-    issuerName = name;
-    issuerWallet = wallet;
-    issuerType = 'blocklet';
+    const blockletInfo = getBlockletInfo(blocklet, nodeInfo.sk);
+    name = blockletInfo.name;
+    description = blockletInfo.description;
+    wallet = blockletInfo.wallet;
+    type = 'blocklet';
   }
 
   return {
-    issuerName,
-    issuerWallet,
-    issuerType,
+    type,
+    name,
+    description,
+    wallet,
+    did: teamDid,
   };
 };
 
@@ -250,7 +255,7 @@ const createInvitationRequest = async ({ node, nodeInfo, teamDid, inviteId, loca
     throw new Error('The invitation does not exist or has been used');
   }
 
-  const { issuerName, issuerWallet } = await getIssuer({ node, nodeInfo, teamDid });
+  const { name: issuerName, wallet: issuerWallet } = await getTeamInfo({ node, nodeInfo, teamDid });
 
   const passport = await createPassport({
     name: inviteInfo.role,
@@ -289,7 +294,7 @@ const handleInvitationResponse = async ({
   const claim = claims.find((x) => x.type === 'signature');
   verifySignature(claim, userDid, userPk, locale);
 
-  const { issuerName, issuerWallet, issuerType } = await getIssuer({ node, nodeInfo, teamDid });
+  const { name: issuerName, wallet: issuerWallet, type: issuerType } = await getTeamInfo({ node, nodeInfo, teamDid });
 
   const inviteInfo = await node.processInvitation({ teamDid, inviteId });
 
@@ -390,7 +395,7 @@ const createIssuePassportRequest = async ({ node, nodeInfo, teamDid, id, locale
     throw new Error('The issuance does not exist or has been used');
   }
 
-  const { issuerName, issuerWallet } = await getIssuer({ node, nodeInfo, teamDid });
+  const { name: issuerName, wallet: issuerWallet } = await getTeamInfo({ node, nodeInfo, teamDid });
 
   const passport = await createPassport({
     name: issuanceInfo.name,
@@ -440,7 +445,7 @@ const handleIssuePassportResponse = async ({
     );
   }
 
-  const { issuerName, issuerWallet, issuerType } = await getIssuer({ node, nodeInfo, teamDid });
+  const { name: issuerName, wallet: issuerWallet, type: issuerType } = await getTeamInfo({ node, nodeInfo, teamDid });
 
   // get issuanceInfo from session
   const list = await node.getPassportIssuances({ teamDid });
@@ -561,7 +566,7 @@ const checkWalletVersion = ({ abtwallet, locale = 'en' }) => {
 
 const getPassportStatus = async ({ node, teamDid, userDid, vcId, locale = 'en' }) => {
   const nodeInfo = await node.getNodeInfo();
-  const { issuerWallet, issuerName, issuerType } = await getIssuer({ node, nodeInfo, teamDid });
+  const { wallet: issuerWallet, name: issuerName, type: issuerType } = await getTeamInfo({ node, nodeInfo, teamDid });
 
   const actionLabel = {
     zh: `${issuerType === 'node' ? '管理节点' : '查看 Blocklet'}`,
@@ -656,8 +661,28 @@ const validatePassportStatus = async ({ vcId, endpoint, locale = 'en' }) => {
   }
 };
 
+const setUserInfoHeaders = (req) => {
+  if (req.user) {
+    req.headers['x-user-did'] = req.user.did;
+    req.headers['x-user-fullname'] = encodeURIComponent(req.user.fullName);
+    req.headers['x-user-role'] = req.user.role;
+    req.headers['x-connected-did'] = req.user.did;
+  } else {
+    delete req.headers['x-user-did'];
+    delete req.headers['x-user-fullname'];
+    delete req.headers['x-user-role'];
+
+    if (req.cookies && req.cookies.connected_did) {
+      req.headers['x-connected-did'] = req.cookies.connected_did;
+    } else {
+      delete req.headers['x-connected-did'];
+    }
+  }
+};
+
 module.exports = {
   getUser,
+  getTeamInfo,
   createAuthToken,
   createAuthTokenByOwnershipNFT,
   beforeInvitationRequest,
@@ -672,4 +697,5 @@ module.exports = {
   getPassportStatusEndpoint,
   getPassportStatus,
   validatePassportStatus,
+  setUserInfoHeaders,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.5",
+  "version": "1.5.9",
   "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": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.5.5",
-    "@abtnode/logger": "1.5.5",
-    "@abtnode/util": "1.5.5",
-    "@arcblock/did": "^1.13.28",
-    "@arcblock/vc": "^1.13.28",
-    "@blocklet/meta": "1.5.5",
-    "@ocap/mcrypto": "^1.13.28",
-    "@ocap/util": "^1.13.28",
-    "@ocap/wallet": "^1.13.28",
+    "@abtnode/constant": "1.5.9",
+    "@abtnode/logger": "1.5.9",
+    "@abtnode/util": "1.5.9",
+    "@arcblock/did": "^1.13.49",
+    "@arcblock/vc": "^1.13.49",
+    "@blocklet/meta": "1.5.9",
+    "@ocap/mcrypto": "^1.13.49",
+    "@ocap/util": "^1.13.49",
+    "@ocap/wallet": "^1.13.49",
     "axios": "^0.21.4",
     "joi": "^17.4.0",
     "jsonwebtoken": "^8.5.1",
@@ -39,5 +39,5 @@
   "devDependencies": {
     "jest": "^26.4.2"
   },
-  "gitHead": "1cdd5b1770ec9f9b8df59d4c43680d21b874eb1e"
+  "gitHead": "cd66ac83b32aaaee85bcd8a0a7cfe3501d1446c1"
 }