Merge pull request #19871 from mozilla/pay-3431-email-strapi-links

fix(auth): use strapi links for non-webhook emails

Author: StaberindeZA

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

@@ -2800,7 +2800,7 @@ module.exports = function (log, config, bounces, statsd) {
   };
 
   Mailer.prototype.subscriptionPaymentExpiredEmail = async function (message) {
-    const { email, uid, planId, acceptLanguage, subscriptions } = message;
+    const { email, uid, acceptLanguage, subscriptions } = message;
 
     const enabled = config.subscriptions.transactionalEmails.enabled;
     log.trace('mailer.subscriptionPaymentExpired', {
@@ -2835,7 +2835,7 @@ module.exports = function (log, config, bounces, statsd) {
     }
 
     const cmsLinks = await this._generateCmsLinks(
-      planId,
+      subscriptions[0]?.planId,
       acceptLanguage,
       template
     );
@@ -2859,7 +2859,7 @@ module.exports = function (log, config, bounces, statsd) {
   Mailer.prototype.subscriptionPaymentProviderCancelledEmail = async function (
     message
   ) {
-    const { email, uid, planId, acceptLanguage, subscriptions } = message;
+    const { email, uid, acceptLanguage, subscriptions } = message;
 
     const enabled = config.subscriptions.transactionalEmails.enabled;
     log.trace('mailer.subscriptionPaymentProviderCancelled', {
@@ -2894,7 +2894,7 @@ module.exports = function (log, config, bounces, statsd) {
     }
 
     const cmsLinks = await this._generateCmsLinks(
-      planId,
+      subscriptions[0]?.planId,
       acceptLanguage,
       template
     );
@@ -3219,7 +3219,7 @@ module.exports = function (log, config, bounces, statsd) {
   };
 
   Mailer.prototype.subscriptionEndingReminderEmail = async function (message) {
-    const { email, uid, planId, acceptLanguage, subscription } = message;
+    const { email, uid, acceptLanguage, subscription } = message;
 
     const enabled = config.subscriptions.transactionalEmails.enabled;
     log.trace('mailer.subscriptionEndingReminderEmail', {
@@ -3245,7 +3245,7 @@ module.exports = function (log, config, bounces, statsd) {
       template
     );
     const cmsLinks = await this._generateCmsLinks(
-      planId,
+      subscription.planId,
       acceptLanguage,
       template
     );
@@ -3298,7 +3298,7 @@ module.exports = function (log, config, bounces, statsd) {
   };
 
   Mailer.prototype.subscriptionRenewalReminderEmail = async function (message) {
-    const { email, uid, planId, acceptLanguage, subscription } = message;
+    const { email, uid, acceptLanguage, subscription } = message;
 
     const enabled = config.subscriptions.transactionalEmails.enabled;
     log.trace('mailer.subscriptionRenewalReminderEmail', {
@@ -3324,7 +3324,7 @@ module.exports = function (log, config, bounces, statsd) {
       template
     );
     const cmsLinks = await this._generateCmsLinks(
-      planId,
+      subscription.planId,
       acceptLanguage,
       template
     );

packages/fxa-auth-server/test/local/senders/emails.ts

@@ -140,8 +140,8 @@ const MESSAGE = {
     productId: 'wibble',
   },
   subscriptions: [
-    { productName: 'Firefox Fortress' },
-    { productName: 'Cooking with Foxkeh' },
+    { planId: 'plan-example', productName: 'Firefox Fortress' },
+    { planId: 'other-plan', productName: 'Cooking with Foxkeh' },
   ],
   showPaymentMethod: true,
   discountType: 'forever',