@blocklet/launcher-util 2.0.38 → 2.0.40

package/lib/notification/index.js

@@ -1,9 +1,4 @@
 const BlockletNotification = require('@blocklet/sdk/service/notification');
-const AuthClient = require('@blocklet/sdk/service/auth');
-
-const email = require('./email');
-
-const authClient = new AuthClient();
 
 class Notification {
   constructor({ logger, auth }) {
@@ -12,22 +7,23 @@ class Notification {
     this.logger = logger || { info: console.info, error: console.error };
   }
 
-  async sendNotification({ to, title, message, assetAddress, actions }) {
+  async sendNotification({ to, title, message, actions, attachments = [], assetAddress }) {
     try {
-      const payload = { title, body: message, actions: actions || [] };
+      const payload = { title, body: message, actions: actions || [], attachments: [...attachments] };
+
       if (typeof assetAddress !== 'undefined') {
-        payload.attachments = [
-          {
+        if (assetAddress) {
+          payload.attachments.push({
             type: 'asset',
             data: {
               chainHost: this.auth.chainHost,
               did: assetAddress,
             },
-          },
-        ];
+          });
+        }
       }
 
-      await this.send(to, payload);
+      await BlockletNotification.sendToUser(to, payload);
 
       this.logger.info('text message was sent', { to, payload: JSON.stringify(payload, null, 2) });
     } catch (error) {
@@ -35,28 +31,6 @@ class Notification {
       throw error;
     }
   }
-
-  async send(to, payload) {
-    const tasks = [BlockletNotification.sendToUser(to, payload)];
-
-    if (this.auth.email) {
-      const { user } = await authClient.getUser(to);
-      if (user && user.email) {
-        tasks.push(this.sendToEmail(user.email, email.getEmailMessage(payload), { auth: this.auth.email }));
-      }
-    }
-
-    await Promise.all(tasks);
-  }
-
-  async sendToEmail(to, payload, emailConfig) {
-    try {
-      await email.send(to, payload, emailConfig);
-      this.logger.info('send email message successfully', { to });
-    } catch (error) {
-      this.logger.error('send email message failed', { error, to });
-    }
-  }
 }
 
 module.exports = Notification;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-util",
-  "version": "2.0.38",
+  "version": "2.0.40",
   "description": "Common constants",
   "keywords": [
     "constant"
@@ -31,16 +31,16 @@
     "url": "https://github.com/blocklet/launcher/issues"
   },
   "dependencies": {
-    "@blocklet/sdk": "^1.16.5",
-    "@ocap/util": "^1.18.77",
+    "@blocklet/sdk": "^1.16.7",
+    "@ocap/util": "^1.18.80",
     "axios": "^0.26.1",
     "flat": "^5.0.2",
     "lodash.get": "^4.4.2",
     "lodash.pick": "^4.4.0",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.43",
-    "nodemailer": "^6.9.1",
+    "nodemailer": "^6.9.2",
     "url-join": "^4.0.1"
   },
-  "gitHead": "7298526de007c142f12ebcccd8d213e3b4366d90"
+  "gitHead": "afb153f2b5f798efa48def402a91798b2d3a7919"
 }

package/lib/notification/email.js

@@ -1,43 +0,0 @@
-const nodemailer = require('nodemailer');
-const get = require('lodash.get');
-const { getExplorerUrl } = require('../util');
-
-const send = (to, payload, { auth }) => {
-  const transporter = nodemailer.createTransport({
-    host: auth.host,
-    port: auth.port,
-    secure: false,
-    auth: { user: auth.user, pass: auth.pass },
-  });
-
-  return transporter.sendMail({ from: auth.from, to, subject: payload.subject, html: payload.html });
-};
-
-const getEmailMessage = ({ title, body, actions, attachments }) => {
-  let html = `<p>${body}</p>`;
-  if (Array.isArray(actions) && actions.length > 0) {
-    html += '<p>';
-
-    actions.forEach((action) => {
-      html += `<p>${action.name}: <a href="${action.link}">${action.link}</a></p>`;
-    });
-
-    html += '</p>';
-  }
-
-  const asset = (attachments || []).find((item) => item.type === 'asset');
-  if (asset) {
-    html += `<p>NFT: ${getExplorerUrl({
-      address: get(asset, 'data.did'),
-      type: 'assets',
-      chainHost: get(asset, 'data.chainHost'),
-    })}</p>`;
-  }
-
-  return {
-    subject: title,
-    html,
-  };
-};
-
-module.exports = { send, getEmailMessage };