@abtnode/blocklet-services 1.16.33-beta-20241029-115916-f749f0cc → 1.16.33-beta-20241030-102817-90ad7cd5

package/api/emails/components/actions.js

@@ -2,22 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
 const components_1 = require("@react-email/components");
+const style_1 = require("../libs/style");
 function Actions({ actions, }) {
-    return ((0, jsx_runtime_1.jsx)(components_1.Section, { style: actionsStye, children: actions.map((item) => ((0, jsx_runtime_1.jsx)(components_1.Button, { href: item.link, target: "_blank", pX: 12, pY: 6, style: actionStyle, children: item.title || item.name }))) }));
+    return ((0, jsx_runtime_1.jsx)(components_1.Section, { style: style_1.actionsStyle, children: actions.map((item) => ((0, jsx_runtime_1.jsx)(components_1.Button, { href: item.link, target: "_blank", pX: 12, pY: 6, style: style_1.actionStyle, children: item.title || item.name }))) }));
 }
 exports.default = Actions;
-const actionsStye = {
-    margin: '20px -8px 0px',
-};
-const actionStyle = {
-    color: '#4598fa',
-    fontSize: 14,
-    border: '1px solid #4598fa',
-    display: 'inline-block',
-    borderRadius: '4px',
-    margin: '8px',
-    marginTop: '8px',
-    marginBottom: '8px',
-    marginLeft: '8px',
-    marginRight: '8px',
-};

package/api/emails/components/asset.js

@@ -3,31 +3,11 @@ 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");
+const style_1 = require("../libs/style");
 function Asset({ locale, data, }) {
     const title = { zh: '接收', en: 'Received' }[locale] || 'Received';
     const chainHost = (0, chain_1.getUrlHost)(data.chainHost) || (0, chain_1.getChainHost)(data.chainId);
     const url = `https://${chainHost}/explorer/assets/${data.did}`;
-    return ((0, jsx_runtime_1.jsxs)("a", { 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, { style: titleStyle, children: [(0, jsx_runtime_1.jsx)(components_1.Column, { children: title }), (0, jsx_runtime_1.jsx)(components_1.Column, { align: "right", style: summaryStyle, children: "+1 Asset" })] }), (0, jsx_runtime_1.jsx)(components_1.Text, { style: remarkStyle, children: data.did })] }));
+    return ((0, jsx_runtime_1.jsxs)("a", { href: url, target: "_blank", style: Object.assign(Object.assign({}, style_1.assetStyle), { margin: '1em 0', textDecoration: 'none', color: 'initial', display: 'block' }), children: [(0, jsx_runtime_1.jsxs)(components_1.Row, { style: style_1.titleStyle, children: [(0, jsx_runtime_1.jsx)(components_1.Column, { children: title }), (0, jsx_runtime_1.jsx)(components_1.Column, { align: "right", style: style_1.summaryStyle, children: "+1 Asset" })] }), (0, jsx_runtime_1.jsx)(components_1.Text, { style: style_1.remarkStyle, children: data.did })] }));
 }
 exports.default = Asset;
-const assetStyle = {
-    backgroundColor: '#f6f6f6',
-    borderRadius: '8px',
-    paddingLeft: '12px',
-    paddingRight: '12px',
-    paddingTop: '12px',
-    paddingBottom: '12px',
-    margin: '1em 0',
-};
-const remarkStyle = {
-    color: '#9397a1',
-    fontSize: '12px',
-    margin: 0,
-    whiteSpace: 'pre-line!important',
-};
-const summaryStyle = {
-    color: '#49c3ad',
-};
-const titleStyle = {
-    marginBottom: '6px',
-};

package/api/emails/components/attachments.js

@@ -11,6 +11,7 @@ const compose_1 = __importDefault(require("./compose"));
 const transaction_1 = __importDefault(require("./transaction"));
 const dapp_1 = __importDefault(require("./dapp"));
 const article_1 = __importDefault(require("./article"));
