@openneuro/server 4.4.2 → 4.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.4.2",
+  "version": "4.4.3",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -50,8 +50,7 @@
     "mongoose": "5.12.3",
     "morgan": "^1.6.1",
     "node-fetch": "^2.6.0",
-    "nodemailer": "^6.7.2",
-    "nodemailer-mailjet-transport": "^1.0.4",
+    "node-mailjet": "^3.3.5",
     "object-hash": "2.1.1",
     "passport": "^0.4.0",
     "passport-globus": "^0.0.1",
@@ -83,7 +82,7 @@
     "@types/draft-js": "^0.10.43",
     "@types/ioredis": "^4.17.1",
     "@types/jest": "^26.0.23",
-    "@types/nodemailer": "^6.4.1",
+    "@types/node-mailjet": "^3",
     "@types/semver": "^5",
     "apollo-link-schema": "^1.2.5",
     "babel-eslint": "^10.1.0",
@@ -105,5 +104,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "453eb4503d1f98b9fa13f86ee810ad376a8391bc"
+  "gitHead": "1f7523d0925047a02597242f68efd9c1c42cc695"
 }

package/src/__mocks__/config.js

@@ -4,5 +4,6 @@ config.auth.jwt.secret = '123456'
 config.datalad.uri = 'datalad'
 config.datalad.workers = 4
 config.mongo.url = 'mongodb://'
+config.notifications.email.from = 'notifications@example.com'
 
 export default config

package/src/libs/email/__tests__/index.spec.ts

@@ -0,0 +1,24 @@
+import { mailjetFormat } from '../index'
+
+jest.mock('../../../config.js')
+
+describe('Mailjet formatter', () => {
+  it('formats a message', () => {
+    const testMessage = {
+      to: 'test@example.com',
+      name: 'Test User',
+      html: 'email content goes here',
+      subject: 'subject line',
+    }
+    expect(mailjetFormat(testMessage)).toEqual({
+      Messages: [
+        {
+          From: { Email: 'notifications@example.com', Name: 'OpenNeuro' },
+          HTMLPart: 'email content goes here',
+          Subject: 'subject line',
+          To: [{ Email: 'test@example.com', Name: 'Test User' }],
+        },
+      ],
+    })
+  })
+})

package/src/libs/email/index.ts

@@ -1,41 +1,46 @@
-import nodemailer from 'nodemailer'
-
 import config from '../../config'
 
-// setup email transporter
-let transporter
+let transport
+let perform_api_call = true
 try {
-  const mailjetTransport = require('nodemailer-mailjet-transport')
-  transporter = nodemailer.createTransport(
-    mailjetTransport({
-      auth: {
-        apiKey: config.notifications.email.apiKey,
-        apiSecret: config.notifications.email.secret,
-      },
-    }),
+  const mailjet = require('node-mailjet')
+  transport = mailjet.connect(
+    config.notifications.email.apiKey,
+    config.notifications.email.secret,
   )
 } catch (err) {
-  // Mailjet is not configured, instead log emails
-  transporter = {
-    sendMail: (mail, cb) => {
-      console.dir(mail)
-    },
-  }
+  perform_api_call = false
 }
 
-export const send = (
-  email: Record<string, string>,
-  callback: (err, response) => void,
-): void => {
-  // configure mail options
-  const mailOptions = {
-    from: `"OpenNeuro" <${config.notifications.email.from}>`,
-    replyTo: config.notifications.email.from,
-    to: email.to,
-    subject: email.subject,
-    html: email.html,
-  }
+export const mailjetFormat = (email: Record<string, string>) => ({
+  Messages: [
+    {
+      From: {
+        Email: config.notifications.email.from,
+        Name: 'OpenNeuro',
+      },
+      To: [
+        {
+          Email: email.to,
+          Name: email.name,
+        },
+      ],
+      Subject: email.subject,
+      HTMLPart: email.html,
+    },
+  ],
+})
 
-  // send email
-  transporter.sendMail(mailOptions, callback)
+/**
+ * Send via Mailjet
+ * @param email Nodemailer style email record
+ */
+export const send = (email: Record<string, string>): Promise<Response> => {
+  // Mailjet is not configured, instead log emails
+  if (!perform_api_call) {
+    console.dir(email)
+  }
+  return transport
+    .post('send', { version: 'v3.1', perform_api_call })
+    .request(mailjetFormat(email))
 }

package/src/libs/notifications.js

@@ -18,19 +18,15 @@ import { snapshotReminder } from '../libs/email/templates/snapshot-reminder'
 import { datasetImportEmail } from '../libs/email/templates/dataset-imported'
 import { datasetImportFailed } from '../libs/email/templates/dataset-import-failed'
 
-function noop() {
-  // No callback helper
-}
-
 // public api ---------------------------------------------
 
 const notifications = {
   /**
    * Send
    */
-  send(notification, callback) {
+  send(notification) {
     if (notification.type === 'email') {
-      emailSend(notification.email, callback)
+      emailSend(notification.email)
     }
   },
 
@@ -74,6 +70,7 @@ const notifications = {
           type: 'email',
           email: {
             to: user.email,
+            name: user.name,
             subject: 'Snapshot Created',
             html: snapshotCreated({
               name: user.name,
@@ -89,7 +86,7 @@ const notifications = {
           },
         }
         // send the email
-        notifications.send(emailContent, noop)
+        notifications.send(emailContent)
       }
     })
   },
@@ -138,6 +135,7 @@ const notifications = {
                 type: 'email',
                 email: {
                   to: user.email,
+                  name: user.name,
                   from:
                     'reply-' +
                     encodeURIComponent(comment._id) +
@@ -161,7 +159,7 @@ const notifications = {
                 },
               }
               // send each email to the notification database for distribution
-              notifications.send(emailContent, noop)
+              notifications.send(emailContent)
             }
           })
       })
@@ -195,6 +193,7 @@ const notifications = {
                 type: 'email',
                 email: {
                   to: user.email,
+                  name: user.name,
                   subject: 'Dataset Deleted',
                   html: datasetDeleted({
                     name: user.name,
@@ -206,7 +205,7 @@ const notifications = {
                   }),
                 },
               }
-              notifications.send(emailContent, noop)
+              notifications.send(emailContent)
             }
           })
       })
@@ -244,6 +243,7 @@ const notifications = {
                 type: 'email',
                 email: {
                   to: user.email,
+                  name: user.name,
                   subject: 'Owner Unsubscribed',
                   html: ownerUnsubscribed({
                     name: user.name,
@@ -255,7 +255,7 @@ const notifications = {
                   }),
                 },
               }
-              notifications.send(emailContent, noop)
+              notifications.send(emailContent)
             }
           })
       })
@@ -294,6 +294,7 @@ const notifications = {
                   type: 'email',
                   email: {
                     to: user.email,
+                    name: user.name,
                     subject: 'Snapshot Reminder',
                     html: snapshotReminder({
                       name: user.name,
@@ -307,7 +308,7 @@ const notifications = {
                   },
                 }
                 // send each email to the notification database for distribution
-                notifications.send(emailContent, noop)
+                notifications.send(emailContent)
               }
             })
         })
@@ -351,12 +352,13 @@ const notifications = {
       type: 'email',
       email: {
         to: user.email,
+        name: user.name,
         subject: `Dataset Import ${success ? 'Success' : 'Failed'}`,
         html: html,
       },
     }
     // send the email to the notifications database for distribution
-    notifications.send(emailContent, noop)
+    notifications.send(emailContent)
   },
 }