Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into hin-736-update-email-copy

packages/component-user-manager/src/routes/fragmentsUsers/emails/emailCopy.js

 const getEmailCopy = ({ emailType, titleText }) => {
   let paragraph
   switch (emailType) {
-    case 'author-added-to-manuscript':
-      paragraph = `You have been added as an author to ${titleText}. The manuscript will become visible on your dashboard once it's submitted. Please click on the link below to access your dashboard.`
-      break
-    case 'new-author-added-to-manuscript':
-      paragraph = `You have been added as an author to ${titleText}. In order to gain access to the manuscript, please confirm your account and set your account details by clicking on the link below.`
+    case 'submitting-author-added-by-admin':
+      paragraph = `${titleText}<br/>
+        Please verify your details by clicking the link below.<br/>
+        To confirm the submission and view the status of the manuscript, please verify your details by clicking the link below. <br/>`
       break
     default:
       throw new Error(`The ${emailType} email type is not defined.`)

packages/component-user-manager/src/routes/fragmentsUsers/emails/notifications.js

@@ -14,113 +14,58 @@ const { getEmailCopy } = require('./emailCopy')
 
 module.exports = {
   async sendNotifications({
-    user,
     baseUrl,
     fragment,
-    reqUserId,
     UserModel,
     collection,
+    submittingAuthor,
   }) {
     const fragmentHelper = new Fragment({ fragment })
     const { title } = await fragmentHelper.getFragmentData({
       handlingEditor: collection.handlingEditor,
     })
-    const { submittingAuthor } = await fragmentHelper.getAuthorData({
-      UserModel,
-    })
-
-    const titleText = `the manuscript titled "${title}" by ${
-      submittingAuthor.firstName
-    } ${submittingAuthor.lastName}`
 
     const userHelper = new User({ UserModel })
-    const subjectBaseText = `${collection.customId}: Manuscript`
+    const eicName = await userHelper.getEiCName()
+
+    const titleText = `The manuscript titled "${title}" has been submitted to Hindawi by ${eicName}.`
 
     const email = new Email({
       type: 'user',
+      toUser: {
+        email: submittingAuthor.email,
+        name: `${submittingAuthor.firstName} ${submittingAuthor.lastName}`,
+      },
       content: {
-        ctaLink: baseUrl,
-        ctaText: 'VIEW DASHBOARD',
-        signatureName: await userHelper.getEiCName(),
+        ctaText: 'LOGIN',
+        signatureName: eicName,
+        subject: `Manuscript Submitted`,
+        ctaLink: services.createUrl(baseUrl, ''),
+        unsubscribeLink: services.createUrl(baseUrl, unsubscribeSlug, {
+          id: submittingAuthor.id,
+        }),
       },
     })
 
-    if (!user.isConfirmed) {
-      sendNewAuthorEmail({
-        email,
-        user,
-        baseUrl,
-        titleText,
-        subjectBaseText,
+    if (!submittingAuthor.isConfirmed) {
+      email.content.ctaLink = services.createUrl(baseUrl, resetPath, {
+        email: submittingAuthor.email,
+        token: submittingAuthor.passwordResetToken,
+        firstName: submittingAuthor.firstName,
+        lastName: submittingAuthor.lastName,
+        affiliation: submittingAuthor.affiliation,
+        title: submittingAuthor.title,
       })
+      email.content.ctaText = 'CONFIRM ACCOUNT'
     }
 
-    const requestUser = await UserModel.find(reqUserId)
-    if (requestUser.id !== user.id) {
-      sendAddedToManuscriptEmail({
-        email,
-        baseUrl,
-        user,
+    const { html, text } = email.getBody({
+      body: getEmailCopy({
+        emailType: 'submitting-author-added-by-admin',
         titleText,
-        subjectBaseText,
-      })
-    }
-  },
-}
-
-const sendAddedToManuscriptEmail = ({
-  email,
-  baseUrl,
-  user,
-  titleText,
-  subjectBaseText,
-}) => {
-  email.toUser = {
-    email: user.email,
-    name: `${user.firstName} ${user.lastName}`,
-  }
-
-  email.content.subject = `${subjectBaseText} Created`
-  email.content.unsubscribeLink = services.createUrl(baseUrl, unsubscribeSlug, {
-    id: user.id,
-  })
-
-  const { html, text } = email.getBody({
-    body: getEmailCopy({
-      emailType: 'author-added-to-manuscript',
-      titleText,
-    }),
-  })
-
-  email.sendEmail({ html, text })
-}
-
-const sendNewAuthorEmail = ({ email, baseUrl, user, titleText }) => {
-  email.toUser = {
-    email: user.email,
-    name: `${user.firstName} ${user.lastName}`,
-  }
-
-  email.content.subject = `Confirm Your Account`
-  email.content.unsubscribeLink = services.createUrl(baseUrl, unsubscribeSlug, {
-    id: user.id,
-  })
-  email.content.ctaLink = services.createUrl(baseUrl, resetPath, {
-    email: user.email,
-    token: user.passwordResetToken,
-    firstName: user.firstName,
-    lastName: user.lastName,
-    affiliation: user.affiliation,
-    title: user.title,
-  })
-  email.content.ctaText = 'CONFIRM ACCOUNT'
-
-  const { html, text } = email.getBody({
-    body: getEmailCopy({
-      emailType: 'new-author-added-to-manuscript',
-      titleText,
-    }),
-  })
+      }),
+    })
 
-  email.sendEmail({ html, text })
+    email.sendEmail({ html, text })
+  },
 }

packages/component-user-manager/src/routes/fragmentsUsers/post.js

@@ -8,6 +8,8 @@ const {
   authsome: authsomeHelper,
 } = require('pubsweet-component-helper-service')
 
+const notifications = require('./emails/notifications')
+
 const authorKeys = [
   'id',
   'email',
@@ -17,7 +19,6 @@ const authorKeys = [
   'affiliation',
 ]
 
-// TODO: add authsome
 module.exports = models => async (req, res) => {
   const { email, role, isSubmitting, isCorresponding } = req.body
 
@@ -50,6 +51,7 @@ module.exports = models => async (req, res) => {
   const UserModel = models.User
   const teamHelper = new Team({ TeamModel: models.Team, fragmentId })
   const fragmentHelper = new Fragment({ fragment })
+  const reqUser = await UserModel.find(req.user)
 
   try {
     let user = await UserModel.findByEmail(email)
@@ -91,9 +93,16 @@ module.exports = models => async (req, res) => {
       collection.save()
     }
 
-    /*
-      TO DO: send email to SA when an Admin submits a manuscript on his behalf
-    */
+    // send email to SA when an Admin submits a manuscript on his behalf
+    if ((reqUser.admin || reqUser.editorInChief) && isSubmitting) {
+      notifications.sendNotifications({
+        fragment,
+        UserModel,
+        collection,
+        submittingAuthor: user,
+        baseUrl: services.getBaseUrl(req),
+      })
+    }
 
     return res.status(200).json({
       ...pick(user, authorKeys),
@@ -125,9 +134,16 @@ module.exports = models => async (req, res) => {
         isCorresponding,
       })
 
-      /*
-        TO DO: send email to SA when an Admin submits a manuscript on his behalf
-      */
+      // send email to SA when an Admin submits a manuscript on his behalf
+      if ((reqUser.admin || reqUser.editorInChief) && isSubmitting) {
+        notifications.sendNotifications({
+          fragment,
+          UserModel,
+          collection,
+          submittingAuthor: newUser,
+          baseUrl: services.getBaseUrl(req),
+        })
+      }
 
       if (!collection.owners.includes(newUser.id)) {
         collection.owners.push(newUser.id)