+const style_1 = require("../libs/style");
 function Attachments({ locale, severity = 'normal', attachments = [], }) {
     const attachmentList = attachments.map((item) => {
         switch (item.type) {
@@ -37,7 +38,7 @@ function Attachments({ locale, severity = 'normal', attachments = [], }) {
                 return (0, jsx_runtime_1.jsx)(article_1.default, { data: item.data });
             case 'divider':
                 return (0, jsx_runtime_1.jsx)(components_1.Hr, {});
-            // case 'vc':
+            case 'vc':
             case 'asset':
                 return (0, jsx_runtime_1.jsx)(asset_1.default, { data: item.data, locale: locale });
             case 'section':
@@ -46,16 +47,6 @@ function Attachments({ locale, severity = 'normal', attachments = [], }) {
                 return null;
         }
     });
-    return (0, jsx_runtime_1.jsx)(components_1.Section, { style: Object.assign(Object.assign({}, attachmentsStyle), { borderColor: map[severity] || map.normal }), children: attachmentList });
+    return ((0, jsx_runtime_1.jsx)(components_1.Section, { style: Object.assign(Object.assign({}, style_1.attachmentsStyle), { borderColor: style_1.severityColorMap[severity] || style_1.severityColorMap.normal }), children: attachmentList }));
 }
 exports.default = Attachments;
-const map = {
-    normal: '#C4C5CA',
-    success: '#25C99B',
-    error: '#F16E6E',
-    warning: '#DE9E37',
-};
-const attachmentsStyle = {
-    borderLeft: '2px solid transparent',
-    paddingLeft: '20px',
-};

package/api/emails/components/content.js

@@ -8,15 +8,8 @@ const components_1 = require("@react-email/components");
 const attachments_1 = __importDefault(require("./attachments"));
 const actions_1 = __importDefault(require("./actions"));
 const highlight_1 = require("../libs/highlight");
+const style_1 = require("../libs/style");
 function Content({ title, content, attachments = [], actions = [], style = {}, locale, raw = false, severity = 'normal', }) {
-    return ((0, jsx_runtime_1.jsxs)(components_1.Section, { style: style, children: [(0, jsx_runtime_1.jsx)(components_1.Heading, { style: h1, children: title }), content && ((0, jsx_runtime_1.jsx)(components_1.Text, { className: "content", style: { whiteSpace: 'pre-line!important' }, dangerouslySetInnerHTML: { __html: raw ? content : (0, highlight_1.toClickableSpan)(content) } })), (0, jsx_runtime_1.jsx)(attachments_1.default, { severity: severity, attachments: attachments, locale: locale }), (0, jsx_runtime_1.jsx)(actions_1.default, { actions: actions })] }));
+    return ((0, jsx_runtime_1.jsxs)(components_1.Section, { style: style, children: [(0, jsx_runtime_1.jsx)(components_1.Heading, { style: style_1.h1Style, children: title }), content && ((0, jsx_runtime_1.jsx)(components_1.Text, { className: "content", style: { whiteSpace: 'pre-line!important' }, dangerouslySetInnerHTML: { __html: raw ? content : (0, highlight_1.toClickableSpan)(content) } })), (0, jsx_runtime_1.jsx)(attachments_1.default, { severity: severity, attachments: attachments, locale: locale }), (0, jsx_runtime_1.jsx)(actions_1.default, { actions: actions })] }));
 }
 exports.default = Content;
-const h1 = {
-    color: '#333',
-    fontFamily: "-apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif",
-    fontSize: '24px',
-    fontWeight: 'bold',
-    margin: '40px 0',
-    padding: '0',
-};

package/api/emails/components/copyright.js

@@ -11,6 +11,7 @@ function Copyright() {
             textAlign: 'center',
             color: '#898989',
             fontSize: 12,
+            margin: 0,
         }, children: ["\u00A9 ", startYear, "-", endYear, " ", constant_1.COPYRIGHT_OWNER, " All Rights Reserved."] }));
 }
 exports.default = Copyright;

package/api/emails/components/footer.js

@@ -9,7 +9,9 @@ const components_1 = require("@react-email/components");
 // @ts-ignore
 const constant_1 = require("@abtnode/constant");
 const copyright_1 = __importDefault(require("./copyright"));
