@abtnode/auth 1.16.14-beta-a898bfcb → 1.16.14-beta-d802cd3c

package/lib/auth.js

@@ -21,7 +21,8 @@ const {
   WELLKNOWN_BLOCKLET_ADMIN_PATH,
 } = require('@abtnode/constant');
 const axios = require('@abtnode/util/lib/axios');
-const { extractUserAvatar, parseUserAvatar } = require('@abtnode/util/lib/user');
+const { extractUserAvatar, getUserAvatarUrl, getAppAvatarUrl, getServerAvatarUrl } = require('@abtnode/util/lib/user');
+const { LOGIN_PROVIDER } = require('@blocklet/constant');
 
 const logger = require('./logger');
 const verifySignature = require('./util/verify-signature');
@@ -327,7 +328,7 @@ const getRandomMessage = (len = 16) => {
   return hex.replace(/^0x/, '').toUpperCase();
 };
 
-const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid }) => {
+const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid, baseUrl = '' }) => {
   let type;
   let name;
   let wallet;
@@ -337,6 +338,7 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid }) => {
   let owner;
   let dataDir;
   let secret;
+  let logo;
 
   if (teamDid === nodeInfo.did) {
     name = nodeInfo.name;
@@ -349,6 +351,7 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid }) => {
     owner = nodeInfo.nodeOwner;
     dataDir = path.join(node.dataDirs.data, NODE_DATA_DIR_NAME);
     secret = Hasher.SHA3.hash256(Buffer.concat([_wallet.secretKey, _wallet.address].map(Buffer.from)));
+    logo = getServerAvatarUrl(baseUrl, nodeInfo);
   } else {
     const blocklet = await node.getBlocklet({ did: teamDid });
     const blockletInfo = getBlockletInfo(blocklet, nodeInfo.sk);
@@ -361,6 +364,7 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid }) => {
     owner = get(blocklet, 'settings.owner');
     dataDir = blocklet.env.dataDir;
     secret = blockletInfo.secret;
+    logo = getAppAvatarUrl(baseUrl);
   }
 
   return {
@@ -373,14 +377,25 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid }) => {
     owner,
     dataDir,
     secret,
+    logo,
   };
 };
 
