Merge branch 'master' of gitlab.coko.foundation:xpub/xpub-faraday

packages/component-invite/src/controllers/inviteGlobalRole.js

@@ -36,6 +36,7 @@ module.exports = async (body, models, res, url) => {
       models.User,
       role,
     )
+
     try {
       await mailService.setupInviteEmail(
         newUser.email,
@@ -46,8 +47,7 @@ module.exports = async (body, models, res, url) => {
 
       return res.status(200).json(newUser)
     } catch (e) {
-      logger.error(e)
-      return res.status(500).json({ error: 'Mailing could not be sent.' })
+      return res.status(500).json({ error: e.message })
     }
   }
 }

packages/component-invite/src/routes/getCollectionUsers.js

@@ -30,6 +30,13 @@ module.exports = models => async (req, res) => {
       models.Team,
     )
 
+    if (members === undefined) {
+      res.status(400).json({
+        error: `The requested collection does not have a ${role} Team`,
+      })
+      return
+    }
+
     const membersData = members.map(async member => {
       const user = await models.User.find(member)
       const { timestamp, status } = teamHelper.getInviteData(

packages/component-invite/src/tests/fixtures/collections.js

+const Chance = require('chance')
+
+const chance = new Chance()
 module.exports = {
   standardCollection: {
-    id: '2c4fb766-a798-4c32-b857-c5d21a2ab331',
+    id: chance.guid(),
     title: 'Standard Collection',
     type: 'collection',
     fragments: [],
     owners: [],
     save: jest.fn(),
   },
+  noTeamCollection: {
+    id: chance.guid(),
+    title: 'No Team Collection',
+    type: 'collection',
+    fragments: [],
+    owners: [],
+    save: jest.fn(),
+  },
 }

packages/component-invite/src/tests/getCollectionUsers.test.js

@@ -5,7 +5,7 @@ const httpMocks = require('node-mocks-http')
 const fixtures = require('./fixtures/fixtures')
 const Model = require('./helpers/Model')
 
-const { standardCollection } = fixtures.collections
+const { standardCollection, noTeamCollection } = fixtures.collections
 const { editorInChief, admin } = fixtures.users
 const query = {
   role: 'handlingEditor',
@@ -76,4 +76,18 @@ describe('Get collection users route handler', () => {
     const data = JSON.parse(res._getData())
     expect(data.error).toEqual('The request user must be Editor in Chief')
   })
+  it('should return an error when the collection does not have a the requested role team', async () => {
+    const req = httpMocks.createRequest()
+    req.query = query
+    req.params.collectionId = noTeamCollection.id
+    req.user = editorInChief.id
+    const res = httpMocks.createResponse()
+    const models = Model.build()
+    await require(getCollectionUsersPath)(models)(req, res)
+    expect(res.statusCode).toBe(400)
+    const data = JSON.parse(res._getData())
+    expect(data.error).toEqual(
+      `The requested collection does not have a ${query.role} Team`,
+    )
+  })
 })

packages/component-mail-service/src/Mail.js

@@ -26,8 +26,15 @@ module.exports = {
     }
 
     const { htmlBody, textBody } = getEmailBody(emailType, replacements)
+    const mailData = {
+      from: config.get('mailer.from'),
+      to: email,
+      subject,
+      text: textBody,
+      html: htmlBody,
+    }
 
-    return Email.send(email, subject, textBody, htmlBody)
+    return Email.send(mailData)
   },
   setupAssignEmail: async (email, emailType, dashBoardUrl) => {
     let subject
@@ -45,8 +52,14 @@ module.exports = {
     }
 
     const { htmlBody, textBody } = getEmailBody(emailType, replacements)
-
-    return Email.send(email, subject, textBody, htmlBody)
+    const mailData = {
+      from: config.get('mailer.from'),
+      to: email,
+      subject,
+      text: textBody,
+      html: htmlBody,
+    }
+    return Email.send(mailData)
   },
 }
 

packages/component-send-email/src/SendEmail.js

 const nodemailer = require('nodemailer')
 const config = require('config')
-const logger = require('@pubsweet/logger')
 
 const mailerConfig = require(config.mailer.path)
 module.exports = {
-  send: (toEmail, subject, textBody, htmlBody) =>
-    new Promise((resolve, reject) => {
-      const transporter = nodemailer.createTransport(mailerConfig.transport)
-      transporter.sendMail(
-        {
-          from: mailerConfig.from,
-          to: toEmail,
-          subject,
-          text: textBody,
-          html: htmlBody,
-        },
-        (err, info) => {
-          if (err) {
-            logger.error(err)
-            return reject(err)
-          }
-          logger.info(`success message id: ${info.response}`)
-          return resolve(info.response)
-        },
-      )
-    }),
+  send: mailData => {
+    const transporter = nodemailer.createTransport(mailerConfig.transport)
+    return transporter.sendMail(mailData)
+  },
 }

packages/components-faraday/src/components/Files/FileSection.js

@@ -65,7 +65,10 @@ const FileSection = ({
             disabled={disabledFilepicker()}
             onUpload={addFile}
           >
-            <UploadButton disabled={disabledFilepicker()}>
+            <UploadButton
+              data-test={`button-upload-${listId}`}
+              disabled={disabledFilepicker()}
+            >
               <Icon
                 color={
                   disabledFilepicker()

packages/xpub-faraday/config/custom-environment-variables.json

+{
+  "SES": {
+    "accessKey": "AWS_SES_ACCESS_KEY",
+    "secretKey": "AWS_SES_SECRET_KEY",
+    "region": "AWS_SES_REGION"
+  }
+}
\ No newline at end of file

packages/xpub-faraday/config/default.js

 require('dotenv').config()
-
 const path = require('path')
 const components = require('./components.json')
 const logger = require('winston')
@@ -66,7 +65,7 @@ module.exports = {
     },
   },
   mailer: {
-    from: process.env.EMAIL_SENDER || 'test_sender@domain.com',
+    from: 'sebastian.mihalache@thinslices.com',
     path: `${__dirname}/mailer`,
   },
   publicKeys: [

packages/xpub-faraday/config/mailer.js

 const AWS = require('aws-sdk')
+const config = require('config')
 
 module.exports = {
-  from: process.env.EMAIL_SENDER,
   transport: {
     SES: new AWS.SES({
-      accessKeyId: process.env.AWS_SES_ACCESS_KEY,
-      secretAccessKey: process.env.AWS_SES_SECRET_KEY,
-      region: process.env.AWS_SES_REGION,
+      accessKeyId: config.SES.accessKey,
+      secretAccessKey: config.SES.secretKey,
+      region: config.SES.region,
     }),
   },
 }

packages/xpub-faraday/package.json

@@ -78,7 +78,7 @@
     "setupdb": "pubsweet setupdb ./",
     "reset": "pubsweet setupdb --clobber ./",
     "start": "pubsweet start",
-    "start-now": "echo $secret > config/local-development.json && npm run reset --username admin --email admin@mailinator.com --password admin123 && npm run start",
+    "start-now": "echo $secret > config/local-development.json && npm run start",
     "build": "NODE_ENV=production pubsweet build"
   }
 }