-function Footer({ showLogo = false, showCopyright = false, showBlocklet = true, appInfo, locale = 'en', unsubscribeToken, userInfo, }) {
+const powered_by_1 = __importDefault(require("./powered-by"));
+const style_1 = require("../libs/style");
+function Footer({ showLogo = false, showCopyright = false, showBlocklet = true, appInfo, locale = 'en', unsubscribeToken, userInfo, poweredBy, }) {
     const userInfoName = (userInfo === null || userInfo === void 0 ? void 0 : userInfo.fullName) || (userInfo === null || userInfo === void 0 ? void 0 : userInfo.email);
     const userInfoDescription = userInfo === null || userInfo === void 0 ? void 0 : userInfo.did;
     let userInfoContent = userInfoName;
@@ -21,23 +23,10 @@ function Footer({ showLogo = false, showCopyright = false, showBlocklet = true,
             return null;
         }
         if (locale === 'zh') {
-            return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("br", {}), "\u8FD9\u5C01\u90AE\u4EF6\u7531\u7CFB\u7EDF\u53D1\u9001\u7ED9 ", userInfoContent, "\u3002", unsubscribeToken ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["\u5982\u679C\u60A8\u4E0D\u60F3\u518D\u6536\u5230\u6B64\u7C7B\u90AE\u4EF6\uFF0C\u60A8\u53EF\u4EE5", ' ', (0, jsx_runtime_1.jsx)(components_1.Link, { href: (0, ufo_1.joinURL)(appInfo.url, constant_1.WELLKNOWN_SERVICE_PATH_PREFIX, `/user/unsubscribe?token=${unsubscribeToken}`), style: Object.assign(Object.assign({}, link), { color: '#898989', fontSize: '12px' }), target: "_blank", children: "\u9000\u8BA2" })] })) : null] }));
+            return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("br", {}), "\u8FD9\u5C01\u90AE\u4EF6\u7531\u7CFB\u7EDF\u53D1\u9001\u7ED9 ", userInfoContent, "\u3002", unsubscribeToken ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["\u5982\u679C\u60A8\u4E0D\u60F3\u518D\u6536\u5230\u6B64\u7C7B\u90AE\u4EF6\uFF0C\u60A8\u53EF\u4EE5", ' ', (0, jsx_runtime_1.jsx)(components_1.Link, { href: (0, ufo_1.joinURL)(appInfo.url, constant_1.WELLKNOWN_SERVICE_PATH_PREFIX, `/user/unsubscribe?token=${unsubscribeToken}`), style: Object.assign(Object.assign({}, style_1.linkStyle), { color: '#898989', fontSize: '12px' }), target: "_blank", children: "\u9000\u8BA2" })] })) : null] }));
         }
-        return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("br", {}), "This email was sent to ", userInfoContent, " .", ' ', unsubscribeToken ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["If you'd rather not receive this kind of email, you can", ' ', (0, jsx_runtime_1.jsx)(components_1.Link, { href: (0, ufo_1.joinURL)(appInfo.url, constant_1.WELLKNOWN_SERVICE_PATH_PREFIX, `/user/unsubscribe?token=${unsubscribeToken}`), style: Object.assign(Object.assign({}, link), { color: '#898989', fontSize: '12px' }), target: "_blank", children: "unsubscribe" })] })) : null] }));
+        return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)("br", {}), "This email was sent to ", userInfoContent, " .", ' ', unsubscribeToken ? ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["If you'd rather not receive this kind of email, you can", ' ', (0, jsx_runtime_1.jsx)(components_1.Link, { href: (0, ufo_1.joinURL)(appInfo.url, constant_1.WELLKNOWN_SERVICE_PATH_PREFIX, `/user/unsubscribe?token=${unsubscribeToken}`), style: Object.assign(Object.assign({}, style_1.linkStyle), { color: '#898989', fontSize: '12px' }), target: "_blank", children: "unsubscribe" })] })) : null] }));
     }
-    return ((0, jsx_runtime_1.jsxs)(components_1.Section, { children: [showLogo && (0, jsx_runtime_1.jsx)(components_1.Img, { src: appInfo.logo, width: "32", height: "32", alt: appInfo.title }), showBlocklet && ((0, jsx_runtime_1.jsxs)(components_1.Text, { style: footer, children: [(0, jsx_runtime_1.jsx)(components_1.Link, { href: appInfo.url, target: "_blank", style: Object.assign(Object.assign({}, link), { color: '#898989' }), children: appInfo.title }), (0, jsx_runtime_1.jsx)(UnsubscribeContent, {})] })), showCopyright && (0, jsx_runtime_1.jsx)(copyright_1.default, {})] }));
+    return ((0, jsx_runtime_1.jsxs)(components_1.Section, { children: [showLogo && (0, jsx_runtime_1.jsx)(components_1.Img, { src: appInfo.logo, width: "32", height: "32", alt: appInfo.title }), showBlocklet && ((0, jsx_runtime_1.jsxs)(components_1.Text, { style: style_1.footerStyle, children: [(0, jsx_runtime_1.jsx)(components_1.Link, { href: appInfo.url, target: "_blank", style: Object.assign(Object.assign({}, style_1.linkStyle), { color: '#898989' }), children: appInfo.title }), (0, jsx_runtime_1.jsx)(UnsubscribeContent, {})] })), (0, jsx_runtime_1.jsx)(components_1.Text, { style: { margin: '8px 0' } }), poweredBy && (0, jsx_runtime_1.jsx)(powered_by_1.default, Object.assign({}, poweredBy)), showCopyright && (0, jsx_runtime_1.jsx)(copyright_1.default, {})] }));
 }
 exports.default = Footer;
