@abtnode/auth 1.6.15 → 1.6.19

package/lib/auth.js

@@ -178,18 +178,21 @@ const getTeamInfo = async ({ node, nodeInfo, teamDid }) => {
   let name;
   let wallet;
   let description;
+  let passportColor;
 
   if (teamDid === nodeInfo.did) {
     name = nodeInfo.name;
     description = nodeInfo.description;
     wallet = getNodeWallet(nodeInfo.sk);
     type = 'node';
+    passportColor = 'default';
   } else {
     const blocklet = await node.getBlocklet({ did: teamDid, attachRuntimeInfo: false });
     const blockletInfo = getBlockletInfo(blocklet, nodeInfo.sk);
     name = blockletInfo.name;
     description = blockletInfo.description;
     wallet = blockletInfo.wallet;
+    passportColor = blockletInfo.passportColor;
     type = 'blocklet';
   }
 
@@ -198,6 +201,7 @@ const getTeamInfo = async ({ node, nodeInfo, teamDid }) => {
     name,
     description,
     wallet,
+    passportColor,
     did: teamDid,
   };
 };
@@ -256,7 +260,7 @@ const createInvitationRequest = async ({ node, nodeInfo, teamDid, inviteId, loca
     throw new Error('The invitation does not exist or has been used');
   }
 
-  const { name: issuerName, wallet: issuerWallet } = await getTeamInfo({ node, nodeInfo, teamDid });
+  const { name: issuerName, wallet: issuerWallet, passportColor } = await getTeamInfo({ node, nodeInfo, teamDid });
 
   const passport = await createPassport({
     name: inviteInfo.role,
@@ -276,6 +280,7 @@ const createInvitationRequest = async ({ node, nodeInfo, teamDid, inviteId, loca
         title: passport.title,
         issuerDid: issuerWallet.address,
         ownerName: 'Your Name',
+        preferredColor: passportColor,
       }),
     }),
   };
@@ -300,7 +305,12 @@ const handleInvitationResponse = async ({
   const claim = claims.find((x) => x.type === 'signature');
   verifySignature(claim, userDid, userPk, locale);
 
-  const { name: issuerName, wallet: issuerWallet, type: issuerType } = await getTeamInfo({ node, nodeInfo, teamDid });
+  const {
+    name: issuerName,
+    wallet: issuerWallet,
+    type: issuerType,
+    passportColor,
+  } = await getTeamInfo({ node, nodeInfo, teamDid });
 
   const inviteInfo = await node.processInvitation({ teamDid, inviteId });
   const { remark } = inviteInfo;
@@ -325,6 +335,7 @@ const handleInvitationResponse = async ({
     }),
     types: teamDid === nodeInfo.did ? [NFT_TYPE_NODE_PASSPORT] : [],
     ownerProfile: profile,
+    preferredColor: passportColor,
   };
 
   if (issuerType === 'node') {
@@ -404,7 +415,7 @@ const createIssuePassportRequest = async ({ node, nodeInfo, teamDid, id, locale
     throw new Error('The issuance does not exist or has been used');
   }
 
-  const { name: issuerName, wallet: issuerWallet } = await getTeamInfo({ node, nodeInfo, teamDid });
+  const { name: issuerName, wallet: issuerWallet, passportColor } = await getTeamInfo({ node, nodeInfo, teamDid });
   const user = await getUser(node, teamDid, issuanceInfo.ownerDid);
 
   const passport = await createPassport({
@@ -426,6 +437,7 @@ const createIssuePassportRequest = async ({ node, nodeInfo, teamDid, id, locale
         issuerDid: issuerWallet.address,
         ownerName: get(user, 'fullName', 'Your Name'),
         ownerAvatarUrl: get(user, 'avatar', ''),
+        preferredColor: passportColor,
       }),
     }),
   };
@@ -461,7 +473,12 @@ const handleIssuePassportResponse = async ({
     );
   }
 
-  const { name: issuerName, wallet: issuerWallet, type: issuerType } = await getTeamInfo({ node, nodeInfo, teamDid });
+  const {
+    name: issuerName,
+    wallet: issuerWallet,
+    type: issuerType,
+    passportColor,
+  } = await getTeamInfo({ node, nodeInfo, teamDid });
 
   // get issuanceInfo from session
   const list = await node.getPassportIssuances({ teamDid });
@@ -490,6 +507,7 @@ const handleIssuePassportResponse = async ({
     }),
     types: teamDid === nodeInfo.did ? [NFT_TYPE_NODE_PASSPORT] : [],
     ownerProfile: user,
+    preferredColor: passportColor,
   };
 
   if (issuerType === 'node') {

package/lib/lost-passport.js

@@ -29,6 +29,7 @@ const getTeamInfo = async ({ type, node, req }) => {
   let issuerDid;
   let issuerName;
   let issuerWallet;
+  let passportColor;
 
   const info = await node.getNodeInfo();
   if (type === TEAM_TYPES.NODE) {
@@ -36,13 +37,15 @@ const getTeamInfo = async ({ type, node, req }) => {
     issuerDid = info.did;
     issuerName = info.name;
     issuerWallet = getNodeWallet(info.sk);
+    passportColor = 'default';
   } else if (TEAM_TYPES.BLOCKLET) {
     teamDid = req.headers['x-blocklet-did'];
     const blocklet = await node.getBlocklet({ did: teamDid, attachRuntimeInfo: false });
-    const { wallet } = getBlockletInfo(blocklet, info.sk);
-    issuerDid = wallet.address;
+    const blockletInfo = getBlockletInfo(blocklet, info.sk);
+    issuerDid = blockletInfo.wallet.address;
     issuerName = blocklet.meta.title || blocklet.meta.name;
-    issuerWallet = wallet;
+    issuerWallet = blockletInfo.wallet;
+    passportColor = blockletInfo.passportColor;
   } else {
     throw new Error('createLostPassportListRoute: unknown type');
   }
@@ -52,6 +55,7 @@ const getTeamInfo = async ({ type, node, req }) => {
     issuerDid,
     issuerName,
     issuerWallet,
+    passportColor,
   };
 };
 
@@ -148,7 +152,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
         const { locale, passportName, receiverDid } = extraParams;
         checkWalletVersion({ abtwallet, locale });
 
-        const { teamDid, issuerDid, issuerName } = await getTeamInfo({ node, req: request, type });
+        const { teamDid, issuerDid, issuerName, passportColor } = await getTeamInfo({ node, req: request, type });
         const user = await getUser(node, teamDid, receiverDid);
 
         const passport = await createPassport({
@@ -170,6 +174,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
               issuerDid,
               ownerName: user.fullName || '',
               ownerAvatarUrl: user.avatar || '',
+              preferredColor: passportColor,
             }),
           }),
         };
