Skip to content

Commit d8e0aee

Browse files
authored
Merge pull request #19870 from mozilla/PAY-2290
feat(auth): disable duplicate upgrade email, remove stub account email
2 parents c284b33 + b9a790b commit d8e0aee

27 files changed

Lines changed: 40 additions & 673 deletions

File tree

libs/accounts/email-renderer/src/renderer/subplat-email-renderer.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import * as SubscriptionLayouts from '../layouts/subscription';
33
import * as DownloadSubscription from '../templates/downloadSubscription';
44
import * as FraudulentAccountDeletion from '../templates/fraudulentAccountDeletion';
55
import * as SubscriptionAccountDeletion from '../templates/subscriptionAccountDeletion';
6-
import * as SubscriptionAccountFinishSetup from '../templates/subscriptionAccountFinishSetup';
76
import * as SubscriptionAccountReminderFirst from '../templates/subscriptionAccountReminderFirst';
87
import * as SubscriptionAccountReminderSecond from '../templates/subscriptionAccountReminderSecond';
98
import * as SubscriptionCancellation from '../templates/subscriptionCancellation';
@@ -64,20 +63,6 @@ export class SubplatEmailRender extends EmailRenderer {
6463
});
6564
}
6665

67-
async renderSubscriptionAccountFinishSetup(
68-
templateValues: SubscriptionAccountFinishSetup.TemplateData,
69-
layoutTemplateValues: SubscriptionLayouts.TemplateData
70-
) {
71-
return this.renderEmail({
72-
template: SubscriptionAccountFinishSetup.template,
73-
version: SubscriptionAccountFinishSetup.version,
74-
layout: SubscriptionAccountFinishSetup.layout,
75-
includes: SubscriptionAccountFinishSetup.includes,
76-
...templateValues,
77-
...layoutTemplateValues,
78-
});
79-
}
80-
8166
async renderSubscriptionAccountReminderFirst(
8267
templateValues: SubscriptionAccountReminderFirst.TemplateData,
8368
layoutTemplateValues: SubscriptionLayouts.TemplateData

libs/accounts/email-renderer/src/templates/subscriptionAccountFinishSetup/en.ftl

Lines changed: 0 additions & 9 deletions
This file was deleted.

libs/accounts/email-renderer/src/templates/subscriptionAccountFinishSetup/includes.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

libs/accounts/email-renderer/src/templates/subscriptionAccountFinishSetup/index.mjml

Lines changed: 0 additions & 34 deletions
This file was deleted.

libs/accounts/email-renderer/src/templates/subscriptionAccountFinishSetup/index.stories.ts

Lines changed: 0 additions & 62 deletions
This file was deleted.

libs/accounts/email-renderer/src/templates/subscriptionAccountFinishSetup/index.ts

Lines changed: 0 additions & 31 deletions
This file was deleted.

libs/accounts/email-renderer/src/templates/subscriptionAccountFinishSetup/index.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

packages/fxa-admin-server/src/config/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,6 @@ const conf = convict({
925925
'verifyLogin',
926926
'recovery',
927927
'unblockCode',
928-
'subscriptionAccountFinishSetup',
929928
],
930929
env: 'BOUNCES_IGNORE_TEMPLATES',
931930
},

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,6 @@ const convictConf = convict({
602602
'verifyLogin',
603603
'recovery',
604604
'unblockCode',
605-
'subscriptionAccountFinishSetup',
606605
],
607606
env: 'BOUNCES_IGNORE_TEMPLATES',
608607
},

packages/fxa-auth-server/lib/metrics/amplitude.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ const { version: VERSION } = require('../../package.json');
2323

2424
// Maps template name to email type
2525
const EMAIL_TYPES = {
26-
subscriptionAccountFinishSetup: 'subscription_account_finish_setup',
2726
subscriptionAccountReminderFirst: 'subscription_account_finish_setup',
2827
subscriptionAccountReminderSecond: 'subscription_account_finish_setup',
2928
subscriptionReactivation: 'subscription_reactivation',

0 commit comments

Comments
 (0)