-const footer = {
-    color: '#898989',
-    fontFamily: "-apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif",
-    fontSize: '12px',
-    lineHeight: '22px',
-    margin: 0,
-};
-const link = {
-    color: '#2754C5',
-    fontFamily: "-apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif",
-    fontSize: '14px',
-    textDecoration: 'underline',
-};

package/api/emails/components/layout.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("react/jsx-runtime");
 const components_1 = require("@react-email/components");
 function Layout({ children, mainStyle = {}, containerStyle = {}, subject, }) {
-    return ((0, jsx_runtime_1.jsxs)(components_1.Html, { children: [(0, jsx_runtime_1.jsx)(components_1.Head, { children: subject && (0, jsx_runtime_1.jsx)("title", { children: subject }) }), (0, jsx_runtime_1.jsx)(components_1.Body, { style: Object.assign(Object.assign({}, main), mainStyle), children: (0, jsx_runtime_1.jsx)("div", { style: Object.assign(Object.assign({}, main), mainStyle), children: (0, jsx_runtime_1.jsx)("div", { style: { padding: '30px 20px' }, children: (0, jsx_runtime_1.jsx)(components_1.Container, { style: Object.assign(Object.assign({}, container), containerStyle), children: (0, jsx_runtime_1.jsx)("div", { children: children }) }) }) }) })] }));
+    return ((0, jsx_runtime_1.jsxs)(components_1.Html, { children: [(0, jsx_runtime_1.jsx)(components_1.Head, { children: subject && (0, jsx_runtime_1.jsx)("title", { children: subject }) }), (0, jsx_runtime_1.jsx)(components_1.Body, { style: Object.assign(Object.assign({}, _mainStyle), mainStyle), children: (0, jsx_runtime_1.jsx)("div", { style: Object.assign(Object.assign({}, _mainStyle), mainStyle), children: (0, jsx_runtime_1.jsx)("div", { style: { padding: '30px 20px' }, children: (0, jsx_runtime_1.jsx)(components_1.Container, { style: Object.assign(Object.assign({}, _containerStyle), containerStyle), children: (0, jsx_runtime_1.jsx)("div", { children: children }) }) }) }) })] }));
 }
 exports.default = Layout;
-const main = {
+const _mainStyle = {
     backgroundColor: '#f2f2f2',
 };
-const container = {
+const _containerStyle = {
     margin: '0 auto',
     maxWidth: '50em',
 };

package/api/emails/components/powered-by.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const jsx_runtime_1 = require("react/jsx-runtime");
+const components_1 = require("@react-email/components");
+const style_1 = require("../libs/style");
+function PoweredBy(props) {
+    const content = props.url ? ((0, jsx_runtime_1.jsx)(components_1.Link, { href: props.url, target: "_blank", style: Object.assign(Object.assign({}, style_1.linkStyle), { color: '#898989' }), children: props.name })) : (props.name);
+    return ((0, jsx_runtime_1.jsxs)(components_1.Text, { style: {
+            textAlign: 'center',
+            color: '#898989',
+            fontSize: 12,
+            margin: 0,
+        }, children: ["Powered by ", content] }));
+}
+exports.default = PoweredBy;

package/api/emails/components/token.js

@@ -3,33 +3,13 @@ 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");
+const style_1 = require("../libs/style");
 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';
     const chainHost = (0, chain_1.getUrlHost)(data.chainHost) || (0, chain_1.getChainHost)(data.chainId);
     const url = `https://${chainHost}/explorer/tokens/${data.address}/tx`;
-    return ((0, jsx_runtime_1.jsxs)("a", { 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, { style: titleStyle, children: [(0, jsx_runtime_1.jsx)(components_1.Column, { children: title }), (0, jsx_runtime_1.jsxs)(components_1.Column, { align: "right", style: summaryStyle, children: ["+", data.amount, " ", data.symbol] })] }), (0, jsx_runtime_1.jsxs)(components_1.Text, { style: remarkStyle, children: [from, " ", showAddress] })] }));
+    return ((0, jsx_runtime_1.jsxs)("a", { href: url, target: "_blank", style: Object.assign(Object.assign({}, style_1.assetStyle), { margin: '1em 0', textDecoration: 'none', color: 'initial', display: 'block' }), children: [(0, jsx_runtime_1.jsxs)(components_1.Row, { style: style_1.titleStyle, children: [(0, jsx_runtime_1.jsx)(components_1.Column, { children: title }), (0, jsx_runtime_1.jsxs)(components_1.Column, { align: "right", style: style_1.summaryStyle, children: ["+", data.amount, " ", data.symbol] })] }), (0, jsx_runtime_1.jsxs)(components_1.Text, { style: style_1.remarkStyle, children: [from, " ", showAddress] })] }));
 }
 exports.default = Token;
