Merge pull request #19515 from mozilla/PAY-3302

fix(emails): Fix subscription management link in emails

Author: david1alvarez

packages/fxa-auth-server/config/dev.json

@@ -20,6 +20,7 @@
     "secure": false,
     "redirectDomain": "localhost",
     "subscriptionTermsUrl": "https://www.mozilla.org/about/legal/terms/firefox-private-network/",
+    "subscriptionSettingsUrl": "http://localhost:3035/",
     "user": "local",
     "password": "local"
   },

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

@@ -496,11 +496,17 @@ const convictConf = convict({
         'https://app.adjust.com/2uo1qc?campaign=fxa-conf-email&adgroup=ios&creative=button&fallback=https%3A%2F%2Fitunes.apple.com%2Fapp%2Fapple-store%2Fid989804926%3Fpt%3D373246%26ct%3Dadjust_tracker%26mt%3D8&utm_source=email',
     },
     supportUrl: {
-      doc: 'url to Mozilla Support product page',
+      doc: 'url to Mozilla account support page',
       format: String,
       default:
         'https://support.mozilla.org/kb/im-having-problems-my-firefox-account',
     },
+    subscriptionSupportUrl: {
+      doc: 'url to Mozilla subscription support page',
+      format: String,
+      default:
+        'https://support.mozilla.org/products',
+    },
     redirectDomain: {
       doc: 'Domain that mail urls are allowed to redirect to',
       format: String,
@@ -525,6 +531,12 @@ const convictConf = convict({
       env: 'SUBSCRIPTION_TERMS_URL',
       format: String,
     },
+    subscriptionSettingsUrl: {
+      default: 'https://payments.firefox.com/',
+      doc: 'Subscriptions management URL',
+      env: 'PAYMENTS_NEXT_HOSTED_URL',
+      format: String,
+    },
     unsubscribeUrl: {
       doc: 'URL to unsubscribe from MoCo and MoFo emails',
       format: String,
@@ -2621,8 +2633,6 @@ convictConf.set(
   'smtp.verifySecondaryEmailUrl',
   `${baseUri}/verify_secondary_email`
 );
-convictConf.set('smtp.subscriptionSettingsUrl', `${baseUri}/subscriptions`);
-convictConf.set('smtp.subscriptionSupportUrl', `${baseUri}/support`);
 convictConf.set('smtp.syncUrl', `${baseUri}/connect_another_device`);
 
 convictConf.set('isProduction', convictConf.get('env') === 'prod');

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

@@ -1,7 +1,7 @@
 subscription-support-get-help = Get help with your subscription
 subscription-support-manage-your-subscription = <a data-l10n-name="manageSubscriptionUrl">Manage your subscription</a>
-# After the colon, there's a link to https://accounts.firefox.com/subscriptions
+# After the colon, there's a link to https://payments.firefox.com/subscriptions
 subscription-support-manage-your-subscription-plaintext = Manage your subscription:
 subscription-support-contact-support = <a data-l10n-name="subscriptionSupportUrl">Contact support</a>
-# After the colon, there's a link to https://accounts.firefox.com/support
+# After the colon, there's a link to https://support.mozilla.com/products
 subscription-support-contact-support-plaintext = Contact support:

packages/fxa-payments-server/backstage.yaml

@@ -12,10 +12,10 @@ metadata:
     - node
     - react
   links:
-    - url: https://subscriptions.firefox.com/
+    - url: https://payments.firefox.com/
       title: Production Subscription Platform
       type: website
-    - url: https://payments-server.allizom.org/
+    - url: https://payments-next.allizom.org/
       title: Stage Subscription Platform
       type: website
 spec: