@abtnode/auth 1.5.0 → 1.5.4

package/lib/auth.js

@@ -36,6 +36,10 @@ const messages = {
     en: 'Please provide passport',
     zh: '请提供通行证',
   },
+  requestBlockletNft: {
+    en: 'Please provide Blocklet Purchase NFT',
+    zh: '请提供 Blocklet Purchase NFT',
+  },
   receivePassport: {
     en: 'Please sign the text to get passport',
     ah: '请对文本签名以获取通行证',
@@ -59,6 +63,10 @@ const messages = {
     en: 'Credential is not provided',
     zh: '请提供凭证',
   },
+  missingBlockletCredentialClaim: {
+    en: 'Blocklet credential is not provided',
+    zh: '请提供 Blocklet 凭证',
+  },
   missingChallenge: {
     en: 'Credential presentation does not include valid challenge',
     zh: '凭证中缺少正确的随机因子',
@@ -111,6 +119,26 @@ const messages = {
     en: 'User not found',
     zh: '用户不存在',
   },
+  notAuthorized: {
+    en: '没有执行此操作的权限',
+    zh: 'No permission to perform this operation',
+  },
+  invalidParams: {
+    en: 'Invalid Params',
+    zh: '无效的参数',
+  },
+  invalidBlocklet: {
+    en: 'Invalid Blocklet',
+    zh: '无效的 Blocklet',
+  },
+  blockletExists: {
+    en: 'The blocklet already exists',
+    zh: '应用已安装',
+  },
+  invalidBlockletVc: {
+    en: 'Invalid Blocklet VC',
+    zh: '无效的 Blocklet VC',
+  },
 };
 
 const PASSPORT_STATUS_KEY = 'passport-status';
@@ -170,6 +198,7 @@ const getIssuer = async ({ node, nodeInfo, teamDid }) => {
 
 const createAuthToken = ({ did, passport, role, secret, expiresIn } = {}) => {
   const payload = {
+    type: 'user',
     did,
     role,
   };
@@ -185,6 +214,15 @@ const createAuthToken = ({ did, passport, role, secret, expiresIn } = {}) => {
   return token;
 };
 
+const createAuthTokenByOwnershipNFT = ({ role, secret, expiresIn } = {}) => {
+  const payload = {
+    type: 'ownership_nft',
+    role,
+  };
+
+  return jwt.sign(payload, secret, { expiresIn });
+};
+
 const getUser = async (node, teamDid, userDid) => {
   const user = await node.getUser({ teamDid, user: { did: userDid } });
   return user;
@@ -227,7 +265,7 @@ const createInvitationRequest = async ({ node, nodeInfo, teamDid, inviteId, loca
     type: 'mime:text/plain',
     display: JSON.stringify({
       type: 'svg',
-      content: createPassportSvg({ issuer: issuerName, title: passport.title, issuerDid: issuerWallet.toAddress() }),
+      content: createPassportSvg({ issuer: issuerName, title: passport.title, issuerDid: issuerWallet.address }),
     }),
   };
 };
@@ -251,11 +289,11 @@ const handleInvitationResponse = async ({
   const claim = claims.find((x) => x.type === 'signature');
   verifySignature(claim, userDid, userPk, locale);
 
-  const { issuerName, issuerWallet } = await getIssuer({ node, nodeInfo, teamDid });
+  const { issuerName, issuerWallet, issuerType } = await getIssuer({ node, nodeInfo, teamDid });
 
   const inviteInfo = await node.processInvitation({ teamDid, inviteId });
 
-  const vc = createPassportVC({
+  const vcParams = {
     issuerName,
     issuerWallet,
     ownerDid: userDid,
@@ -272,7 +310,13 @@ const handleInvitationResponse = async ({
       teamDid,
     }),
     types: teamDid === nodeInfo.did ? [NFT_TYPE_NODE_PASSPORT] : [],
-  });
+  };
+
+  if (issuerType === 'node') {
+    vcParams.tag = nodeInfo.did;
+  }
+
+  const vc = createPassportVC(vcParams);
 
   const role = getRoleFromLocalPassport(get(vc, 'credentialSubject.passport'));
   const passport = createUserPassport(vc, { role });
@@ -361,7 +405,7 @@ const createIssuePassportRequest = async ({ node, nodeInfo, teamDid, id, locale
     type: 'mime:text/plain',
     display: JSON.stringify({
       type: 'svg',
-      content: createPassportSvg({ issuer: issuerName, title: passport.title, issuerDid: issuerWallet.toAddress() }),
+      content: createPassportSvg({ issuer: issuerName, title: passport.title, issuerDid: issuerWallet.address }),
     }),
   };
 };
@@ -396,7 +440,7 @@ const handleIssuePassportResponse = async ({
     );
   }
 
-  const { issuerName, issuerWallet } = await getIssuer({ node, nodeInfo, teamDid });
+  const { issuerName, issuerWallet, issuerType } = await getIssuer({ node, nodeInfo, teamDid });
 
   // get issuanceInfo from session
   const list = await node.getPassportIssuances({ teamDid });
@@ -407,7 +451,7 @@ const handleIssuePassportResponse = async ({
     throw new Error(messages.notOwner[locale]);
   }
 
-  const vc = createPassportVC({
+  const vcParams = {
     issuerName,
     issuerWallet,
     ownerDid: userDid,
@@ -424,7 +468,13 @@ const handleIssuePassportResponse = async ({
       teamDid,
     }),
     types: teamDid === nodeInfo.did ? [NFT_TYPE_NODE_PASSPORT] : [],
-  });
+  };
+
+  if (issuerType === 'node') {
+    vcParams.tag = nodeInfo.did;
+  }
+
+  const vc = createPassportVC(vcParams);
 
   const role = getRoleFromLocalPassport(get(vc, 'credentialSubject.passport'));
   const passport = createUserPassport(vc, { role });
@@ -451,7 +501,9 @@ const handleIssuePassportResponse = async ({
 };
 
 const getVCFromClaims = async ({ claims, challenge, trustedIssuers, vcTypes, locale = 'en' }) => {
-  const credential = claims.find((x) => x.type === 'verifiableCredential');
+  const credential = claims.find(
+    (x) => x.type === 'verifiableCredential' && vcTypes.some((item) => x.item.includes(item))
+  );
 
   if (!credential || !credential.presentation) {
     return {};
@@ -607,6 +659,7 @@ const validatePassportStatus = async ({ vcId, endpoint, locale = 'en' }) => {
 module.exports = {
   getUser,
   createAuthToken,
+  createAuthTokenByOwnershipNFT,
   beforeInvitationRequest,
   createInvitationRequest,
   handleInvitationResponse,

package/lib/lost-passport.js

@@ -39,7 +39,7 @@ const getTeamInfo = async ({ type, node, req }) => {
     teamDid = req.headers['x-blocklet-did'];
     const blocklet = await node.getBlocklet({ did: teamDid, attachRuntimeInfo: false });
     const { wallet } = getBlockletInfo(blocklet, info.sk);
-    issuerDid = wallet.toAddress();
+    issuerDid = wallet.address;
     issuerName = blocklet.meta.title || blocklet.meta.name;
     issuerWallet = wallet;
   } else {
@@ -215,7 +215,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
       );
     }
 
-    const vc = createPassportVC({
+    const vcParams = {
       issuerName,
       issuerWallet,
       ownerDid: userDid,
@@ -231,8 +231,15 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
         userDid,
         teamDid,
       }),
-      types: type === TEAM_TYPES.NODE ? [NFT_TYPE_NODE_PASSPORT] : [],
-    });
+      types: [],
+    };
+
+    if (type === TEAM_TYPES.NODE) {
+      vcParams.types = [NFT_TYPE_NODE_PASSPORT];
+      vcParams.tag = teamDid;
+    }
+
+    const vc = createPassportVC(vcParams);
 
     const role = getRoleFromLocalPassport(get(vc, 'credentialSubject.passport'));
 

package/lib/passport.js

@@ -72,7 +72,7 @@ const createPassportSvg = ({
 </svg>
 `;
 
-const createPassportVC = ({ issuerWallet, issuerName, ownerDid, passport, endpoint, types = [] } = {}) => {
+const createPassportVC = ({ issuerWallet, issuerName, ownerDid, passport, endpoint, types = [], tag } = {}) => {
   validatePassport(passport);
 
   return createVC({
@@ -86,10 +86,11 @@ const createPassportVC = ({ issuerWallet, issuerName, ownerDid, passport, endpoi
       passport,
       display: {
         type: 'svg',
-        content: createPassportSvg({ issuer: issuerName, issuerDid: issuerWallet.toAddress(), title: passport.title }),
+        content: createPassportSvg({ issuer: issuerName, issuerDid: issuerWallet.address, title: passport.title }),
       },
     },
     endpoint,
+    tag,
   });
 };
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.0",
+  "version": "1.5.4",
   "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.0",
-    "@abtnode/logger": "1.5.0",
-    "@abtnode/util": "1.5.0",
-    "@arcblock/did": "^1.13.16",
-    "@arcblock/vc": "^1.13.16",
-    "@blocklet/meta": "1.5.0",
-    "@ocap/mcrypto": "^1.13.16",
-    "@ocap/util": "^1.13.16",
-    "@ocap/wallet": "^1.13.16",
+    "@abtnode/constant": "1.5.4",
+    "@abtnode/logger": "1.5.4",
+    "@abtnode/util": "1.5.4",
+    "@arcblock/did": "^1.13.28",
+    "@arcblock/vc": "^1.13.28",
+    "@blocklet/meta": "1.5.4",
+    "@ocap/mcrypto": "^1.13.28",
+    "@ocap/util": "^1.13.28",
+    "@ocap/wallet": "^1.13.28",
     "axios": "^0.21.4",
     "joi": "^17.4.0",
     "jsonwebtoken": "^8.5.1",
@@ -39,5 +39,5 @@
   "devDependencies": {
     "jest": "^26.4.2"
   },
-  "gitHead": "bc78f2a10de0ccc7ae23b6b6f259c05606bad8f5"
+  "gitHead": "8856a7eae8ebd3e09ca11214892f57fb522f9b45"
 }