-const assetStyle = {
-    backgroundColor: '#f6f6f6',
-    borderRadius: '8px',
-    paddingLeft: '12px',
-    paddingRight: '12px',
-    paddingTop: '12px',
-    paddingBottom: '12px',
-    margin: '1em 0',
-};
-const remarkStyle = {
-    color: '#9397a1',
-    fontSize: '12px',
-    margin: 0,
-    whiteSpace: 'pre-line!important',
-};
-const summaryStyle = {
-    color: '#49c3ad',
-};
-const titleStyle = {
-    marginBottom: '6px',
-};

package/api/emails/libs/style.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.footerStyle = exports.h1Style = exports.attachmentsStyle = exports.severityColorMap = exports.titleStyle = exports.summaryStyle = exports.remarkStyle = exports.assetStyle = exports.actionStyle = exports.actionsStyle = exports.linkStyle = void 0;
+exports.linkStyle = {
+    color: '#2754C5',
+    fontFamily: "-apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif",
+    fontSize: '14px',
+    textDecoration: 'underline',
+};
+exports.actionsStyle = {
+    margin: '20px -8px 0px',
+};
+exports.actionStyle = {
+    color: '#4598fa',
+    fontSize: 14,
+    border: '1px solid #4598fa',
+    display: 'inline-block',
+    borderRadius: '4px',
+    margin: '8px',
+    marginTop: '8px',
+    marginBottom: '8px',
+    marginLeft: '8px',
+    marginRight: '8px',
+};
+exports.assetStyle = {
+    backgroundColor: '#f6f6f6',
+    borderRadius: '8px',
+    paddingLeft: '12px',
+    paddingRight: '12px',
+    paddingTop: '12px',
+    paddingBottom: '12px',
+    margin: '1em 0',
+};
+exports.remarkStyle = {
+    color: '#9397a1',
+    fontSize: '12px',
+    margin: 0,
+    whiteSpace: 'pre-line!important',
+};
+exports.summaryStyle = {
+    color: '#49c3ad',
+};
+exports.titleStyle = {
+    marginBottom: '6px',
+};
+exports.severityColorMap = {
+    normal: '#C4C5CA',
+    success: '#25C99B',
+    error: '#F16E6E',
+    warning: '#DE9E37',
+};
+exports.attachmentsStyle = {
+    borderLeft: '2px solid transparent',
+    paddingLeft: '20px',
+};
+exports.h1Style = {
+    color: '#333',
+    fontFamily: "-apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif",
+    fontSize: '24px',
+    fontWeight: 'bold',
+    margin: '40px 0',
+    padding: '0',
+};
+exports.footerStyle = {
+    color: '#898989',
+    fontFamily: "-apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif",
+    fontSize: '12px',
+    lineHeight: '22px',
+    margin: 0,
+};

package/api/emails/pages/notification.js

