@abtnode/auth 1.7.23 → 1.7.26

package/lib/auth.js

@@ -1,3 +1,4 @@
+const path = require('path');
 const jwt = require('jsonwebtoken');
 const semver = require('semver');
 const joinUrl = require('url-join');
@@ -8,8 +9,9 @@ const Mcrypto = require('@ocap/mcrypto');
 const Client = require('@ocap/client');
 const { fromSecretKey, WalletType } = require('@ocap/wallet');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
-const { PASSPORT_STATUS, VC_TYPE_NODE_PASSPORT, ROLES } = require('@abtnode/constant');
+const { PASSPORT_STATUS, VC_TYPE_NODE_PASSPORT, ROLES, NODE_DATA_DIR_NAME } = require('@abtnode/constant');
 const axios = require('@abtnode/util/lib/axios');
+const { extractUserAvatar, parseUserAvatar } = require('@abtnode/util/lib/user-avatar');
 
 const logger = require('./logger');
 const verifySignature = require('./util/verify-signature');
@@ -253,6 +255,7 @@ const getTeamInfo = async ({ node, nodeInfo, teamDid }) => {
   let description;
   let passportColor;
   let owner;
+  let dataDir;
 
   if (teamDid === nodeInfo.did) {
     name = nodeInfo.name;
@@ -261,6 +264,7 @@ const getTeamInfo = async ({ node, nodeInfo, teamDid }) => {
     type = 'node';
     passportColor = 'default';
     owner = nodeInfo.nodeOwner;
+    dataDir = path.join(node.dataDirs.data, NODE_DATA_DIR_NAME);
   } else {
     const blocklet = await node.getBlocklet({ did: teamDid, attachRuntimeInfo: false });
     const blockletInfo = getBlockletInfo(blocklet, nodeInfo.sk);
@@ -270,6 +274,7 @@ const getTeamInfo = async ({ node, nodeInfo, teamDid }) => {
     passportColor = blockletInfo.passportColor;
     type = 'blocklet';
     owner = get(blocklet, 'settings.owner');
+    dataDir = blocklet.env.dataDir;
   }
 
   return {
@@ -280,6 +285,7 @@ const getTeamInfo = async ({ node, nodeInfo, teamDid }) => {
     passportColor,
     did: teamDid,
     owner,
+    dataDir,
   };
 };
 
@@ -426,6 +432,7 @@ const handleInvitationResponse = async ({
     wallet: issuerWallet,
     type: issuerType,
     passportColor,
+    dataDir,
   } = await getTeamInfo({ node, nodeInfo, teamDid });
 
   const { remark } = inviteInfo;
@@ -483,11 +490,16 @@ const handleInvitationResponse = async ({
     }
   }
 
+  const avatar = await extractUserAvatar(get(profile, 'avatar'), {
+    dataDir,
+  });
+
   if (user) {
     const doc = await node.updateUser({
       teamDid,
       user: {
         ...profile,
+        avatar,
         did: userDid,
         pk: userPk,
         locale,
@@ -510,6 +522,7 @@ const handleInvitationResponse = async ({
       teamDid,
       user: {
         ...profile,
+        avatar,
         did: userDid,
         pk: userPk,
         approved: true,
@@ -572,6 +585,7 @@ const createIssuePassportRequest = async ({ node, nodeInfo, teamDid, id, locale
     wallet: issuerWallet,
     passportColor,
     owner: teamOwner,
+    dataDir,
   } = await getTeamInfo({ node, nodeInfo, teamDid });
 
   if (issuanceInfo.name === ROLES.OWNER && !!teamOwner) {
@@ -598,7 +612,7 @@ const createIssuePassportRequest = async ({ node, nodeInfo, teamDid, id, locale
         title: passport.title,
         issuerDid: issuerWallet.address,
         ownerName: get(user, 'fullName', 'Your Name'),
-        ownerAvatarUrl: get(user, 'avatar', ''),
+        ownerAvatarUrl: await parseUserAvatar(get(user, 'avatar', ''), { dataDir }),
         preferredColor: passportColor,
       }),
     }),
@@ -643,6 +657,7 @@ const handleIssuePassportResponse = async ({
     type: issuerType,
     passportColor,
     owner: teamOwner,
+    dataDir,
   } = await getTeamInfo({ node, nodeInfo, teamDid });
 
   // get issuanceInfo from session
@@ -658,6 +673,10 @@ const handleIssuePassportResponse = async ({
     throw new Error(messages.notOwner[locale]);
   }
 
+  if (user) {
+    user.avatar = await parseUserAvatar(user.avatar, { dataDir });
+  }
+
   const vcParams = {
     issuerName,
     issuerWallet,

package/lib/invitation.js

@@ -1,8 +1,10 @@
-const { WELLKNOWN_SERVICE_PATH_PREFIX } = require('@abtnode/constant');
+const path = require('path');
+const joinUrl = require('url-join');
+const { WELLKNOWN_SERVICE_PATH_PREFIX, NODE_DATA_DIR_NAME } = require('@abtnode/constant');
 const { BLOCKLET_CONFIGURABLE_KEY } = require('@blocklet/meta/lib/constants');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
 const logger = require('@abtnode/logger')(require('../package.json').name);
-const joinUrl = require('url-join');
+const { parseUserAvatar } = require('@abtnode/util/lib/user-avatar');
 
 module.exports = {
   init(server, node, { prefix, type } = {}) {
@@ -64,7 +66,9 @@ module.exports = {
           email: invitation.inviter.email,
           fullName: invitation.inviter.fullName,
           role: invitation.inviter.role,
-          avatar: user && user.avatar,
+          avatar:
+            user &&
+            (await parseUserAvatar(user.avatar, { dataDir: path.join(node.dataDirs.data, NODE_DATA_DIR_NAME) })),
         };
 
         res.json({

package/lib/lost-passport.js

@@ -1,3 +1,4 @@
+const path = require('path');
 const joinUrl = require('url-join');
 const uniqBy = require('lodash/uniqBy');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
@@ -5,8 +6,9 @@ const formatContext = require('@abtnode/util/lib/format-context');
 const getRandomMessage = require('@abtnode/util/lib/get-random-message');
 const getNodeWallet = require('@abtnode/util/lib/get-app-wallet');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
-const { VC_TYPE_NODE_PASSPORT, PASSPORT_STATUS } = require('@abtnode/constant');
+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-avatar');
 
 const logger = require('./logger');
 const { messages, getUser, checkWalletVersion, getPassportStatusEndpoint } = require('./auth');
@@ -32,6 +34,7 @@ const getTeamInfo = async ({ type, node, req }) => {
   let issuerName;
   let issuerWallet;
   let passportColor;
+  let dataDir;
 
   const info = await node.getNodeInfo();
   if (type === TEAM_TYPES.NODE) {
@@ -40,6 +43,7 @@ const getTeamInfo = async ({ type, node, req }) => {
     issuerName = info.name;
     issuerWallet = getNodeWallet(info.sk);
     passportColor = 'default';
+    dataDir = path.join(node.dataDirs.data, NODE_DATA_DIR_NAME);
   } else if (TEAM_TYPES.BLOCKLET) {
     teamDid = req.headers['x-blocklet-did'];
     const blocklet = await node.getBlocklet({ did: teamDid, attachRuntimeInfo: false });
@@ -48,6 +52,7 @@ const getTeamInfo = async ({ type, node, req }) => {
     issuerName = getDisplayName(blocklet, true);
     issuerWallet = blockletInfo.wallet;
     passportColor = blockletInfo.passportColor;
+    dataDir = blocklet.env.dataDir;
   } else {
     throw new Error('createLostPassportListRoute: unknown type');
   }
@@ -58,6 +63,7 @@ const getTeamInfo = async ({ type, node, req }) => {
     issuerName,
     issuerWallet,
     passportColor,
+    dataDir,
   };
 };
 
@@ -89,7 +95,7 @@ const createLostPassportListRoute = ({ node, type }) => ({
   onAuth: async ({ userDid, extraParams, updateSession, req }) => {
     const { locale } = extraParams;
 
-    const { teamDid, issuerDid } = await getTeamInfo({ node, req, type });
+    const { teamDid, issuerDid, dataDir } = await getTeamInfo({ node, req, type });
 
     // check user approved
     const user = await getUser(node, teamDid, userDid);
@@ -122,6 +128,8 @@ const createLostPassportListRoute = ({ node, type }) => ({
 
     logger.info('get passport type list', { userDid });
 
+    user.avatar = await parseUserAvatar(user.avatar, { did: teamDid, dataDir });
+
     await updateSession({ user });
   },
 });
@@ -148,7 +156,11 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
         const { locale, passportName, receiverDid } = extraParams;
         checkWalletVersion({ didwallet, locale });
 
-        const { teamDid, issuerDid, issuerName, passportColor } = await getTeamInfo({ node, req: request, type });
+        const { teamDid, issuerDid, issuerName, passportColor, dataDir } = await getTeamInfo({
+          node,
+          req: request,
+          type,
+        });
         const user = await getUser(node, teamDid, receiverDid);
 
         const passport = await createPassport({
@@ -169,7 +181,7 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
               title: passport.title,
               issuerDid,
               ownerName: user.fullName || '',
-              ownerAvatarUrl: user.avatar || '',
+              ownerAvatarUrl: await parseUserAvatar(user.avatar || '', { dataDir }),
               preferredColor: passportColor,
             }),
           }),
@@ -181,7 +193,11 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
   onAuth: async ({ claims, userDid, userPk, extraParams, updateSession, baseUrl, req }) => {
     const { locale = 'en', receiverDid, passportName } = extraParams;
 
-    const { teamDid, issuerDid, issuerName, issuerWallet, passportColor } = await getTeamInfo({ node, req, type });
+    const { teamDid, issuerDid, issuerName, issuerWallet, passportColor, dataDir } = await getTeamInfo({
+      node,
+      req,
+      type,
+    });
     const statusEndpointBaseUrl = getStatusEndpointBaseUrl(type, baseUrl, authServicePrefix);
 
     // Verify signature
@@ -223,6 +239,8 @@ const createLostPassportIssueRoute = ({ node, type, authServicePrefix }) => ({
       );
     }
 
+    user.avatar = await parseUserAvatar(user.avatar, { dataDir });
+
     const vcParams = {
       issuerName,
       issuerWallet,

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

@@ -22,6 +22,8 @@ const createPassportSvg = ({
   ownerAvatarUrl = '',
   revoked,
   isDataUrl,
+  width = '100%',
+  height = '100%',
 } = {}) => {
   let colors;
   if (preferredColor === 'default') {
@@ -32,7 +34,7 @@ const createPassportSvg = ({
     colors = getNftBGColor(preferredColor);
   }
 
-  const svgXML = `<svg width="100%" height="100%" viewBox="0 0 424 564" fill="none" xmlns="http://www.w3.org/2000/svg">
+  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 >= 6) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.23",
+  "version": "1.7.26",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,16 +20,16 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.7.23",
-    "@abtnode/logger": "1.7.23",
-    "@abtnode/util": "1.7.23",
-    "@arcblock/did": "^1.16.15",
-    "@arcblock/vc": "^1.16.15",
-    "@blocklet/meta": "1.7.23",
-    "@ocap/client": "1.16.15",
-    "@ocap/mcrypto": "^1.16.15",
-    "@ocap/util": "^1.16.15",
-    "@ocap/wallet": "^1.16.15",
+    "@abtnode/constant": "1.7.26",
+    "@abtnode/logger": "1.7.26",
+    "@abtnode/util": "1.7.26",
+    "@arcblock/did": "1.17.0",
+    "@arcblock/vc": "1.17.0",
+    "@blocklet/meta": "1.7.26",
+    "@ocap/client": "1.17.0",
+    "@ocap/mcrypto": "1.17.0",
+    "@ocap/util": "1.17.0",
+    "@ocap/wallet": "1.17.0",
     "axios": "^0.27.2",
     "joi": "^17.6.0",
     "jsonwebtoken": "^8.5.1",
@@ -40,5 +40,5 @@
   "devDependencies": {
     "jest": "^27.4.5"
   },
-  "gitHead": "aa13838b7597bce11851d0b902575f861aa1ab34"
+  "gitHead": "b7ef9b4ddb18f7a0c3898177fe06d9cefe966566"
 }