@@ -180,7 +185,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
   onAuth: async ({ claims, userDid, userPk, extraParams, baseUrl, req }) => {
     const { locale = 'en', receiverDid, passportName } = extraParams;
 
-    const { teamDid, issuerDid, issuerName, issuerWallet } = await getTeamInfo({ node, req, type });
+    const { teamDid, issuerDid, issuerName, issuerWallet, passportColor } = await getTeamInfo({ node, req, type });
     const statusEndpointBaseUrl = getStatusEndpointBaseUrl(type, baseUrl, authServicePrefix);
 
     // Verify signature
@@ -240,6 +245,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
       }),
       types: [],
       ownerProfile: user,
+      preferredColor: passportColor,
     };
 
     if (type === TEAM_TYPES.NODE) {

package/lib/passport.js

@@ -58,6 +58,7 @@ const createPassportVC = ({
   types = [],
   tag,
   ownerProfile,
+  preferredColor,
 } = {}) => {
   validatePassport(passport);
 
@@ -78,6 +79,7 @@ const createPassportVC = ({
           title: passport.title,
           ownerName: ownerProfile ? ownerProfile.fullName : '',
           ownerAvatarUrl: ownerProfile ? ownerProfile.avatar : '',
+          preferredColor,
         }),
       },
     },

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

@@ -1,3 +1,7 @@
+const { toHex } = require('@ocap/util');
+const { Hasher } = require('@ocap/mcrypto');
+const { getNftBGColor, DEFAULT_COLOR } = require('./passport-color');
+
 /**
  * Generate Passport SVG
  *
@@ -5,15 +9,34 @@
  * @param {string} issuer issuer name
  * @param {string} issuerDid
  * @param {boolean} ownerName
+ * @param {string} preferredColor
  * @param {boolean} ownerAvatarUrl
  * @param {boolean} revoked 是否撤销
  * @param {boolean} isDataUrl 返回生成 data url
  * @returns {string} svg xml or image data url
  */