-const createAuthToken = ({ did, passport, role, secret, expiresIn, fullName, tokenType } = {}) => {
+const createAuthToken = ({
+  did,
+  passport,
+  role,
+  secret,
+  expiresIn,
+  fullName,
+  tokenType,
+  provider = LOGIN_PROVIDER.WALLET,
+} = {}) => {
   const payload = {
     type: 'user',
     did,
     role,
+    provider,
   };
 
   if (passport) {
@@ -442,7 +457,7 @@ const beforeInvitationRequest = async ({ node, teamDid, inviteId, locale = 'en'
   }
 };
 
-const createInvitationRequest = async ({ node, nodeInfo, teamDid, inviteId, locale = 'en' }) => {
+const createInvitationRequest = async ({ node, nodeInfo, teamDid, inviteId, baseUrl, locale = 'en' }) => {
   // verify invite id
   await node.checkInvitation({ teamDid, inviteId });
   const inviteInfo = await node.getInvitation({ teamDid, inviteId });
@@ -451,7 +466,8 @@ const createInvitationRequest = async ({ node, nodeInfo, teamDid, inviteId, loca
     name: issuerName,
     wallet: issuerWallet,
     passportColor,
-  } = await getApplicationInfo({ node, nodeInfo, teamDid });
+    logo,
+  } = await getApplicationInfo({ node, nodeInfo, teamDid, baseUrl });
 
   const passport = await createPassport({
     name: inviteInfo.role,
@@ -470,7 +486,9 @@ const createInvitationRequest = async ({ node, nodeInfo, teamDid, inviteId, loca
         issuer: issuerName,
         title: passport.title,
         issuerDid: issuerWallet.address,
+        issuerAvatarUrl: logo,
         ownerName: 'Your Name',
+        ownerDid: teamDid,
         preferredColor: passportColor,
       }),
     }),
@@ -531,13 +549,15 @@ const handleInvitationReceive = async ({
     type: issuerType,
     passportColor,
     dataDir,
-  } = await getApplicationInfo({ node, nodeInfo, teamDid });
+    logo,
+  } = await getApplicationInfo({ node, nodeInfo, teamDid, baseUrl: endpoint });
 
   const { remark } = inviteInfo;
 
   const vcParams = {
     issuerName,
     issuerWallet,
+    issuerAvatarUrl: logo,
     ownerDid: userDid,
     passport: await createPassport({
       name: inviteInfo.role,
@@ -734,7 +754,7 @@ const beforeIssuePassportRequest = async ({ node, teamDid, id, locale = 'en' })
   }
 };
 
-const createIssuePassportRequest = async ({ node, nodeInfo, teamDid, id, locale = 'en' }) => {
+const createIssuePassportRequest = async ({ node, nodeInfo, teamDid, id, baseUrl, locale = 'en' }) => {
   if (!id) {
     throw new Error('The issuance id does not exist');
   }
@@ -749,8 +769,8 @@ const createIssuePassportRequest = async ({ node, nodeInfo, teamDid, id, locale
     wallet: issuerWallet,
     passportColor,
     owner: teamOwner,
-    dataDir,
-  } = await getApplicationInfo({ node, nodeInfo, teamDid });
+    logo,
+  } = await getApplicationInfo({ node, nodeInfo, teamDid, baseUrl });
 
   if (issuanceInfo.name === ROLES.OWNER && !!teamOwner) {
     throw new Error('Cannot receive owner passport because the owner already exists');
@@ -759,12 +779,8 @@ const createIssuePassportRequest = async ({ node, nodeInfo, teamDid, id, locale
   // NOTICE: 这里是给指定用户颁发 passport，绑定的 did 无需查询 connectedAccount
   const user = await getUser(node, teamDid, issuanceInfo.ownerDid);
 
-  const passport = await createPassport({
-    name: issuanceInfo.name,
-    node,
-    teamDid,
-    locale,
-  });
+  const passport = await createPassport({ name: issuanceInfo.name, node, teamDid, locale });
+  const ownerAvatarUrl = getUserAvatarUrl(baseUrl, user.avatar, nodeInfo, teamDid === nodeInfo.did);
 
   return {
     description: messages.receivePassport[locale],
@@ -776,8 +792,10 @@ const createIssuePassportRequest = async ({ node, nodeInfo, teamDid, id, locale
         issuer: issuerName,
         title: passport.title,
         issuerDid: issuerWallet.address,
+        issuerAvatarUrl: logo,
+        ownerDid: user.did,
         ownerName: get(user, 'fullName', 'Your Name'),
-        ownerAvatarUrl: await parseUserAvatar(get(user, 'avatar', ''), { dataDir }),
+        ownerAvatarUrl,
         preferredColor: passportColor,
       }),
     }),
@@ -806,16 +824,14 @@ const handleIssuePassportResponse = async ({
   const claim = claims.find((x) => x.type === 'signature');
   verifySignature(claim, userDid, userPk, locale);
 
-  const user = await getUser(node, teamDid, userDid, {
-    enableConnectedAccount: true,
-  });
+  const user = await getUser(node, teamDid, userDid, { enableConnectedAccount: true });
   const realDid = user.did || userDid;
   const realPk = user.pk || userPk;
   if (user && !user.approved) {
     throw new Error(
       {
-        zh: '你没有权限访问该节点',
-        en: 'You are not allowed to access this node',
+        zh: '你没有权限访问该应用',
+        en: 'You are not allowed to access this app',
       }[locale]
     );
   }
@@ -826,8 +842,8 @@ const handleIssuePassportResponse = async ({
     type: issuerType,
     passportColor,
     owner: teamOwner,
-    dataDir,
-  } = await getApplicationInfo({ node, nodeInfo, teamDid });
+    logo,
+  } = await getApplicationInfo({ node, nodeInfo, teamDid, baseUrl: endpoint });
 
   // get issuanceInfo from session
   const list = await node.getPassportIssuances({ teamDid });
@@ -843,12 +859,13 @@ const handleIssuePassportResponse = async ({
   }
 
   if (user) {
-    user.avatar = await parseUserAvatar(user.avatar, { dataDir });
+    user.avatar = getUserAvatarUrl(endpoint, user.avatar, nodeInfo, teamDid === nodeInfo.did);
   }
 
   const vcParams = {
     issuerName,
     issuerWallet,
+    issuerAvatarUrl: logo,
     ownerDid: userDid,
     passport: await createPassport({
       name,

package/lib/invitation.js

@@ -5,7 +5,7 @@ const { WELLKNOWN_SERVICE_PATH_PREFIX, NODE_DATA_DIR_NAME } = require('@abtnode/
 const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/constant');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
 const logger = require('@abtnode/logger')(require('../package.json').name);
-const { parseUserAvatar } = require('@abtnode/util/lib/user');
+const { getUserAvatarUrl } = require('@abtnode/util/lib/user');
 
 module.exports = {
   init(server, node, { prefix, type } = {}) {
@@ -25,7 +25,6 @@ module.exports = {
             name: getDisplayName(blockletInfo),
             version: blockletInfo.meta.version,
             logo: joinUrl(groupPathPrefix, WELLKNOWN_SERVICE_PATH_PREFIX, '/blocklet/logo'),
-            // TODO: 需要将 CHAIN_HOST 纳入标准
             chainHost: blockletInfo.configObj.CHAIN_HOST,
             passportColor: blockletInfo.configObj[BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_PASSPORT_COLOR],
             description: blockletInfo.meta.description,
@@ -54,10 +53,7 @@ module.exports = {
         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 },
-          });
+          role.permissions = await node.getPermissionsByRole({ teamDid, role: { name: role.name } });
         } catch (err) {
           logger.error('failed to get role permission', { teamDid, role: role.name, error: err });
           role.permissions = [];
@@ -65,15 +61,13 @@ module.exports = {
 
         // NOTICE: 邀请人的 did 为永久 did，无需查询 connectedAccount
         let user = await node.getUser({ teamDid: info.did, user: { did: invitation.inviter.did } });
-        let avatar = user && (await parseUserAvatar(user.avatar, { dataDir: info.dataDir }));
-
-        // blocklet 邀请链接可能是 server 的 member
+        let baseUrl = info.url;
+        let isServer = type !== 'blocklet';
         if (!user && type === 'blocklet') {
-          // NOTICE: 邀请人的 did 为永久 did，无需查询 connectedAccount
+          // 邀请人可能是 Server 的 Admin
           user = await node.getUser({ teamDid: nodeInfo.did, user: { did: invitation.inviter.did } });
-          avatar =
-            user &&
-            (await parseUserAvatar(user.avatar, { dataDir: path.join(node.dataDirs.data, NODE_DATA_DIR_NAME) }));
+          baseUrl = '/';
+          isServer = true;
         }
 
         const inviter = {
@@ -81,7 +75,7 @@ module.exports = {
           email: invitation.inviter.email,
           fullName: invitation.inviter.fullName || user?.fullName,
           role: invitation.inviter.role,
-          avatar,
+          avatar: getUserAvatarUrl(baseUrl, user.avatar, nodeInfo, isServer),
         };
 
         res.json({

package/lib/launcher.js

@@ -1,6 +1,6 @@
 const Joi = require('joi');
 const axios = require('@abtnode/util/lib/axios');
-const joinURL = require('url-join');
+const joinUrl = require('url-join');
 const pRetry = require('p-retry');
 const { stableStringify } = require('@arcblock/vc');
 const { toBase58 } = require('@ocap/util');
@@ -25,7 +25,7 @@ const doRequest = async (serverSk, { launcherUrl, pathname, payload, method = 'p
   const fn = async () => {
     const { data } = await axios({
       method,
-      url: joinURL(launcherUrl, pathname),
+      url: joinUrl(launcherUrl, pathname),
       data: method !== 'get' ? payload : {},
       params: method === 'get' ? payload : {},
       headers: {

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 { parseUserAvatar } = require('@abtnode/util/lib/user');
+const { getUserAvatarUrl, getAppAvatarUrl, getServerAvatarUrl } = require('@abtnode/util/lib/user');
 const { getWalletDid } = require('@blocklet/meta/lib/did-utils');
 
 const logger = require('./logger');
@@ -30,7 +30,7 @@ const TEAM_TYPES = {
   NODE: 'node',
 };
 
-const getApplicationInfo = async ({ type, node, req }) => {
+const getApplicationInfo = async ({ type, node, req, baseUrl = '' }) => {
   let teamDid;
   let issuerDid;
   let issuerDidList;
@@ -38,6 +38,7 @@ const getApplicationInfo = async ({ type, node, req }) => {
   let issuerWallet;
   let passportColor;
   let dataDir;
+  let issuerLogo;
 
   const info = await node.getNodeInfo();
   if (type === TEAM_TYPES.NODE) {
@@ -48,6 +49,7 @@ const getApplicationInfo = async ({ type, node, req }) => {
     issuerWallet = getNodeWallet(info.sk);
     passportColor = 'default';
     dataDir = path.join(node.dataDirs.data, NODE_DATA_DIR_NAME);
+    issuerLogo = getServerAvatarUrl(baseUrl, info);
   } else if (TEAM_TYPES.BLOCKLET) {
     teamDid = req.headers['x-blocklet-did'];
     const blocklet = await node.getBlocklet({ did: teamDid });
@@ -58,6 +60,7 @@ const getApplicationInfo = async ({ type, node, req }) => {
     issuerWallet = blockletInfo.wallet;
     passportColor = blockletInfo.passportColor;
     dataDir = blocklet.env.dataDir;
+    issuerLogo = getAppAvatarUrl(baseUrl);
   } else {
     throw new Error('createLostPassportListRoute: unknown type');
   }
@@ -68,8 +71,10 @@ const getApplicationInfo = async ({ type, node, req }) => {
     issuerDidList,
     issuerName,
     issuerWallet,
+    issuerLogo,
     passportColor,
     dataDir,
+    info,
   };
 };
 
@@ -98,15 +103,13 @@ const createLostPassportListRoute = ({ node, type }) => ({
     },
   },
 
-  onAuth: async ({ userDid, extraParams, updateSession, req }) => {
+  onAuth: async ({ userDid, extraParams, updateSession, req, baseUrl }) => {
     const { locale } = extraParams;
 
-    const { teamDid, issuerDidList, dataDir } = await getApplicationInfo({ node, req, type });
+    const { teamDid, issuerDidList, info } = await getApplicationInfo({ node, req, type });
 
     // check user approved
-    const user = await getUser(node, teamDid, userDid, {
-      enableConnectedAccount: true,
-    });
+    const user = await getUser(node, teamDid, userDid, { enableConnectedAccount: true });
 
     if (!user) {
       throw new Error(messages.userNotFound[locale]);
@@ -134,9 +137,9 @@ const createLostPassportListRoute = ({ node, type }) => ({
       throw new Error(messages.passportNotFound[locale]);
     }
 
-    logger.info('get passport type list', { userDid: user.did });
+    logger.info('get passport type list', { userDid: user.did, baseUrl });
 
-    user.avatar = await parseUserAvatar(user.avatar, { did: teamDid, dataDir });
+    user.avatar = getUserAvatarUrl(baseUrl, user.avatar, info, info.did === teamDid);
 
     await updateSession({ user });
   },
@@ -169,25 +172,18 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
       },
     },
     {
-      signature: async ({ extraParams, context: { request, didwallet } }) => {
+      signature: async ({ extraParams, context: { baseUrl, request, didwallet } }) => {
         const { locale, passportName, receiverDid } = extraParams;
         checkWalletVersion({ didwallet, locale });
 
-        const { teamDid, issuerDid, issuerName, passportColor, dataDir } = await getApplicationInfo({
+        const { teamDid, issuerDid, issuerName, issuerLogo, passportColor, info } = await getApplicationInfo({
           node,
           req: request,
           type,
+          baseUrl,
         });
-        const user = await getUser(node, teamDid, receiverDid, {
-          enableConnectedAccount: true,
-        });
-
-        const passport = await createPassport({
-          name: passportName,
-          node,
-          teamDid,
-          locale,
-        });
+        const user = await getUser(node, teamDid, receiverDid, { enableConnectedAccount: true });
+        const passport = await createPassport({ name: passportName, node, teamDid, locale });
 
         return {
           description: messages.receivePassport[locale],
@@ -199,8 +195,10 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
               issuer: issuerName,
               title: passport.title,
               issuerDid,
+              issuerAvatarUrl: issuerLogo,
+              ownerDid: receiverDid,
               ownerName: user.fullName || '',
-              ownerAvatarUrl: await parseUserAvatar(user.avatar || '', { dataDir }),
+              ownerAvatarUrl: getUserAvatarUrl(baseUrl, user.avatar, info, info.did === teamDid),
               preferredColor: passportColor,
             }),
           }),
@@ -212,11 +210,8 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
   onAuth: async ({ claims, userDid, userPk, extraParams, updateSession, baseUrl, req }) => {
     const { locale = 'en', receiverDid, passportName } = extraParams;
 
-    const { teamDid, issuerDidList, issuerName, issuerWallet, passportColor, dataDir } = await getApplicationInfo({
-      node,
-      req,
-      type,
-    });
+    const { teamDid, issuerDidList, issuerName, issuerLogo, issuerWallet, passportColor, info } =
+      await getApplicationInfo({ node, req, type, baseUrl });
     const statusEndpointBaseUrl = getStatusEndpointBaseUrl(type, baseUrl, authServicePrefix);
 
     // Verify signature
@@ -266,11 +261,10 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
       );
     }
 
-    user.avatar = await parseUserAvatar(user.avatar, { dataDir });
-
     const vcParams = {
       issuerName,
       issuerWallet,
+      issuerAvatarUrl: issuerLogo,
       ownerDid: userDid,
       passport: await createPassport({
         name: passportName,
@@ -285,7 +279,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
         teamDid,
       }),
       types: [],
-      ownerProfile: user,
+      ownerProfile: { ...user, avatar: getUserAvatarUrl(baseUrl, user.avatar, info, info.did === teamDid) },
       preferredColor: passportColor,
     };
 

package/lib/passport.js

@@ -62,6 +62,7 @@ const createPassport = async ({ name, node, locale = 'en', teamDid, endpoint, ro
 const createPassportVC = ({
   issuerWallet,
   issuerName,
+  issuerAvatarUrl,
   ownerDid,
   passport,
   endpoint,
@@ -87,7 +88,9 @@ const createPassportVC = ({
         content: createPassportSvg({
           issuer: issuerName,
           issuerDid: issuerWallet.address,
+          issuerAvatarUrl,
           title: passport.title,
+          ownerDid,
           ownerName: ownerProfile ? ownerProfile.fullName : '',
           ownerAvatarUrl: ownerProfile ? ownerProfile.avatar : '',
           preferredColor,

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

@@ -1,4 +1,4 @@
-const { getNftBGColor, DEFAULT_COLOR, getNftBGColorFromDid } = require('./passport-color');
+const { getNftBGColor, DEFAULT_COLORS, getNftBGColorFromDid, getSvg } = require('@arcblock/nft-display');
 
 /**
  * Generate Passport SVG
@@ -8,11 +8,13 @@ const { getNftBGColor, DEFAULT_COLOR, getNftBGColorFromDid } = require('./passpo
  * @param {string} params.issuer issuer name
  * @param {string} params.issuerDid
  * @param {string} params.ownerName
+ * @param {string} params.ownerDid
  * @param {string} params.ownerAvatarUrl
  * @param {string} [params.preferredColor]
  * @param {string} [params.width]
  * @param {string} [params.height]
- * @param {boolean} [params.ownerAvatarUrl]
+ * @param {string} [params.ownerAvatarUrl]
+ * @param {string} [params.issuerAvatarUrl]
  * @param {boolean} [params.revoked] 是否撤销
  * @param {boolean} [params.isDataUrl] 返回生成 data url
  * @returns {string} svg xml or image data url
@@ -21,6 +23,8 @@ const createPassportSvg = ({
   issuer = '',
   title = '',
   issuerDid = '',
+  issuerAvatarUrl = '',
+  ownerDid = '',
   ownerName = '',
   ownerAvatarUrl = '',
   preferredColor = 'default',
@@ -29,71 +33,43 @@ const createPassportSvg = ({
   width = '100%',
   height = '100%',
 }) => {
-  let colors;
+  let color;
   if (preferredColor === 'default') {
-    colors = DEFAULT_COLOR;
+    color = DEFAULT_COLORS['app-passport'];
   } else if (preferredColor === 'auto') {
-    colors = getNftBGColorFromDid(issuerDid);
+    color = getNftBGColorFromDid(issuerDid);
   } else {
-    colors = getNftBGColor(preferredColor);
+    color = getNftBGColor(preferredColor);
   }
 
-  const svgXML = `<svg width="${width}" height="${height}" 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,Helvetica" font-size="${(() => {
-    if (title.length >= 12) {
-      return 12;
-    }
+  const svgXML = getSvg({
+    width,
+    height,
 
-    if (title.length >= 10) {
-      return 14;
-    }
+    revoked,
 
-    if (title.length >= 8) {
-      return 18;
-    }
+    color,
 
-    if (title.length >= 6) {
-      return 24;
-    }
+    did: ownerDid,
+    variant: 'app-passport' || ownerName,
+    verifiable: true,
 
-    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,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;
-    }
+    issuer: {
+      name: issuer,
+      icon: issuerAvatarUrl,
+    },
 
-    return 24;
-  })()}" font-weight="500" letter-spacing="0px"><tspan x="26" y="60.2031">${issuer}</tspan></text>
-<rect x="2" y="102" width="420" height="168" fill="black" fill-opacity="0.3"/>
-<circle cx="212" cy="250" r="60" fill="#FBFBFB"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M212.224 247.722C218.932 247.722 224.37 242.284 224.37 235.575C224.37 228.867 218.932 223.429 212.224 223.429C205.515 223.429 200.077 228.867 200.077 235.575C200.077 242.284 205.515 247.722 212.224 247.722ZM188.857 272.018C188.857 274.573 190.929 276.645 193.484 276.645H230.962C231.28 276.645 231.597 276.612 231.908 276.547C234.41 276.025 236.014 273.574 235.492 271.072L234.335 265.533C232.991 259.099 227.319 254.489 220.746 254.489H203.7C197.127 254.489 191.455 259.099 190.112 265.533L188.955 271.072C188.89 271.383 188.857 271.7 188.857 272.018Z" fill="#FBFBFB" />
-<path d="M231.908 276.547L232.215 278.016L231.908 276.547ZM235.492 271.072L236.96 270.765H236.96L235.492 271.072ZM234.335 265.533L232.866 265.839L234.335 265.533ZM190.112 265.533L191.58 265.839L190.112 265.533ZM188.955 271.072L187.487 270.765H187.487L188.955 271.072ZM222.87 235.575C222.87 241.455 218.104 246.222 212.224 246.222V249.222C219.761 249.222 225.87 243.112 225.87 235.575H222.87ZM212.224 224.929C218.104 224.929 222.87 229.695 222.87 235.575H225.87C225.87 228.038 219.761 221.929 212.224 221.929V224.929ZM201.577 235.575C201.577 229.695 206.344 224.929 212.224 224.929V221.929C204.687 221.929 198.577 228.038 198.577 235.575H201.577ZM212.224 246.222C206.344 246.222 201.577 241.455 201.577 235.575H198.577C198.577 243.112 204.687 249.222 212.224 249.222V246.222ZM193.484 275.145C191.757 275.145 190.357 273.745 190.357 272.018H187.357C187.357 275.402 190.1 278.145 193.484 278.145V275.145ZM230.962 275.145H193.484V278.145H230.962V275.145ZM231.601 275.079C231.391 275.123 231.177 275.145 230.962 275.145V278.145C231.383 278.145 231.803 278.102 232.215 278.016L231.601 275.079ZM234.023 271.379C234.376 273.069 233.292 274.726 231.601 275.079L232.215 278.016C235.527 277.324 237.652 274.078 236.96 270.765L234.023 271.379ZM232.866 265.839L234.023 271.379L236.96 270.765L235.803 265.226L232.866 265.839ZM220.746 255.989C226.609 255.989 231.668 260.1 232.866 265.839L235.803 265.226C234.314 258.097 228.029 252.989 220.746 252.989V255.989ZM203.7 255.989H220.746V252.989H203.7V255.989ZM191.58 265.839C192.779 260.1 197.838 255.989 203.7 255.989V252.989C196.417 252.989 190.132 258.097 188.643 265.226L191.58 265.839ZM190.423 271.379L191.58 265.839L188.643 265.226L187.487 270.765L190.423 271.379ZM190.357 272.018C190.357 271.803 190.379 271.589 190.423 271.379L187.487 270.765C187.401 271.177 187.357 271.597 187.357 272.018H190.357Z" fill="#BFBFBF" />
-<circle cx="212" cy="250" r="60" fill="url(#raduisImage)"/>
-<defs>
-<pattern id="raduisImage" patternUnits="userSpaceOnUse" width="424" height="564">
-<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,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,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="${colors.startColor}"/>
-<stop offset="1" stop-color="${colors.endColor}"/>
-</linearGradient>
-</defs>
-${
-  revoked
-    ? '<circle cx="210" cy="250" r="120" stroke="rgba(255,0,0,0.5)" stroke-width="25" /><line x1="132" y1="168" x2="296" y2="323" stroke="rgba(255,0,0,0.5)" stroke-width="25" />'
-    : ''
-}
-</svg>`;
+    header: {
+      name: title,
+      icon: ownerAvatarUrl,
+    },
+
+    // FIXME: @wangshijun this should be dynamic
+    extra: {
+      key: 'Exp',
+      value: '2123-01-01',
+    },
+  });
 
   if (isDataUrl) {
     return `data:image/svg+xml;utf8,${encodeURIComponent(svgXML)}`;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.14-beta-a898bfcb",
+  "version": "1.16.14-beta-d802cd3c",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,16 +20,17 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/constant": "1.16.14-beta-a898bfcb",
-    "@abtnode/logger": "1.16.14-beta-a898bfcb",
-    "@abtnode/util": "1.16.14-beta-a898bfcb",
-    "@arcblock/did": "1.18.84",
-    "@arcblock/vc": "1.18.84",
-    "@blocklet/constant": "1.16.14-beta-a898bfcb",
-    "@blocklet/meta": "1.16.14-beta-a898bfcb",
-    "@ocap/mcrypto": "1.18.84",
-    "@ocap/util": "1.18.84",
-    "@ocap/wallet": "1.18.84",
+    "@abtnode/constant": "1.16.14-beta-d802cd3c",
+    "@abtnode/logger": "1.16.14-beta-d802cd3c",
+    "@abtnode/util": "1.16.14-beta-d802cd3c",
+    "@arcblock/did": "1.18.87",
+    "@arcblock/nft-display": "2.5.60",
+    "@arcblock/vc": "1.18.87",
+    "@blocklet/constant": "1.16.14-beta-d802cd3c",
+    "@blocklet/meta": "1.16.14-beta-d802cd3c",
+    "@ocap/mcrypto": "1.18.87",
+    "@ocap/util": "1.18.87",
+    "@ocap/wallet": "1.18.87",
     "fs-extra": "^10.1.0",
     "joi": "17.7.0",
     "jsonwebtoken": "^9.0.0",
@@ -42,5 +43,5 @@
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "1e6f2ec5199ca28e106a6b02114f2a3f355b3ceb"
+  "gitHead": "f8e2dcefd8d6876e5dedee833ac976b4a0496b20"
 }

package/lib/util/passport-color.js

@@ -1,147 +0,0 @@
-const { toHex } = require('@ocap/util');
-const { Hasher } = require('@ocap/mcrypto');
-
-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',
-  };
-};
-
-function getPassportColorFromDid(did) {
-  return `#${toHex(Hasher.SHA3.hash224(did)).slice(-6)}`;
-}
-
-function getNftBGColorFromDid(did) {
-  return getNftBGColor(getPassportColorFromDid(did));
-}
-
-/**
- * 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,
-  getNftBGColorFromDid,
-  DEFAULT_COLOR,
-  getPassportColorFromDid,
-};