@abtnode/blocklet-services 1.16.8-next-c66e39c7 → 1.16.8-next-199ae4cb

package/api/emails/components/asset.js

@@ -2,9 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
 const components_1 = require("@react-email/components");
+const chain_1 = require("../libs/chain");
 function Asset({ locale, data, }) {
     const title = { zh: '接收', en: 'Received' }[locale] || 'Received';
-    return ((0, jsx_runtime_1.jsxs)(components_1.Section, Object.assign({ style: assetStyle }, { children: [(0, jsx_runtime_1.jsxs)(components_1.Row, Object.assign({ style: titleStyle }, { children: [(0, jsx_runtime_1.jsx)(components_1.Column, { children: title }), (0, jsx_runtime_1.jsxs)(components_1.Column, Object.assign({ align: "right", style: summaryStyle }, { children: ["+", data.amount || 1, " Asset"] }))] })), (0, jsx_runtime_1.jsx)(components_1.Text, Object.assign({ style: remarkStyle }, { children: data.address }))] })));
+    const chainHost = data.chainHost || (0, chain_1.getChainHost)(data.chainId);
+    const url = `https://${chainHost}/explorer/assets/${data.did}`;
+    return ((0, jsx_runtime_1.jsxs)("a", Object.assign({ href: url, target: "_blank", style: Object.assign(Object.assign({}, assetStyle), { margin: '1em 0', textDecoration: 'none', color: 'initial', display: 'block' }) }, { children: [(0, jsx_runtime_1.jsxs)(components_1.Row, Object.assign({ style: titleStyle }, { children: [(0, jsx_runtime_1.jsx)(components_1.Column, { children: title }), (0, jsx_runtime_1.jsx)(components_1.Column, Object.assign({ align: "right", style: summaryStyle }, { children: "+1 Asset" }))] })), (0, jsx_runtime_1.jsx)(components_1.Text, Object.assign({ style: remarkStyle }, { children: data.did }))] })));
 }
 exports.default = Asset;
 const assetStyle = {

package/api/emails/components/attachments.js

@@ -32,10 +32,10 @@ function Attachments({ locale, severity = 'normal', attachments = [], }) {
             case 'divider':
                 return (0, jsx_runtime_1.jsx)(components_1.Hr, {});
             // case 'vc':
-            case 'nft':
-                return (0, jsx_runtime_1.jsx)(asset_1.default, { data: { address: item.data.did }, locale: locale });
+            case 'asset':
+                return (0, jsx_runtime_1.jsx)(asset_1.default, { data: item.data, locale: locale });
             case 'section':
-                return (0, jsx_runtime_1.jsx)(compose_1.default, { data: item.fileds });
+                return (0, jsx_runtime_1.jsx)(compose_1.default, { data: item.fields });
             default:
                 return null;
         }

package/api/emails/components/token.js

@@ -2,10 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
 const components_1 = require("@react-email/components");
+const chain_1 = require("../libs/chain");
 function Token({ locale, data, }) {
     const showAddress = data.address.slice(0, 4) + '...' + data.address.slice(-4);
+    const from = { zh: '来自', en: 'from' }[locale] || 'from';
     const title = { zh: '接收', en: 'Received' }[locale] || 'Received';
-    return ((0, jsx_runtime_1.jsxs)(components_1.Section, Object.assign({ style: assetStyle }, { children: [(0, jsx_runtime_1.jsxs)(components_1.Row, Object.assign({ style: titleStyle }, { children: [(0, jsx_runtime_1.jsx)(components_1.Column, { children: title }), (0, jsx_runtime_1.jsxs)(components_1.Column, Object.assign({ align: "right", style: summaryStyle }, { children: ["+", data.amount, " ", data.symbol] }))] })), (0, jsx_runtime_1.jsxs)(components_1.Text, Object.assign({ style: remarkStyle }, { children: ["from ", showAddress] }))] })));
+    const chainHost = data.chainHost || (0, chain_1.getChainHost)(data.chainId);
+    const url = `https://${chainHost}/explorer/tokens/${data.address}/tx`;
+    return ((0, jsx_runtime_1.jsxs)("a", Object.assign({ href: url, target: "_blank", style: Object.assign(Object.assign({}, assetStyle), { margin: '1em 0', textDecoration: 'none', color: 'initial', display: 'block' }) }, { children: [(0, jsx_runtime_1.jsxs)(components_1.Row, Object.assign({ style: titleStyle }, { children: [(0, jsx_runtime_1.jsx)(components_1.Column, { children: title }), (0, jsx_runtime_1.jsxs)(components_1.Column, Object.assign({ align: "right", style: summaryStyle }, { children: ["+", data.amount, " ", data.symbol] }))] })), (0, jsx_runtime_1.jsxs)(components_1.Text, Object.assign({ style: remarkStyle }, { children: [from, " ", showAddress] }))] })));
 }
 exports.default = Token;
 const assetStyle = {
@@ -24,7 +28,6 @@ const remarkStyle = {
 };
 const summaryStyle = {
     color: '#49c3ad',
-    // float: 'right',
 };
 const titleStyle = {
     marginBottom: '6px',

package/api/emails/components/transaction.js

@@ -1,16 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
+const chain_1 = require("../libs/chain");
 function Transaction({ locale, data, }) {
-    const chainMap = {
-        beta: 'beta.abtnetwork.io',
-        main: 'main.abtnetwork.io',
-    };
-    const host = 'explorer.arcblockio.cn';
-    const chianHost = chainMap[data.chainId] || host;
-    const url = `https://${chianHost}/explorer/txs/${data.hash}`;
+    const chainHost = (0, chain_1.getChainHost)(data.chainId);
+    const url = `https://${chainHost}/explorer/txs/${data.hash}`;
     const title = { zh: '交易详情', en: 'Transaction Details' }[locale] || 'Transaction Details';
     const subTitle = { zh: '交易哈希', en: 'Transaction Hash' }[locale] || 'Transaction Hash';
-    return ((0, jsx_runtime_1.jsxs)("a", Object.assign({ href: url, target: "_blank", style: { margin: '1em 0', textDecoration: 'none', color: 'initial' } }, { children: [(0, jsx_runtime_1.jsx)("h6", Object.assign({ style: { color: '#a5a5a5', margin: 0 } }, { children: host })), (0, jsx_runtime_1.jsx)("p", Object.assign({ style: { color: '#4598fa', margin: '6px 0' } }, { children: title })), (0, jsx_runtime_1.jsxs)("div", { children: [subTitle, ": ", data.hash] })] })));
+    return ((0, jsx_runtime_1.jsxs)("a", Object.assign({ href: url, target: "_blank", style: { margin: '1em 0', textDecoration: 'none', color: 'initial' } }, { children: [(0, jsx_runtime_1.jsx)("h6", Object.assign({ style: { color: '#a5a5a5', margin: 0 } }, { children: chainHost })), (0, jsx_runtime_1.jsx)("p", Object.assign({ style: { color: '#4598fa', margin: '6px 0' } }, { children: title })), (0, jsx_runtime_1.jsxs)("div", { children: [subTitle, ": ", data.hash] })] })));
 }
 exports.default = Transaction;

package/api/emails/libs/chain.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getChainHost = void 0;
+function getChainHost(chainId) {
+    const defaultHost = 'explorer.arcblockio.cn';
+    if (!chainId)
+        return defaultHost;
+    const chainMap = {
+        beta: 'beta.abtnetwork.io',
+        main: 'main.abtnetwork.io',
+    };
+    const chainHost = chainMap[chainId] || defaultHost;
+    return chainHost;
+}
+exports.getChainHost = getChainHost;

package/api/libs/connect/session.js

@@ -30,6 +30,7 @@ const {
   createPassportVC,
   createPassport,
   upsertToPassports,
+  getPassportClaimUrl,
 } = require('@abtnode/auth/lib/passport');
 const { getKeyPairClaim, getAuthPrincipalForMigrateAppToV2 } = require('@abtnode/auth/lib/server');
 const merge = require('lodash/merge');
@@ -131,7 +132,7 @@ const checkAppOwner = ({ role, blocklet, userDid, locale = 'en' }) => {
 
 module.exports = {
   login: {
-    onConnect: async ({ node, request, userDid, locale, passportId = '', componentId, action }) => {
+    onConnect: async ({ node, request, userDid, locale, passportId = '', componentId, action, baseUrl }) => {
       const blocklet = await request.getBlocklet();
       const config = await request.getServiceConfig(NODE_SERVICES.AUTH, { componentId });
       const { did: teamDid, wallet: blockletWallet } = await request.getBlockletInfo();
@@ -155,6 +156,7 @@ module.exports = {
           item: vcTypes,
           trustedIssuers,
           optional: !invitedUserOnly,
+          claimUrl: getPassportClaimUrl(baseUrl),
         };
         if (passportId) {
           claims.verifiableCredential.target = passportId;
@@ -499,7 +501,7 @@ module.exports = {
   },
 
   switchPassport: {
-    onConnect: async ({ node, request, locale, userDid, previousUserDid, componentId }) => {
+    onConnect: async ({ node, request, locale, userDid, previousUserDid, componentId, baseUrl }) => {
       if (userDid && previousUserDid && userDid !== previousUserDid) {
         throw new Error(messages.userMismatch[locale]);
       }
@@ -537,6 +539,7 @@ module.exports = {
           item: vcTypes,
           trustedIssuers,
           optional: !invitedUserOnly,
+          claimUrl: getPassportClaimUrl(baseUrl),
         },
       };
     },
@@ -828,7 +831,7 @@ module.exports = {
         authPrincipal: getAuthPrincipalForMigrateAppToV2(node),
       },
       {
-        verifiableCredential: async ({ extraParams: { locale }, context: { request } }) => {
+        verifiableCredential: async ({ extraParams: { locale }, context: { request, baseUrl } }) => {
           const blocklet = await request.getBlocklet();
           const { wallet } = await request.getBlockletInfo();
 
@@ -841,6 +844,7 @@ module.exports = {
             item: vcTypes,
             trustedIssuers,
             optional: false,
+            claimUrl: getPassportClaimUrl(baseUrl),
           };
         },
         keyPair: getKeyPairClaim(node, { declare: false }),

package/api/libs/email.js

@@ -13,7 +13,7 @@ const schemaEmail = Joi.string().email().required();
 
 const validateEmail = schemaEmail.validateAsync.bind(schemaEmail);
 
-async function sendEmail(receiver, notification, { teamDid, node }) {
+async function sendEmail(receiver, notification, { teamDid, node, locale }) {
   if (!receiver) {
     throw new Error('receiver is required');
   }
@@ -54,14 +54,18 @@ async function sendEmail(receiver, notification, { teamDid, node }) {
     url,
   };
 
-  // TODO: @zhanghan notification 目前并没有 locale 信息，无法实现多 locale 提示
-  const subject = `[${appInfo.title}] ${notification.title || 'You have received a notification'}`;
+  const subject = `[${appInfo.title}] ${
+    notification.title ||
+    { zh: '您收到了一个通知', en: 'You have received a notification' }[locale] ||
+    'You have received a notification'
+  }`;
 
   const html = render(
     NotificationEmail({
       subject,
       ...notification,
       appInfo,
+      locale,
     })
   );
   const emailData = {

package/api/routes/blocklet.js

@@ -203,7 +203,7 @@ module.exports = {
             node,
             teamDid,
             locale,
-            endpoint: (extra || {}).baseUrl,
+            endpoint: baseUrl,
           }),
           endpoint: getPassportStatusEndpoint({
             baseUrl: joinUrl(baseUrl, WELLKNOWN_SERVICE_PATH_PREFIX),

package/api/services/auth/connect/login.js

@@ -7,8 +7,8 @@ const { onConnect, onApprove } = login;
 module.exports = function createRoutes(node, authenticator, createSessionToken) {
   return {
     action: 'login',
-    onConnect: async ({ req, userDid, extraParams: { locale, passportId = '', componentId } }) => {
-      return onConnect({ node, request: req, userDid, locale, passportId, componentId, action: 'login' });
+    onConnect: async ({ req, userDid, extraParams: { locale, passportId = '', componentId }, baseUrl }) => {
+      return onConnect({ node, request: req, userDid, locale, passportId, componentId, action: 'login', baseUrl });
     },
 
     onAuth: async ({

package/api/services/auth/connect/setup.js

@@ -68,7 +68,6 @@ module.exports = function createRoutes(node, _authenticator, createSessionToken)
               locale,
               lastLoginAt: new Date().toISOString(),
               lastLoginIp: get(req, 'headers[x-real-ip]') || '',
-              // FIXME: @linchen this temporary field should not be recorded in user state
               extra: {
                 baseUrl,
               },

package/api/services/auth/connect/switch-passport.js

@@ -5,13 +5,14 @@ const { onConnect, onApprove } = switchPassport;
 module.exports = function createRoutes(node, authenticator, createSessionToken) {
   return {
     action: 'switch-passport',
-    onConnect: async ({ req, userDid, extraParams: { locale, connectedDid } }) => {
+    onConnect: async ({ req, userDid, baseUrl, extraParams: { locale, connectedDid } }) => {
       return onConnect({
         node,
         request: req,
         locale,
         userDid,
         previousUserDid: connectedDid,
+        baseUrl,
       });
     },
 

package/api/services/auth/index.js

@@ -11,9 +11,6 @@ const {
   WHO_CAN_ACCESS,
   WHO_CAN_ACCESS_PREFIX_ROLES,
   ROLES,
-  WELLKNOWN_SERVICE_PATH_PREFIX,
-  USER_AVATAR_URL_PREFIX,
-  USER_AVATAR_PATH_PREFIX,
 } = require('@abtnode/constant');
 const { BLOCKLET_MODES } = require('@blocklet/constant');
 const { setUserInfoHeaders } = require('@abtnode/auth/lib/auth');
@@ -70,13 +67,8 @@ const init = ({ node, options }) => {
       if (token) {
         const teamDid = req.getBlockletDid();
         const { secret } = await req.getBlockletInfo();
-        const result = await verifySessionToken(token, secret, teamDid);
-        if (result && result.avatar && result.avatar.startsWith(USER_AVATAR_URL_PREFIX)) {
-          result.avatar = `${WELLKNOWN_SERVICE_PATH_PREFIX}${USER_AVATAR_PATH_PREFIX}/${
-            result.avatar.split('/').slice(-1)[0]
-          }`;
-        }
-        req.user = result;
+        const user = await verifySessionToken(token, secret, teamDid);
+        req.user = user;
       }
     } catch {
       // Do nothing

package/api/services/auth/session.js

@@ -1,6 +1,7 @@
 const nocache = require('nocache');
 const SealedBox = require('tweetnacl-sealedbox-js');
 const { decodeEncryptionKey } = require('@abtnode/util/lib/security');
+const { WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_URL_PREFIX, USER_AVATAR_PATH_PREFIX } = require('@abtnode/constant');
 
 const { PREFIXES } = require('../../util/constants');
 
@@ -24,6 +25,12 @@ module.exports = {
           user.role = req.user.role;
         }
 
+        if (user.avatar && user.avatar.startsWith(USER_AVATAR_URL_PREFIX)) {
+          user.avatar = `${WELLKNOWN_SERVICE_PATH_PREFIX}${USER_AVATAR_PATH_PREFIX}/${
+            user.avatar.split('/').slice(-1)[0]
+          }`;
+        }
+
         const encKey = '_ek_';
         let nextToken = '';
         if (req.query[encKey]) {

package/api/socket/channel/did.js

@@ -58,7 +58,10 @@ const sendToDid = async ({ sender, receiver: rawDid, notification, options, node
     if (receiverEmail) {
       try {
         await validateEmail(receiverEmail);
-        receiverEmailList.push(receiverEmail);
+        receiverEmailList.push({
+          email: receiverEmail,
+          locale: userInfoItem?.locale || 'en',
+        });
       } catch {
         /* empty */
       }
@@ -94,9 +97,11 @@ const sendToDid = async ({ sender, receiver: rawDid, notification, options, node
     // NOTICE: 目前只有 notification 的通知能够发送邮件，并且 type 可能为 undefined
     if ([undefined, NOTIFICATION_TYPES.NOTIFICATION].includes(data.type)) {
       for (const receiverEmail of receiverEmailList) {
-        sendEmail(receiverEmail, data, { teamDid: sender.appDid, node }).catch((error) => {
-          logger.error('Failed to send email', { error });
-        });
+        sendEmail(receiverEmail.email, data, { teamDid: sender.appDid, node, locale: receiverEmail.locale }).catch(
+          (error) => {
+            logger.error('Failed to send email', { error });
+          }
+        );
       }
     }
   });

package/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css",
-    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.2fbec507.js",
+    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.fa5222a7.js",
     "static/js/716.0d2a2d32.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/716.0d2a2d32.chunk.js",
     "static/js/359.c47779c2.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/359.c47779c2.chunk.js",
     "static/js/255.279b1bca.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/255.279b1bca.chunk.js",
@@ -10,7 +10,7 @@
     "static/js/460.df719a3e.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/460.df719a3e.chunk.js",
     "static/js/868.ac8df3a0.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/868.ac8df3a0.chunk.js",
     "static/js/547.03d5d719.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/547.03d5d719.chunk.js",
-    "static/js/343.f1104d63.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/343.f1104d63.chunk.js",
+    "static/js/343.7d02e7f8.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/343.7d02e7f8.chunk.js",
     "static/js/682.a8bf723a.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/682.a8bf723a.chunk.js",
     "static/js/711.56427a24.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/711.56427a24.chunk.js",
     "static/js/437.075e8453.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/437.075e8453.chunk.js",
@@ -45,7 +45,7 @@
     "router-template-styles/styles.css": "/.blocklet/proxy/blocklet-service/router-template-styles/styles.css",
     "index.html": "/.blocklet/proxy/blocklet-service/index.html",
     "main.632501d5.css.map": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css.map",
-    "main.2fbec507.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.2fbec507.js.map",
+    "main.fa5222a7.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.fa5222a7.js.map",
     "716.0d2a2d32.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/716.0d2a2d32.chunk.js.map",
     "359.c47779c2.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/359.c47779c2.chunk.js.map",
     "255.279b1bca.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/255.279b1bca.chunk.js.map",
@@ -54,7 +54,7 @@
     "460.df719a3e.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/460.df719a3e.chunk.js.map",
     "868.ac8df3a0.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/868.ac8df3a0.chunk.js.map",
     "547.03d5d719.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/547.03d5d719.chunk.js.map",
-    "343.f1104d63.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/343.f1104d63.chunk.js.map",
+    "343.7d02e7f8.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/343.7d02e7f8.chunk.js.map",
     "682.a8bf723a.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/682.a8bf723a.chunk.js.map",
     "711.56427a24.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/711.56427a24.chunk.js.map",
     "437.075e8453.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/437.075e8453.chunk.js.map",
@@ -70,6 +70,6 @@
   },
   "entrypoints": [
     "static/css/main.632501d5.css",
-    "static/js/main.2fbec507.js"
+    "static/js/main.fa5222a7.js"
   ]
 }

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><script src=".well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.2fbec507.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><script src=".well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.fa5222a7.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>