Merge pull request #19957 from mozilla/FXA-12966

task(auth): Configure email renderer to use auth.ftl for now

Author: dschom

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

@@ -9,6 +9,7 @@ import { determineLocale, parseAcceptLanguage } from '@fxa/shared/l10n';
 export type LocalizerOpts = {
   translations: {
     basePath: string;
+    ftlFileName: string;
   };
   templates: {
     cssPath: string;
@@ -135,17 +136,14 @@ class Localizer {
    */
   protected async fetchTranslatedMessages(locale?: string) {
     const results: string[] = [];
+    const basePath = this.bindings.opts.translations.basePath;
+    const ftlFileName = this.bindings.opts.translations.ftlFileName;
 
     // Note: 'en' auth.ftl only exists for browser bindings / Storybook. The fallback
     // English strings within the templates are tested and are shown in other envs
-    const authPath = `${this.bindings.opts.translations.basePath}/${
-      locale || 'en'
-    }/emails.ftl`;
-    results.push(await this.bindings.fetchResource(authPath));
-
-    const brandingPath = `${this.bindings.opts.translations.basePath}/${
-      locale || 'en'
-    }/branding.ftl`;
+    const mainFtlPath = `${basePath}/${locale || 'en'}/${ftlFileName}`;
+    const brandingPath = `${basePath}/${locale || 'en'}/branding.ftl`;
+    results.push(await this.bindings.fetchResource(mainFtlPath));
     results.push(await this.bindings.fetchResource(brandingPath));
 
     return results.join('\n\n\n');

libs/accounts/email-renderer/src/renderer/bindings-browser.ts

@@ -58,6 +58,7 @@ export class BrowserRendererBindings extends RendererBindings {
         },
         translations: {
           basePath: './public/locales',
+          ftlFileName: 'emails.ftl',
         },
       },
       opts

libs/accounts/email-renderer/src/renderer/bindings-node.ts

@@ -45,6 +45,7 @@ export class NodeRendererBindings extends RendererBindings {
         },
         translations: {
           basePath: join(__dirname, '../../public/locales'),
+          ftlFileName: 'emails.ftl',
         },
       },
       opts

packages/fxa-auth-server/bin/key_server.js

@@ -10,7 +10,7 @@ const Sentry = require('@sentry/node');
 
 const { config } = require('../config');
 const Redis = require('ioredis');
-
+const { join } = require('node:path');
 const { CapabilityManager } = require('@fxa/payments/capability');
 const { EligibilityManager } = require('@fxa/payments/eligibility');
 const {
@@ -377,7 +377,15 @@ async function run(config) {
     emailSender,
     linkBuilder,
     config.smtp,
-    new NodeRendererBindings()
+    new NodeRendererBindings({
+      translations: {
+        // TODO: Once this PR, https://github.com/mozilla/fxa-content-server-l10n/pull/989, is finalized we can:
+        //  - switch this to point libs/accounts/public/locales or ../public/locales (either is probably fine...)
+        //  - switch to using emails.ftl, since all email specific strings will have been migrated over
+        basePath: join(__dirname, '../public/locales'),
+        ftlFileName: 'auth.ftl',
+      },
+    })
   );
   Container.set(FxaMailer, fxaMailer);