refactor(user): extract forgot password email

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

@@ -10,39 +10,33 @@ const { name: journalName, staffEmail } = config.get('journal')
 const unsubscribeSlug = config.get('unsubscribe.url')
 
 module.exports = {
-  async sendNotifications({ user, baseUrl }) {
+  async sendForgotPasswordEmail({ user, baseUrl }) {
+    const { paragraph, ...bodyProps } = getEmailCopy({
+      emailType: 'user-forgot-password',
+    })
+
     const email = new Email({
       type: 'system',
+      toUser: {
+        email: user.email,
+      },
       fromEmail: `${journalName} <${staffEmail}>`,
       content: {
+        subject: 'Forgot Password',
         ctaLink: services.createUrl(baseUrl, forgotPath, {
           email: user.email,
           token: user.accessTokens.passwordReset,
         }),
         ctaText: 'RESET PASSWORD',
+        paragraph,
+        unsubscribeLink: services.createUrl(baseUrl, unsubscribeSlug, {
+          id: user.id,
+          token: user.accessTokens.unsubscribe,
+        }),
       },
+      bodyProps,
     })
 
-    sendForgotPasswordEmail({ email, baseUrl, user })
+    email.sendEmail()
   },
 }
-
-const sendForgotPasswordEmail = ({ email, baseUrl, user }) => {
-  email.toUser = {
-    email: user.email,
-  }
-
-  email.content.subject = 'Forgot Password'
-  email.content.unsubscribeLink = services.createUrl(baseUrl, unsubscribeSlug, {
-    id: user.id,
-    token: user.accessTokens.unsubscribe,
-  })
-
-  const { html, text } = email.getNotificationBody({
-    emailBodyProps: getEmailCopy({
-      emailType: 'user-forgot-password',
-    }),
-  })
-
-  email.sendEmail({ html, text })
-}

packages/component-user-manager/src/routes/users/forgotPassword.js

@@ -10,41 +10,41 @@ module.exports = models => async (req, res) => {
   if (!services.checkForUndefinedParams(email))
     return res.status(400).json({ error: 'Email address is required.' })
 
+  let user
   try {
-    const user = await models.User.findByEmail(email)
-    const authsome = authsomeHelper.getAuthsome(models)
-    const canRequest = await authsome.can(req.user, '', {
-      targetUser: user,
-    })
-    if (!canRequest) {
-      return res.status(403).json({ error: 'Unauthorized.' })
-    }
-
-    if (user.passwordResetTimestamp) {
-      const resetDate = new Date(user.passwordResetTimestamp)
-      const hoursPassed = Math.floor(
-        (new Date().getTime() - resetDate) / 3600000,
-      )
-      if (hoursPassed < 24) {
-        return res
-          .status(400)
-          .json({ error: 'A password reset has already been requested.' })
-      }
-    }
-
-    user.accessTokens.passwordReset = services.generateHash()
-    user.passwordResetTimestamp = Date.now()
-    await user.save()
-
-    notifications.sendNotifications({
-      user,
-      baseUrl: services.getBaseUrl(req),
-    })
+    user = await models.User.findByEmail(email)
   } catch (e) {
     logger.error(
       `A forgot password request has been made on an non-existent email: ${email}`,
     )
   }
+  const authsome = authsomeHelper.getAuthsome(models)
+  const canRequest = await authsome.can(req.user, '', {
+    targetUser: user,
+  })
+  if (!canRequest) {
+    return res.status(403).json({ error: 'Unauthorized.' })
+  }
+
+  if (user.passwordResetTimestamp) {
+    const resetDate = new Date(user.passwordResetTimestamp)
+    const hoursPassed = Math.floor((new Date().getTime() - resetDate) / 3600000)
+    if (hoursPassed < 24) {
+      return res
+        .status(400)
+        .json({ error: 'A password reset has already been requested.' })
+    }
+  }
+
+  user.accessTokens.passwordReset = services.generateHash()
+  user.passwordResetTimestamp = Date.now()
+
+  await user.save()
+
+  notifications.sendForgotPasswordEmail({
+    user,
+    baseUrl: services.getBaseUrl(req),
+  })
 
   res.status(200).json({
     message: `A password reset email has been sent to ${email}.`,