@@ -11,8 +11,8 @@ const content_1 = __importDefault(require("../components/content"));
 const layout_1 = __importDefault(require("../components/layout"));
 const header_1 = __importDefault(require("../components/header"));
 const NotificationEmail = ({ title, body = '', raw = false, // do not convert body to clickable span
-subject, attachments = [], actions = [], appInfo, locale = 'en', severity = 'normal', unsubscribeToken, userInfo, }) => {
-    return ((0, jsx_runtime_1.jsxs)(layout_1.default, { mainStyle: main, subject: subject, children: [(0, jsx_runtime_1.jsx)(components_1.Preview, { children: subject }), (0, jsx_runtime_1.jsx)(header_1.default, { appInfo: appInfo }), (0, jsx_runtime_1.jsx)(content_1.default, { style: container, title: title, content: body, attachments: attachments, actions: actions, locale: locale, severity: severity, raw: raw }), (0, jsx_runtime_1.jsx)(footer_1.default, { showCopyright: false, showBlocklet: true, appInfo: appInfo, locale: locale, unsubscribeToken: unsubscribeToken, userInfo: userInfo })] }));
+subject, attachments = [], actions = [], appInfo, locale = 'en', severity = 'normal', unsubscribeToken, userInfo, poweredBy, }) => {
+    return ((0, jsx_runtime_1.jsxs)(layout_1.default, { mainStyle: main, subject: subject, children: [(0, jsx_runtime_1.jsx)(components_1.Preview, { children: subject }), (0, jsx_runtime_1.jsx)(header_1.default, { appInfo: appInfo }), (0, jsx_runtime_1.jsx)(content_1.default, { style: container, title: title, content: body, attachments: attachments, actions: actions, locale: locale, severity: severity, raw: raw }), (0, jsx_runtime_1.jsx)(footer_1.default, { showCopyright: false, poweredBy: poweredBy, showBlocklet: true, appInfo: appInfo, locale: locale, unsubscribeToken: unsubscribeToken, userInfo: userInfo })] }));
 };
 exports.NotificationEmail = NotificationEmail;
 exports.default = exports.NotificationEmail;

package/api/index.js

