Skip to content

Commit d654b78

Browse files
committed
fix(emails): Fix subscription management link in emails
Because: * The subscription management link was being set to the content server's /subscription url This commit: * The subscription management link now uses the config value * The subscription management link now points to SP3's page Closes #PAY-3302
1 parent 415f56b commit d654b78

5 files changed

Lines changed: 30 additions & 8 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"secure": false,
2121
"redirectDomain": "localhost",
2222
"subscriptionTermsUrl": "https://www.mozilla.org/about/legal/terms/firefox-private-network/",
23+
"subscriptionSettingsUrl": "http://localhost:3035/",
2324
"user": "local",
2425
"password": "local"
2526
},

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,11 +496,17 @@ const convictConf = convict({
496496
'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',
497497
},
498498
supportUrl: {
499-
doc: 'url to Mozilla Support product page',
499+
doc: 'url to Mozilla account support page',
500500
format: String,
501501
default:
502502
'https://support.mozilla.org/kb/im-having-problems-my-firefox-account',
503503
},
504+
subscriptionSupportUrl: {
505+
doc: 'url to Mozilla subscription support page',
506+
format: String,
507+
default:
508+
'https://support.mozilla.org/products',
509+
},
504510
redirectDomain: {
505511
doc: 'Domain that mail urls are allowed to redirect to',
506512
format: String,
@@ -525,6 +531,12 @@ const convictConf = convict({
525531
env: 'SUBSCRIPTION_TERMS_URL',
526532
format: String,
527533
},
534+
subscriptionSettingsUrl: {
535+
default: 'https://payments.firefox.com/',
536+
doc: 'Subscriptions management URL',
537+
env: 'PAYMENTS_NEXT_HOSTED_URL',
538+
format: String,
539+
},
528540
unsubscribeUrl: {
529541
doc: 'URL to unsubscribe from MoCo and MoFo emails',
530542
format: String,
@@ -2621,8 +2633,6 @@ convictConf.set(
26212633
'smtp.verifySecondaryEmailUrl',
26222634
`${baseUri}/verify_secondary_email`
26232635
);
2624-
convictConf.set('smtp.subscriptionSettingsUrl', `${baseUri}/subscriptions`);
2625-
convictConf.set('smtp.subscriptionSupportUrl', `${baseUri}/support`);
26262636
convictConf.set('smtp.syncUrl', `${baseUri}/connect_another_device`);
26272637

26282638
convictConf.set('isProduction', convictConf.get('env') === 'prod');
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
subscription-support-get-help = Get help with your subscription
22
subscription-support-manage-your-subscription = <a data-l10n-name="manageSubscriptionUrl">Manage your subscription</a>
3-
# After the colon, there's a link to https://accounts.firefox.com/subscriptions
3+
# After the colon, there's a link to https://payments.firefox.com/subscriptions
44
subscription-support-manage-your-subscription-plaintext = Manage your subscription:
55
subscription-support-contact-support = <a data-l10n-name="subscriptionSupportUrl">Contact support</a>
6-
# After the colon, there's a link to https://accounts.firefox.com/support
6+
# After the colon, there's a link to https://support.mozilla.com/products
77
subscription-support-contact-support-plaintext = Contact support:

packages/fxa-payments-server/backstage.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ metadata:
1212
- node
1313
- react
1414
links:
15-
- url: https://subscriptions.firefox.com/
15+
- url: https://payments.firefox.com/
1616
title: Production Subscription Platform
1717
type: website
18-
- url: https://payments-server.allizom.org/
18+
- url: https://payments-next.allizom.org/
1919
title: Stage Subscription Platform
2020
type: website
2121
spec:

yarn.lock

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25289,6 +25289,17 @@ __metadata:
2528925289
languageName: node
2529025290
linkType: hard
2529125291

25292+
"axios@npm:1.12.0":
25293+
version: 1.12.0
25294+
resolution: "axios@npm:1.12.0"
25295+
dependencies:
25296+
follow-redirects: "npm:^1.15.6"
25297+
form-data: "npm:^4.0.4"
25298+
proxy-from-env: "npm:^1.1.0"
25299+
checksum: 10c0/44a1e4cfb69a2d59aa12bbc441a336e5c18e87c02b904c509fd33607d94e8cb8cc221c17e9d53f67841a4efe13abf1aa1497c85df390cdb8681ee723998d11b0
25300+
languageName: node
25301+
linkType: hard
25302+
2529225303
"axios@npm:1.8.4":
2529325304
version: 1.8.4
2529425305
resolution: "axios@npm:1.8.4"
@@ -34569,7 +34580,7 @@ __metadata:
3456934580
"@typescript-eslint/eslint-plugin": "npm:^5.59.0"
3457034581
"@typescript-eslint/parser": "npm:^7.1.1"
3457134582
audit-filter: "npm:^0.5.0"
34572-
axios: "npm:1.8.4"
34583+
axios: "npm:1.12.0"
3457334584
chance: "npm:^1.1.8"
3457434585
convict: "npm:^6.2.4"
3457534586
convict-format-with-moment: "npm:^6.2.0"

0 commit comments

Comments
 (0)