Merge pull request #18862 from mozilla/FXA-11049

feat(emails): Update postConsumeRecoveryCode email

Author: vpomerleau

packages/fxa-auth-server/config/index.ts

@@ -2351,6 +2351,10 @@ convictConf.set(
   'smtp.createAccountRecoveryUrl',
   `${baseUri}/settings/account_recovery`
 );
+convictConf.set(
+  'smtp.manageTwoFactorSettingsUrl',
+  `${baseUri}/settings#two-step-authentication`
+);
 convictConf.set(
   'smtp.verifyPrimaryEmailUrl',
   `${baseUri}/verify_primary_email`

packages/fxa-auth-server/lib/routes/totp.js

@@ -434,7 +434,6 @@ module.exports = (
             acceptLanguage,
             ip,
             location: geo.location,
-            numberRemaining: remaining,
             timeZone: geo.timeZone,
             uaBrowser: ua.browser,
             uaBrowserVersion: ua.browserVersion,

packages/fxa-auth-server/lib/senders/email.js

@@ -329,6 +329,7 @@ module.exports = function (log, config, bounces, statsd) {
     this.subscriptionTermsUrl = mailerConfig.subscriptionTermsUrl;
     this.supportUrl = mailerConfig.supportUrl;
     this.syncUrl = mailerConfig.syncUrl;
+    this.manageTwoFactorSettingsUrl = mailerConfig.manageTwoFactorSettingsUrl;
     this.unsubscribeUrl = mailerConfig.unsubscribeUrl;
     this.verificationUrl = mailerConfig.verificationUrl;
     this.verifyLoginUrl = mailerConfig.verifyLoginUrl;
@@ -355,6 +356,15 @@ module.exports = function (log, config, bounces, statsd) {
     );
   };
 
+  Mailer.prototype._twoFactorSettingsLinkAttributes = function (
+    email,
+    templateName
+  ) {
+    return linkAttributes(
+      this.createTwoFactorSettingsLink(email, templateName)
+    );
+  };
+
   Mailer.prototype._passwordChangeLinkAttributes = function (
     email,
     templateName
@@ -1557,12 +1567,13 @@ module.exports = function (log, config, bounces, statsd) {
         email: message.email,
         iosLink: links.iosLink,
         link: links.link,
-        numberRemaining: message.numberRemaining,
-        passwordChangeLink: links.passwordChangeLink,
-        passwordChangeLinkAttributes: links.passwordChangeLinkAttributes,
+        resetLink: links.resetLink,
+        resetLinkAttributes: links.resetLinkAttributes,
         privacyUrl: links.privacyUrl,
         supportLinkAttributes: links.supportLinkAttributes,
         supportUrl: links.supportUrl,
+        twoFactorSettingsLink: links.twoFactorSettingsLink,
+        twoFactorSettingsLinkAttributes: links.twoFactorSettingsLinkAttributes,
         time,
       },
     });
@@ -3043,6 +3054,7 @@ module.exports = function (log, config, bounces, statsd) {
     templateName,
     content
   ) {
+    console.log(link);
     const parsedLink = new URL(link);
 
     Object.keys(query).forEach((key) => {
@@ -3207,6 +3219,13 @@ module.exports = function (log, config, bounces, statsd) {
       query.emailToHashWith
     );
 
+    links['twoFactorSettingsLink'] = this.createTwoFactorSettingsLink(
+      email,
+      templateName
+    );
+    links['twoFactorSettingsLinkAttributes'] =
+      this._twoFactorSettingsLinkAttributes(email, templateName);
+
     links['androidLink'] = this._generateUTMLink(
       this.androidUrl,
       query,
@@ -3371,11 +3390,8 @@ module.exports = function (log, config, bounces, statsd) {
     templateName,
     emailToHashWith
   ) {
-    // Default `reset_password_confirm` to false, to show warnings about
-    // resetting password and sync data
     const query = {
       email: email,
-      reset_password_confirm: false,
       email_to_hash_with: emailToHashWith,
     };
 
@@ -3398,6 +3414,20 @@ module.exports = function (log, config, bounces, statsd) {
     );
   };
 
+  Mailer.prototype.createTwoFactorSettingsLink = function (
+    email,
+    templateName
+  ) {
+    const query = { email: email };
+
+    return this._generateUTMLink(
+      this.manageTwoFactorSettingsUrl,
+      query,
+      templateName,
+      'manage-two-factor'
+    );
+  };
+
   Mailer.prototype.createReportSignInLink = function (templateName, data) {
     const query = {
       uid: data.uid,

packages/fxa-auth-server/lib/senders/emails/partials/automatedEmailChangePassword/index.txt

@@ -1,4 +1,5 @@
 automated-email-change-plaintext-2 = "If you didn’t take this action, change your password right away:"
 <%- passwordChangeLink %>
+
 automated-email-support-plaintext = "For more info, visit Mozilla Support:"
 <%- supportUrl %>

packages/fxa-auth-server/lib/senders/emails/partials/automatedEmailResetPassword/index.txt

@@ -1 +1,4 @@
 automated-email-reset-plaintext-v2 = "If you did not authorize this action, please reset your password now at <%- resetLink %>"
+
+automated-email-support-plaintext = "For more info, visit Mozilla Support:"
+<%- supportUrl %>

packages/fxa-auth-server/lib/senders/emails/partials/automatedEmailResetPasswordTwoFactor/en.ftl

@@ -0,0 +1,8 @@
+# This message is used by multiple automated emails that notify users of security events on their account
+# "this action" is meant to be a generic term, and could, for example, refer to using a backup authentication code to confirm a password reset
+automated-email-reset-pwd-two-factor = If you didnʼt take this action, then <a data-l10n-name="resetLink">reset your password</a> and <a data-l10n-name="twoFactorSettingsLink">reset two-step authentication</a> right away.
+  For more information, please visit <a data-l10n-name="supportLink">{ -brand-mozilla } Support</a>.
+# Followed by link to https://accounts.firefox.com/reset_password
+automated-email-reset-pwd-plaintext-v3 = If you didnʼt take this action, then reset your password right away at:
+# Followed by link to https://accounts.firefox.com/settings#two-step-authentication
+automated-email-reset-two-factor-plaintext = Also, reset two-step authentication at:

packages/fxa-auth-server/lib/senders/emails/partials/automatedEmailResetPasswordTwoFactor/index.mjml

@@ -0,0 +1,17 @@
+<%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/. %>
+
+<mj-section>
+  <mj-column>
+    <mj-text css-class="text-footer-automatedEmail">
+      <span data-l10n-id="automated-email-reset-pwd-two-factor">
+        If you didnʼt take this action, then
+        <a class="link-blue" href="<%- resetLink %>" data-l10n-name="resetLink">reset your password</a> and
+        <a class="link-blue" href="<%- twoFactorSettingsLink %>" data-l10n-name="twoFactorSettingsLink">reset two-step authentication</a> right away.
+        For more information, please visit
+        <a class="link-blue" href="<%- supportUrl %>" data-l10n-name="supportLink">Mozilla Support</a>.
+      </span>
+    </mj-text>
+  </mj-column>
+</mj-section>

packages/fxa-auth-server/lib/senders/emails/partials/automatedEmailResetPasswordTwoFactor/index.stories.ts

@@ -0,0 +1,25 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+import { Meta } from '@storybook/html';
+import { storyWithProps } from '../../storybook-email';
+
+export default {
+  title: 'Partials/footers/automatedEmailResetPasswordTwoFactor',
+} as Meta;
+
+const createStory = storyWithProps(
+  '_storybook',
+  'This partial is used in footers for automated emails where password reset is recommended.',
+  {
+    layout: null,
+    subject: 'N/A',
+    partial: 'automatedEmailResetPasswordTwoFactor',
+    resetLink: 'http://localhost:3030/reset_password',
+    twoFactorSettingsLink:
+      'http://localhost:3030/settings#two-step-authentication',
+  }
+);
+
+export const AutomatedEmailResetPassword = createStory();

packages/fxa-auth-server/lib/senders/emails/partials/automatedEmailResetPasswordTwoFactor/index.txt

@@ -0,0 +1,8 @@
+automated-email-reset-pwd-plaintext-v3 = "If you didnʼt take this action, then reset your password right away at:"
+<%- resetLink %>
+
+automated-email-reset-two-factor-plaintext = "Also, reset two-step authentication at:"
+<%- twoFactorSettingsLink %>
+
+automated-email-support-plaintext = "For more info, visit Mozilla Support:"
+<%- supportUrl %>

packages/fxa-auth-server/lib/senders/emails/templates/_versions.json

@@ -41,7 +41,7 @@
   "verifySecondaryCode": 3,
   "postAddTwoStepAuthentication": 9,
   "postRemoveTwoStepAuthentication": 9,
-  "postConsumeRecoveryCode": 7,
+  "postConsumeRecoveryCode": 8,
   "postNewRecoveryCodes": 7,
   "passwordResetAccountRecovery": 9,
   "postAddAccountRecovery": 9,