@openneuro/server 4.4.0-alpha.4 → 4.4.0-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.4.0-alpha.4",
+  "version": "4.4.0-alpha.5",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -105,5 +105,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e6fae8f69ec77f67577425dd839c27a36cce409e"
+  "gitHead": "5770bfd37c3f8883f99e65059ec5d57130c25a64"
 }

package/src/config.js

@@ -42,10 +42,8 @@ const config = {
   },
   notifications: {
     email: {
-      service: process.env.CRN_SERVER_MAIL_SERVICE,
-      user: process.env.CRN_SERVER_MAIL_USER,
-      url: process.env.CRN_SERVER_MAIL_URL,
-      pass: process.env.CRN_SERVER_MAIL_PASS,
+      apiKey: process.env.CRN_SERVER_MAIL_API_KEY,
+      secret: process.env.CRN_SERVER_MAIL_API_SECRET,
       from: process.env.CRN_SERVER_MAIL_FROM,
     },
   },

package/src/libs/email/index.ts

@@ -1,33 +1,25 @@
 import nodemailer from 'nodemailer'
+import mailjetTransport from 'nodemailer-mailjet-transport'
 import config from '../../config'
 
 // setup email transporter
-const transporter = nodemailer.createTransport({
-  service: config.notifications.email.service,
-  auth: {
-    user:
-      config.notifications.email.user + '@' + config.notifications.email.url,
-    pass: config.notifications.email.pass,
-  },
-})
+const transporter = nodemailer.createTransport(
+  mailjetTransport({
+    auth: {
+      apiKey: config.notifications.email.apiKey,
+      secret: config.notifications.email.secret,
+    },
+  }),
+)
 
 export const send = (
   email: Record<string, string>,
   callback: (err, response) => void,
 ): void => {
-  // inline styles
-  //html = juice(html)
-
-  // determine if the main is from a specific sender
-  // or the generic email address
-  const user: string =
-    email && email.from ? email.from : config.notifications.email.user
-  const from = user + '@' + config.notifications.email.url
-
   // configure mail options
   const mailOptions = {
     from: `"OpenNeuro" <${config.notifications.email.from}>`,
-    replyTo: from,
+    replyTo: config.notifications.email.from,
     to: email.to,
     subject: email.subject,
     html: email.html,