-const createPassportSvg = ({ issuer, title, issuerDid, ownerName = '', ownerAvatarUrl = '', revoked, isDataUrl }) => {
+const createPassportSvg = ({
+  issuer = '',
+  title = '',
+  issuerDid = '',
+  ownerName = '',
+  preferredColor = 'default',
+  ownerAvatarUrl = '',
+  revoked,
+  isDataUrl,
+} = {}) => {
+  let colors;
+  if (preferredColor === 'default') {
+    colors = DEFAULT_COLOR;
+  } else if (preferredColor === 'auto') {
+    colors = getNftBGColor(`#${toHex(Hasher.SHA3.hash224(issuerDid)).slice(-6)}`);
+  } else {
+    colors = getNftBGColor(preferredColor);
+  }
+
   const svgXML = `<svg width="100%" height="100%" viewBox="0 0 424 564" fill="none" xmlns="http://www.w3.org/2000/svg">
 <rect x="1" y="1" width="422" height="562" rx="21" fill="url(#paint0_linear_6_342)"/>
-<text x="360" y="65" fill="white" xml:space="preserve" font-family="Roboto" font-size="${(() => {
+<text x="360" y="65" fill="white" xml:space="preserve" font-family="Roboto,Helvetica" font-size="${(() => {
     if (title.length >= 6) {
       return 24;
     }
@@ -24,8 +47,8 @@ const createPassportSvg = ({ issuer, title, issuerDid, ownerName = '', ownerAvat
 
     return 28;
   })()}" letter-spacing="0px" style="dominant-baseline:middle;text-anchor:middle;">${title.toUpperCase()}</text>
-<text opacity="0.4" fill="white" xml:space="preserve" style="white-space: pre" font-family="Roboto" font-size="16" font-weight="500" letter-spacing="0px"><tspan x="319" y="40.9688">PASSPORT</tspan></text>
-<text fill="white" xml:space="preserve" style="white-space: pre" font-family="Roboto" font-size="${(() => {
+<text opacity="0.4" fill="white" xml:space="preserve" style="white-space: pre" font-family="Roboto,Helvetica" font-size="16" font-weight="500" letter-spacing="0px"><tspan x="319" y="40.9688">PASSPORT</tspan></text>
+<text fill="white" xml:space="preserve" style="white-space: pre" font-family="Roboto,Helvetica" font-size="${(() => {
     if (issuer.length > 15) {
       return 20;
     }
@@ -42,15 +65,15 @@ const createPassportSvg = ({ issuer, title, issuerDid, ownerName = '', ownerAvat
 <image x="152" y="190" href="${ownerAvatarUrl}" width="120" height="120" />
 </pattern>
 </defs>
-<text x="215" y="350" fill="white" xml:space="preserve" style="dominant-baseline:middle;text-anchor:middle;" font-family="Roboto" font-size="28" font-weight="500" letter-spacing="0px">${ownerName}</text>
-<text opacity="0.4" fill="white" xml:space="preserve" style="white-space: pre" font-family="Roboto" font-size="18" font-weight="500" letter-spacing="0px"><tspan x="26" y="407.652">ISSUER DID</tspan></text>
+<text x="215" y="350" fill="white" xml:space="preserve" style="dominant-baseline:middle;text-anchor:middle;" font-family="Roboto,Helvetica" font-size="28" font-weight="500" letter-spacing="0px">${ownerName}</text>
+<text opacity="0.4" fill="white" xml:space="preserve" style="white-space: pre" font-family="Roboto,Helvetica" font-size="18" font-weight="500" letter-spacing="0px"><tspan x="26" y="407.652">ISSUER DID</tspan></text>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M28.6722 423.313H45.3819C46.4294 423.313 47.2787 424.162 47.2787 425.21V433.79C47.2787 434.838 46.4294 435.687 45.3819 435.687H28.6722C27.9517 435.687 27.3249 435.285 27.0039 434.694H26.1167C26.4887 435.746 27.4924 436.5 28.6722 436.5H45.3819C46.8784 436.5 48.0916 435.287 48.0916 433.79V425.21C48.0916 423.713 46.8784 422.5 45.3819 422.5H28.6722C27.3296 422.5 26.215 423.477 26 424.758H26.8295C27.0321 423.929 27.7803 423.313 28.6722 423.313ZM27.8801 432.096C27.7831 432.089 27.6966 432.082 27.6204 432.075V427.526C27.7243 427.512 27.8351 427.505 27.9528 427.505C28.0705 427.498 28.1848 427.494 28.2955 427.494C29.1057 427.494 29.6978 427.688 30.0717 428.076C30.4457 428.464 30.6326 429.035 30.6326 429.79C30.6326 430.51 30.4353 431.074 30.0406 431.483C29.6528 431.892 29.0538 432.096 28.2436 432.096H27.8801ZM32.0141 431.421C32.208 430.957 32.305 430.413 32.305 429.79C32.305 429.139 32.208 428.582 32.0141 428.118C31.8202 427.654 31.5432 427.273 31.1832 426.975C30.8231 426.677 30.3903 426.459 29.8848 426.321C29.3862 426.182 28.8288 426.113 28.2125 426.113C27.9216 426.113 27.5719 426.127 27.1634 426.154C26.7617 426.175 26.3739 426.22 26 426.29V433.301C26.3739 433.377 26.7548 433.425 27.1426 433.446C27.5304 433.474 27.8697 433.488 28.1605 433.488C28.7976 433.488 29.3723 433.412 29.8848 433.259C30.3972 433.107 30.83 432.878 31.1832 432.574C31.5432 432.269 31.8202 431.885 32.0141 431.421ZM35.2788 426.196H33.6585V433.394H35.2788V426.196ZM38.5654 432.075C38.6416 432.082 38.7281 432.089 38.8251 432.096H39.1886C39.9988 432.096 40.5978 431.892 40.9856 431.483C41.3803 431.074 41.5776 430.51 41.5776 429.79C41.5776 429.035 41.3907 428.464 41.0167 428.076C40.6428 427.688 40.0507 427.494 39.2405 427.494C39.1298 427.494 39.0155 427.498 38.8978 427.505C38.7801 427.505 38.6693 427.512 38.5654 427.526V432.075ZM43.25 429.79C43.25 430.413 43.153 430.957 42.9591 431.421C42.7652 431.885 42.4882 432.269 42.1282 432.574C41.775 432.878 41.3422 433.107 40.8298 433.259C40.3173 433.412 39.7426 433.488 39.1055 433.488C38.8147 433.488 38.4754 433.474 38.0876 433.446C37.6998 433.425 37.3189 433.377 36.945 433.301V426.29C37.3189 426.22 37.7067 426.175 38.1084 426.154C38.5169 426.127 38.8666 426.113 39.1574 426.113C39.7738 426.113 40.3312 426.182 40.8298 426.321C41.3353 426.459 41.7681 426.677 42.1282 426.975C42.4882 427.273 42.7652 427.654 42.9591 428.118C43.153 428.582 43.25 429.139 43.25 429.79ZM45.1907 428.355C44.8209 428.355 44.5161 428.055 44.5161 427.686C44.5161 427.316 44.8209 427.016 45.1907 427.016C45.5604 427.016 45.8652 427.316 45.8652 427.686C45.8652 428.055 45.5604 428.355 45.1907 428.355ZM45.1907 431.855C44.8209 431.855 44.5161 431.555 44.5161 431.185C44.5161 430.815 44.8209 430.516 45.1907 430.516C45.5604 430.516 45.8652 430.815 45.8652 431.185C45.8652 431.555 45.5604 431.855 45.1907 431.855Z" fill="white"/>
-<text fill="white" xml:space="preserve" style="white-space: pre" font-family="Roboto" font-size="15" font-weight="500" letter-spacing="0px"><tspan x="54.0916" y="434.969">${issuerDid}</tspan></text>
+<text fill="white" xml:space="preserve" style="white-space: pre" font-family="Roboto,Helvetica" font-size="15" font-weight="500" letter-spacing="0px"><tspan x="54.0916" y="434.969">${issuerDid}</tspan></text>
 <rect x="1" y="1" width="422" height="562" rx="21" stroke="#F0F0F0" stroke-width="2"/>
 <defs>
 <linearGradient id="paint0_linear_6_342" x1="414.5" y1="562" x2="-116.166" y2="156.726" gradientUnits="userSpaceOnUse">
-<stop stop-color="#2B3845"/>
-<stop offset="1" stop-color="#5A7A8A"/>
+<stop stop-color="${colors.startColor}"/>
+<stop offset="1" stop-color="${colors.endColor}"/>
 </linearGradient>
 </defs>
 ${

package/lib/util/passport-color.js

@@ -0,0 +1,134 @@
+const DEFAULT_COLOR = {
+  startColor: '#2B3845',
+  endColor: '#5A7A8A',
+};
+
+/**
+ * 将单个颜色转换为可用 nft 两个渐变背景色
+ * @param {String} rgbString 背景色
+ * @returns {Object}
+ */
+const getNftBGColor = (rgbString) => {
+  if (rgbString) {
+    const hsldata = rgbToHsl(rgbString);
+
+    // 色相 h 随意
+    // 饱和度 s 不可超过 0.8
+    // 亮度 l 不可超过 0.6，0.3 以上
+    const newHsl = [hsldata[0]];
+    if (hsldata[1] > 0.7) {
+      newHsl.push(0.7);
+    } else {
+      newHsl.push(hsldata[1]);
+    }
+
+    if (hsldata[2] > 0.6) {
+      newHsl.push(0.6);
+    } else if (hsldata[2] < 0.3) {
+      newHsl.push(0.3);
+    } else {
+      newHsl.push(hsldata[2]);
+    }
+
+    const newRepeatHsl = [newHsl[0], newHsl[1], newHsl[2] - 0.1];
+
+    const newColor = hslToRgb(...newHsl);
+    const newRepeatColor = hslToRgb(...newRepeatHsl);
+
+    return {
+      startColor: newRepeatColor,
+      endColor: newColor,
+    };
+  }
+
+  return {
+    startColor: '#2B3845',
+    endColor: '#5A7A8A',
+  };
+};
+
+/**
+ * RGB 转换为 HSL 颜色
+ *
+ * @param {String} rgbString rgb色值
+ * @return {Array}  HSL色值
+ */
+function rgbToHsl(rgbString) {
+  const color = rgbString.replace('#', '');
+  const r = parseInt(color.slice(0, 2), 16) / 255;
+  const g = parseInt(color.slice(2, 4), 16) / 255;
+  const b = parseInt(color.slice(4, 6), 16) / 255;
+  const max = Math.max(r, g, b);
+  const min = Math.min(r, g, b);
+  let h;
+  let s;
+  const l = (max + min) / 2;
+
+  if (max === min) {
+    h = 0;
+    s = 0;
+  } else {
+    const d = max - min;
+    s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+    switch (max) {
+      case r:
+        h = (g - b) / d + (g < b ? 6 : 0);
+        break;
+      case g:
+        h = (b - r) / d + 2;
+        break;
+      case b:
+        h = (r - g) / d + 4;
+        break;
+      default:
+    }
+    h /= 6;
+  }
+
+  return [h, s, l];
+}
+
+/**
+ * HSL颜色值转换为RGB.
+ * h, s, 和 l 设定在 [0, 1] 之间
+ * @param {Number} h 色相
+ * @param {Number} s 饱和度
+ * @param {Number} l 亮度
+ * @returns rgb string
+ */
+function hslToRgb(h, s, l) {
+  let r;
+  let g;
+  let b;
+
+  if (s === 0) {
+    r = l;
+    g = l;
+    b = l;
+  } else {
+    const hue2rgb = (p, q, t2) => {
+      let t = t2;
+      if (t < 0) t += 1;
+      if (t > 1) t -= 1;
+      if (t < 1 / 6) return p + (q - p) * 6 * t;
+      if (t < 1 / 2) return q;
+      if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
+      return p;
+    };
+
+    const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+    const p = 2 * l - q;
+    r = hue2rgb(p, q, h + 1 / 3);
+    g = hue2rgb(p, q, h);
+    b = hue2rgb(p, q, h - 1 / 3);
+  }
+
+  return `#${[Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)]
+    .map((e) => e.toString(16).padStart(2, 0))
+    .join('')}`;
+}
+
+module.exports = {
+  getNftBGColor,
+  DEFAULT_COLOR,
+};

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.15",
+  "version": "1.6.19",
   "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.15",
-    "@abtnode/logger": "1.6.15",
-    "@abtnode/util": "1.6.15",
-    "@arcblock/did": "^1.13.84",
-    "@arcblock/vc": "^1.13.84",
-    "@blocklet/meta": "1.6.15",
-    "@ocap/mcrypto": "^1.13.84",
-    "@ocap/util": "^1.13.84",
-    "@ocap/wallet": "^1.13.84",
-    "axios": "^0.21.4",
-    "joi": "^17.5.0",
+    "@abtnode/constant": "1.6.19",
+    "@abtnode/logger": "1.6.19",
+    "@abtnode/util": "1.6.19",
+    "@arcblock/did": "^1.14.11",
+    "@arcblock/vc": "^1.14.11",
+    "@blocklet/meta": "1.6.19",
+    "@ocap/mcrypto": "^1.14.11",
+    "@ocap/util": "^1.14.11",
+    "@ocap/wallet": "^1.14.11",
+    "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": "1b7b07da04387b1daa838b251a9388355009142d"
+  "gitHead": "42a1290f14fca261eccafb05561eecf8683ed66a"
 }