@abtnode/auth 1.6.18 → 1.6.22

package/lib/auth.js

@@ -6,7 +6,7 @@ const { verifyPresentation, createCredentialList } = require('@arcblock/vc');
 const Mcrypto = require('@ocap/mcrypto');
 const { fromSecretKey, WalletType } = require('@ocap/wallet');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
-const { PASSPORT_STATUS, NFT_TYPE_NODE_PASSPORT } = require('@abtnode/constant');
+const { PASSPORT_STATUS, VC_TYPE_NODE_PASSPORT } = require('@abtnode/constant');
 const axios = require('@abtnode/util/lib/axios');
 const logger = require('./logger');
 const verifySignature = require('./util/verify-signature');
@@ -140,6 +140,56 @@ const messages = {
     en: 'Invalid Blocklet VC',
     zh: '无效的 Blocklet VC',
   },
+
+  // NFT related
+  missingProfileClaim: {
+    en: 'Owner profile not provided',
+    zh: '节点所有者信息必须提供',
+  },
+  invalidNftClaim: {
+    en: 'Invalid Asset Claim: ownerPk, ownerDid and ownerProof are required',
+    zh: '无效的 NFT Claim：ownerPk、ownerDid、ownerProof 是必填的',
+  },
+  invalidNft: {
+    en: 'Invalid server ownership NFT state',
+    zh: '无效的节点所有权 NFT',
+  },
+  invalidNftHolder: {
+    en: 'Invalid server ownership NFT holder',
+    zh: '无效的节点所有权 NFT 持有者',
+  },
+  invalidNftProof: {
+    en: 'Invalid server ownership NFT signature proof',
+    zh: '无效的节点所有权 NFT 签名',
+  },
+  invalidNftIssuer: {
+    en: 'Invalid server ownership NFT issuer',
+    zh: '无效的节点所有权 NFT 颁发者',
+  },
+  tagNotMatch: {
+    en: 'This NFT is for another blocklet server',
+    zh: '您所提供的所有权 NFT 不属于当前节点',
+  },
+  requestNft: {
+    en: 'Please provide server ownership NFT',
+    zh: '请提供节点所有权 NFT',
+  },
+  missingNftClaim: {
+    en: 'Ownership NFT not provided',
+    zh: '节点所有权 NFT 必须提供',
+  },
+  noNft: {
+    en: 'This server is not initialized to accept ownership NFT',
+    zh: '该节点不能用这种方式成为管理员',
+  },
+  noTag: {
+    en: 'Tag not found from server launcher info',
+    zh: '节点初始化信息异常：缺少标签',
+  },
+  noChainHost: {
+    en: 'chainHost not found from server launcher info',
+    zh: '节点初始化信息异常：缺少链地址',
+  },
 };
 
 const PASSPORT_STATUS_KEY = 'passport-status';
@@ -333,7 +383,7 @@ const handleInvitationResponse = async ({
       userDid,
       teamDid,
     }),
-    types: teamDid === nodeInfo.did ? [NFT_TYPE_NODE_PASSPORT] : [],
+    types: teamDid === nodeInfo.did ? [VC_TYPE_NODE_PASSPORT] : [],
     ownerProfile: profile,
     preferredColor: passportColor,
   };
@@ -505,7 +555,7 @@ const handleIssuePassportResponse = async ({
       userDid,
       teamDid,
     }),
-    types: teamDid === nodeInfo.did ? [NFT_TYPE_NODE_PASSPORT] : [],
+    types: teamDid === nodeInfo.did ? [VC_TYPE_NODE_PASSPORT] : [],
     ownerProfile: user,
     preferredColor: passportColor,
   };

package/lib/lost-passport.js

@@ -3,7 +3,7 @@ const uniqBy = require('lodash/uniqBy');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const getRandomMessage = require('@abtnode/util/lib/get-random-message');
 const getNodeWallet = require('@abtnode/util/lib/get-app-wallet');
-const { NFT_TYPE_NODE_PASSPORT, PASSPORT_STATUS } = require('@abtnode/constant');
+const { VC_TYPE_NODE_PASSPORT, PASSPORT_STATUS } = require('@abtnode/constant');
 const get = require('lodash/get');
 
 const logger = require('./logger');
@@ -249,7 +249,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
     };
 
     if (type === TEAM_TYPES.NODE) {
-      vcParams.types = [NFT_TYPE_NODE_PASSPORT];
+      vcParams.types = [VC_TYPE_NODE_PASSPORT];
       vcParams.tag = teamDid;
     }
 

package/lib/passport.js

@@ -3,7 +3,7 @@
 const Joi = require('joi');
 const pick = require('lodash/pick');
 const { create: createVC } = require('@arcblock/vc');
-const { ROLES, NFT_TYPE_GENERAL_PASSPORT, PASSPORT_STATUS } = require('@abtnode/constant');
+const { ROLES, VC_TYPE_GENERAL_PASSPORT, PASSPORT_STATUS } = require('@abtnode/constant');
 const createPassportSvg = require('./util/create-passport-svg');
 
 const SPEC_VERSION = '1.0.0';
@@ -63,7 +63,7 @@ const createPassportVC = ({
   validatePassport(passport);
 
   return createVC({
-    type: [NFT_TYPE_GENERAL_PASSPORT, 'VerifiableCredential', ...types].filter(Boolean),
+    type: [VC_TYPE_GENERAL_PASSPORT, 'VerifiableCredential', ...types].filter(Boolean),
     issuer: {
       wallet: issuerWallet,
       name: issuerName,

package/lib/util/create-passport-svg.js

@@ -16,15 +16,15 @@ const { getNftBGColor, DEFAULT_COLOR } = require('./passport-color');
  * @returns {string} svg xml or image data url
  */
 const createPassportSvg = ({
-  issuer,
-  title,
-  issuerDid,
+  issuer = '',
+  title = '',
+  issuerDid = '',
   ownerName = '',
   preferredColor = 'default',
   ownerAvatarUrl = '',
   revoked,
   isDataUrl,
-}) => {
+} = {}) => {
   let colors;
   if (preferredColor === 'default') {
     colors = DEFAULT_COLOR;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.18",
+  "version": "1.6.22",
   "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.6.18",
-    "@abtnode/logger": "1.6.18",
-    "@abtnode/util": "1.6.18",
-    "@arcblock/did": "^1.14.8",
-    "@arcblock/vc": "^1.14.8",
-    "@blocklet/meta": "1.6.18",
-    "@ocap/mcrypto": "^1.14.8",
-    "@ocap/util": "^1.14.8",
-    "@ocap/wallet": "^1.14.8",
-    "axios": "^0.21.4",
-    "joi": "^17.5.0",
+    "@abtnode/constant": "1.6.22",
+    "@abtnode/logger": "1.6.22",
+    "@abtnode/util": "1.6.22",
+    "@arcblock/did": "^1.14.16",
+    "@arcblock/vc": "^1.14.16",
+    "@blocklet/meta": "1.6.22",
+    "@ocap/mcrypto": "^1.14.16",
+    "@ocap/util": "^1.14.16",
+    "@ocap/wallet": "^1.14.16",
+    "axios": "^0.25.0",
+    "joi": "^17.6.0",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.21",
     "semver": "^7.3.2",
@@ -39,5 +39,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "2f02f166869d8ebedc0466068f6ed90ab3e07b87"
+  "gitHead": "18ac52a439dbd04e4ace98d796b6de517503fb14"
 }