@openneuro/server 4.4.0-alpha.2 → 4.4.0

package/package.json

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

package/src/config.js

@@ -42,10 +42,9 @@ 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,
     },
   },
   sentry: {

package/src/libs/email/index.ts

@@ -1,33 +1,35 @@
 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,
-  },
-})
+let transporter
+try {
+  transporter = nodemailer.createTransport(
+    mailjetTransport({
+      auth: {
+        apiKey: config.notifications.email.apiKey,
+        secret: config.notifications.email.secret,
+      },
+    }),
+  )
+} catch (err) {
+  // Mailjet is not configured, instead log emails
+  transporter = {
+    sendMail: (mail, cb) => {
+      console.dir(mail)
+    },
+  }
+}
 
 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" <notifications@openneuro.org>',
-    replyTo: from,
+    from: `"OpenNeuro" <${config.notifications.email.from}>`,
+    replyTo: config.notifications.email.from,
     to: email.to,
     subject: email.subject,
     html: email.html,

package/src/libs/notifications.js

@@ -1,13 +1,9 @@
 /*eslint no-console: ["error", { allow: ["log"] }] */
-import toDate from 'date-fns/toDate'
-import subHours from 'date-fns/subHours'
 import config from '../config'
 import { send as emailSend } from './email'
 import request from 'superagent'
-import Notification from '../models/notification'
 import User from '../models/user'
 import Subscription from '../models/subscription'
-import MailgunIdentifier from '../models/mailgunIdentifier'
 import moment from 'moment'
 import url from 'url'
 import bidsId from './bidsId'
@@ -29,20 +25,6 @@ function noop() {
 // public api ---------------------------------------------
 
 const notifications = {
-  /**
-   * Add
-   *
-   * Takes a notification object and
-   * adds it to the database to be processed by
-   * the cron.
-   */
-  add(notification, callback) {
-    Notification.updateOne({ _id: notification._id }, notification, {
-      upsert: true,
-      new: true,
-    }).then(callback)
-  },
-
   /**
    * Send
    */
@@ -106,8 +88,8 @@ const notifications = {
             }),
           },
         }
-        // send the email to the notifications database for distribution
-        notifications.add(emailContent, noop)
+        // send the email
+        notifications.send(emailContent, noop)
       }
     })
   },
@@ -179,7 +161,7 @@ const notifications = {
                 },
               }
               // send each email to the notification database for distribution
-              notifications.add(emailContent, noop)
+              notifications.send(emailContent, noop)
             }
           })
       })
@@ -224,8 +206,7 @@ const notifications = {
                   }),
                 },
               }
-              // send each email to the notification database for distribution
-              notifications.add(emailContent, noop)
+              notifications.send(emailContent, noop)
             }
           })
       })
@@ -274,8 +255,7 @@ const notifications = {
                   }),
                 },
               }
-              // send each email to the notification database for distribution
-              notifications.add(emailContent, noop)
+              notifications.send(emailContent, noop)
             }
           })
       })
@@ -327,7 +307,7 @@ const notifications = {
                   },
                 }
                 // send each email to the notification database for distribution
-                notifications.add(emailContent, noop)
+                notifications.send(emailContent, noop)
               }
             })
         })
@@ -376,43 +356,7 @@ const notifications = {
       },
     }
     // send the email to the notifications database for distribution
-    notifications.add(emailContent, noop)
-  },
-
-  initCron() {
-    setInterval(() => {
-      // After one hour, retry a notification even if we have a lock
-      Notification.findOneAndUpdate(
-        { notificationLock: { $lte: toDate(subHours(Date.now(), 1)) } },
-        { $set: { notificationLock: new Date(Date.now()) } },
-      ).exec((err, notification) => {
-        if (err) {
-          console.log(
-            'NOTIFICATION ERROR - Could not find notifications collection',
-          )
-        } else {
-          if (notification) {
-            notifications.send(notification, (err, response) => {
-              if (!err) {
-                notification.remove()
-                if (response && response.messageId) {
-                  new MailgunIdentifier({
-                    messageId: response.messageId,
-                  }).save(err => {
-                    if (err) {
-                      throw `failed to save mailgunIdentifier ${response.messageId}`
-                    }
-                  })
-                }
-              } else {
-                console.log('NOTIFICATION ERROR ----------')
-                console.log(err)
-              }
-            })
-          }
-        }
-      })
-    }, 3600000)
+    notifications.send(emailContent, noop)
   },
 }
 

package/src/models/notification.ts

@@ -9,6 +9,7 @@ export interface NotificationDocument extends Document {
     from: string
     subject: string
     template: string
+    html: string
     data: {
       name: string
       appName: string
@@ -43,6 +44,7 @@ const notificationSchema = new Schema({
     from: String,
     subject: String,
     template: String,
+    html: String,
     data: {
       name: String,
       appName: String,

package/src/server.js

@@ -8,7 +8,6 @@ import { createServer } from 'http'
 import mongoose from 'mongoose'
 import subscriptionServerFactory from './libs/subscription-server.js'
 import { connect as redisConnect } from './libs/redis'
-import notifications from './libs/notifications'
 import config from './config'
 import createApp from './app'
 import { version } from './lerna.json'
@@ -16,8 +15,6 @@ import { version } from './lerna.json'
 const redisConnectionSetup = async () => {
   try {
     await redisConnect(config.redis)
-    // start background tasks
-    notifications.initCron()
   } catch (err) {
     // eslint-disable-next-line no-console
     console.error(err)