@@ -274,13 +274,15 @@ module.exports = function createServer(node, serverOptions = {}) {
       config = await patchCors(config, { node, blocklet });
       config = cleanConfigOverride(config, req);
 
-      // HACK: 如果是 * ，需要转换为字符串来使用
-      if (config.origin?.join('') === '*') {
+      // origin 如果要使用 *，必须只能设置为 *
+      if (Array.isArray(config.origin) && config.origin.includes('*')) {
         config.origin = '*';
       }
+      // HACK: 如果是 * ，需要转换为字符串来使用
       if (config.allowedHeaders?.join('') === '*') {
         config.allowedHeaders = '*';
       }
+      // HACK: 如果是 * ，需要转换为字符串来使用
       if (config.exposedHeaders?.join('') === '*') {
         config.exposedHeaders = '*';
       }

package/api/libs/connect/session.js

@@ -396,7 +396,7 @@ module.exports = {
           issuerName: name,
           issuerWallet: wallet,
           issuerAvatarUrl: getAppAvatarUrl(baseUrl),
-          ownerDid: realDid,
+          ownerDid: userDid,
           ...(await createPassport({
             name: defaultRole,
             node,
@@ -568,7 +568,7 @@ module.exports = {
           .then(() => {
             node.syncUserSession({
               teamDid,
-              userDid: realDid,
+              userDid: userSessionDoc.userDid,
               visitorId: userSessionDoc.visitorId,
               passportId: passport?.id,
               targetAppPid: sourceAppPid,

package/api/libs/email.js

@@ -45,7 +45,7 @@ async function sendEmail(
   const info = getBlockletInfo(blocklet);
   const logo = `${info.appUrl}/.well-known/service/blocklet/logo-rect?imageFilter=convert&f=png`;
 
-  const appInfo = {
+  const appInfo = notification.appInfo || {
     logo,
     description: info.description,
     title: info.name,
@@ -62,8 +62,8 @@ async function sendEmail(
   const html = render(
     NotificationEmail({
       subject,
-      ...notification,
       appInfo,
+      ...notification,
       locale,
       raw,
       unsubscribeToken,

package/api/routes/oauth.js

@@ -345,7 +345,7 @@ async function login(req, node, options) {
       .then(() => {
         node.syncUserSession({
           teamDid,
-          userDid: currentUser.did,
+          userDid: userSessionDoc.userDid,
           visitorId: userSessionDoc.visitorId,
           passportId: passport?.id,
           targetAppPid: sourceAppPid,
@@ -557,7 +557,7 @@ async function invite(req, node, options) {
       .then(() => {
         node.syncUserSession({
           teamDid,
-          userDid,
+          userDid: userSessionDoc.userDid,
           visitorId: userSessionDoc.visitorId,
           passportId: passport?.id,
           targetAppPid: sourceAppPid,

package/api/routes/user.js

@@ -16,6 +16,7 @@ const { getWallet } = require('@blocklet/meta/lib/did-utils');
 const { Joi } = require('@arcblock/validator');
 const { parse } = require('@abtnode/core/lib/util/ua');
 const getRequestIP = require('@abtnode/util/lib/get-request-ip');
+const formatError = require('@abtnode/util/lib/format-error');
 
 const { checkInvitedUserOnly, createTokenFn, getDidConnectVersion } = require('../util');
 const initJwt = require('../libs/jwt');
@@ -331,7 +332,7 @@ async function login(req, node, options) {
   });
   node.syncUserSession({
     teamDid,
-    userDid: userDoc.did,
+    userDid: userSession.userDid,
     visitorId: userSession.visitorId,
     passportId: passport?.id,
     targetAppPid: sourceAppPid,
@@ -550,7 +551,7 @@ module.exports = {
       });
       node.syncUserSession({
         teamDid,
-        userDid,
+        userDid: userSession.userDid,
         visitorId: userSession.visitorId,
         passportId,
         targetAppPid: sourceAppPid,
@@ -873,5 +874,64 @@ module.exports = {
       }
       res.json(pick(user, ['avatar', 'did', 'fullName', 'sourceAppPid', 'createdAt']));
     });
+
+    // 支持用户更新 DID Space 信息
+    server.put(`${prefixApi}/updateDidSpace`, checkUser, ensureBlocklet(), async (req, res) => {
+      try {
+        const spaceGatewaySchema = Joi.object({
+          did: Joi.string().required(),
+          name: Joi.string().required(),
+          url: Joi.string().required(),
+          endpoint: Joi.string().required(),
+        });
+        const { error, value } = spaceGatewaySchema.validate(req.body.spaceGateway);
+
+        if (error) {
+          console.error(error);
+          res.status(400).send(error.message);
+          return;
+        }
+
+        const { blocklet } = req;
+        const teamDid = blocklet.appPid;
+        const userDid = req.user.did;
+
+        const user = await node.getUser({
+          teamDid,
+          user: {
+            did: userDid,
+          },
+          options: {
+            enableConnectedAccount: true,
+          },
+        });
+
+        const doc = node.updateUser({
+          teamDid,
+          user: {
+            did: user.did,
+            didSpace: {
+              ...user?.didSpace,
+              ...value,
+            },
+          },
+        });
+
+        await node.createAuditLog(
+          {
+            action: 'updateDidSpace',
+            args: { teamDid, userDid, spaceGateway: value },
+            context: formatContext(req),
+            result: doc,
+          },
+          node
+        );
+
+        res.send();
+      } catch (err) {
+        console.error(err);
+        res.status(400).send(formatError(err));
+      }
+    });
   },
 };

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

@@ -138,7 +138,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
       });
       node.syncUserSession({
         teamDid,
-        userDid: user.did,
+        userDid: userSessionDoc.userDid,
         visitorId: userSessionDoc.visitorId,
         passportId: passport?.id,
         targetAppPid: sourceAppPid,

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

@@ -86,7 +86,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
       const userSessionDoc = await node.upsertUserSession({
         teamDid,
         visitorId,
-        userDid,
+        userDid: user.did,
         appPid: teamDid,
         passportId: passport?.id,
         status: 'online',
@@ -100,7 +100,7 @@ module.exports = function createRoutes(node, authenticator, createSessionToken)
       });
       node.syncUserSession({
         teamDid,
-        userDid,
+        userDid: userSessionDoc.userDid,
         visitorId: userSessionDoc.visitorId,
         passportId: passport?.id,
         targetAppPid: sourceAppPid,

package/api/services/auth/session.js

@@ -165,7 +165,7 @@ module.exports = {
 
           const refreshTokenType = 'refresh';
           const {
-            did: userDid,
+            did: userPid, // 从 token 拿到的 did 就是 userPid
             role,
             passport,
             provider = LOGIN_PROVIDER.WALLET,
@@ -180,7 +180,7 @@ module.exports = {
             },
           });
 
-          const user = await node.getUser({ teamDid, user: { did: userDid } });
+          const user = await node.getUser({ teamDid, user: { did: userPid } });
 
           if (role) {
             const rbac = await node.getRBAC(teamDid);
@@ -201,7 +201,7 @@ module.exports = {
 
           const sessionConfig = blocklet.settings?.session || {};
           const { sessionToken, refreshToken } = createToken(
-            userDid,
+            userPid,
             {
               secret,
               passport,
@@ -221,7 +221,7 @@ module.exports = {
           const userSession = await node.upsertUserSession({
             visitorId,
             teamDid,
-            userDid,
+            userDid: userPid,
             appPid: teamDid,
             status: 'online',
             ua,
@@ -235,7 +235,7 @@ module.exports = {
           if (user?.sourceAppPid) {
             node.syncUserSession({
               teamDid,
-              userDid,
+              userDid: userSession.userDid,
               visitorId: userSession.visitorId,
               targetAppPid: user.sourceAppPid,
               ua,

package/api/services/studio/index.js

@@ -4,7 +4,7 @@ const yaml = require('@blocklet/meta/lib/file');
 const express = require('express');
 const path = require('path');
 // eslint-disable-next-line import/no-unresolved
-const { initLocalStorageServer } = require('@blocklet/uploader/middlewares');
+const { initLocalStorageServer } = require('@blocklet/uploader-server');
 const serveStatic = require('serve-static');
 const nocache = require('nocache');
 const {
@@ -40,6 +40,12 @@ module.exports = {
       },
     };
 
+    const getIndexSender = (dir) => (_, res) => {
+      res.sendFile(path.join(dir, 'index.html'), {
+        headers: { 'Cache-Control': 'public, max-age=0' },
+      });
+    };
+
     const ensureComponent = async (req, res, next) => {
       const blocklet = await req.getBlocklet();
       if (blocklet.mode !== BLOCKLET_MODES.DEVELOPMENT) {
@@ -141,6 +147,13 @@ module.exports = {
     // screenshot loading
     const screenshotUrl = `${WELLKNOWN_SERVICE_PATH_PREFIX}/api/studio/${BLOCKLET_SCREENSHOTS_DIR}`;
     app.get(screenshotUrl, nocache(), ensureComponent, (req, res) => {
+      const screenshotsDir = path.join(req.component.deployedFrom, BLOCKLET_SCREENSHOTS_DIR);
+      const validScreenshots = req.meta.screenshots.filter((x) => fs.existsSync(path.join(screenshotsDir, x)));
+      if (validScreenshots.length !== req.meta.screenshots.length) {
+        req.meta.screenshots = validScreenshots;
+        yaml.update(path.join(req.component.deployedFrom, BLOCKLET_META_FILE), req.meta);
+      }
+
       res.json({
         did: req.meta.did,
         title: req.meta.title,
@@ -175,12 +188,6 @@ module.exports = {
     });
     app.use(`${screenshotUrl}/upload`, ensureComponent, getUploader(BLOCKLET_SCREENSHOTS_DIR).handle);
 
-    const getIndexSender = (dir) => (_, res) => {
-      res.sendFile(path.join(dir, 'index.html'), {
-        headers: { 'Cache-Control': 'public, max-age=0' },
-      });
-    };
-
     app.get(`${WELLKNOWN_SERVICE_PATH_PREFIX}/hosted/form-builder`, getIndexSender(builderPath));
     app.use(`${WELLKNOWN_SERVICE_PATH_PREFIX}/hosted/form-builder`, serveStatic(builderPath, staticOptions));
 

package/dist/assets/{Add-D1kPNbLw.js → Add-BuhvbaJP.js}

@@ -1 +1 @@
-import{X as r,Y as t,j as a}from"./index-CuJ6VeB5.js";var e={},u=t;Object.defineProperty(e,"__esModule",{value:!0});var d=e.default=void 0,v=u(r()),o=a;d=e.default=(0,v.default)((0,o.jsx)("path",{d:"M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z"}),"Add");export{d};
+import{X as r,Y as t,j as a}from"./index-BKFM1Brp.js";var e={},u=t;Object.defineProperty(e,"__esModule",{value:!0});var d=e.default=void 0,v=u(r()),o=a;d=e.default=(0,v.default)((0,o.jsx)("path",{d:"M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z"}),"Add");export{d};