feat(api): translate title with firstname for account creation email

1024pix · Jul 11, 2024 · 0d8d6a1 · 0d8d6a1
1 parent eb6f44c
commit 0d8d6a1
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 21 deletions.
diff --git a/api/lib/application/sco-organization-learners/sco-organization-learner-controller.js b/api/lib/application/sco-organization-learners/sco-organization-learner-controller.js
@@ -102,6 +102,7 @@ const createAndReconcileUserToOrganizationLearner = async function (
     password: payload.password,
     campaignCode: payload['campaign-code'],
     locale,
+    i18n: request.i18n,
   });
 
   return h.response().code(204);

diff --git a/api/lib/domain/services/mail-service.js b/api/lib/domain/services/mail-service.js
@@ -50,7 +50,7 @@ const PIX_HELPDESK_URL_INTERNATIONAL = {
  * @param redirectionUrl
  * @returns {Promise<EmailingAttempt>}
  */
-function sendAccountCreationEmail({ email, firstName, locale = FRENCH_FRANCE, token, redirectionUrl }) {
+function sendAccountCreationEmail({ email, firstName, locale = FRENCH_FRANCE, token, redirectionUrl, i18n }) {
   const mailerConfig = _getMailerConfig(locale);
   const redirectUrl = redirectionUrl || mailerConfig.pixAppConnectionUrl;
 
@@ -61,6 +61,7 @@ function sendAccountCreationEmail({ email, firstName, locale = FRENCH_FRANCE, to
     helpdeskUrl: mailerConfig.helpdeskUrl,
     displayNationalLogo: mailerConfig.displayNationalLogo,
     ...mailerConfig.translation['pix-account-creation-email'].params,
+    title: i18n.__({ phrase: 'pix-account-creation-email.params.title', locale }, { firstName }),
   };
   const pixName = mailerConfig.translation['email-sender-name']['pix-app'];
   const accountCreationEmailSubject = mailerConfig.translation['pix-account-creation-email'].subject;

diff --git a/api/lib/domain/usecases/create-and-reconcile-user-to-organization-learner.js b/api/lib/domain/usecases/create-and-reconcile-user-to-organization-learner.js
@@ -30,6 +30,7 @@ const createAndReconcileUserToOrganizationLearner = async function ({
   userService,
   passwordValidator,
   userValidator,
+  i18n,
 }) {
   const campaign = await campaignRepository.getByCode(campaignCode);
   if (!campaign) {
@@ -89,6 +90,7 @@ const createAndReconcileUserToOrganizationLearner = async function ({
       locale,
       token,
       redirectionUrl,
+      i18n,
     });
   }
   return createdUser;

diff --git a/api/src/identity-access-management/application/user/user.controller.js b/api/src/identity-access-management/application/user/user.controller.js
@@ -127,6 +127,7 @@ const save = async function (request, h, dependencies = { userSerializer, reques
     password,
     campaignCode,
     localeFromHeader,
+    i18n: request.i18n,
   });
 
   return h.response(dependencies.userSerializer.serialize(savedUser)).created();

diff --git a/api/src/identity-access-management/domain/usecases/create-user.usecase.js b/api/src/identity-access-management/domain/usecases/create-user.usecase.js
@@ -34,6 +34,7 @@ const createUser = async function ({
   userService,
   userValidator,
   passwordValidator,
+  i18n,
 }) {
   const isValid = await _validateData({
     password,
@@ -74,6 +75,7 @@ const createUser = async function ({
       locale: localeFromHeader,
       token,
       redirectionUrl,
+      i18n,
     });
 
     return savedUser;

diff --git a/api/tests/identity-access-management/integration/application/user.route.test.js b/api/tests/identity-access-management/integration/application/user.route.test.js
@@ -1,4 +1,5 @@
 import { identityAccessManagementRoutes } from '../../../../src/identity-access-management/application/routes.js';
+import * as i18nPlugin from '../../../../src/shared/infrastructure/plugins/i18n.js';
 import { expect, HttpTestServer } from '../../../test-helper.js';
 
 const routesUnderTest = identityAccessManagementRoutes[0];
@@ -8,6 +9,7 @@ describe('Integration | Identity Access Management | Application | Route | User'
 
   beforeEach(async function () {
     httpTestServer = new HttpTestServer();
+    await httpTestServer.register(i18nPlugin);
     await httpTestServer.register(routesUnderTest);
   });
 

diff --git a/api/tests/identity-access-management/integration/domain/usecases/create-user.usecase.test.js b/api/tests/identity-access-management/integration/domain/usecases/create-user.usecase.test.js
@@ -1,6 +1,7 @@
 import { User } from '../../../../../src/identity-access-management/domain/models/User.js';
 import { usecases } from '../../../../../src/identity-access-management/domain/usecases/index.js';
 import { expect } from '../../../../test-helper.js';
+import { getI18n } from '../../../../tooling/i18n/i18n.js';
 
 describe('Integration | Identity Access Management | Domain | UseCase | create-user', function () {
   it('returns the saved user', async function () {
@@ -10,7 +11,7 @@ describe('Integration | Identity Access Management | Domain | UseCase | create-u
     const password = 'P@ssW0rd';
 
     // when
-    const savedUser = await usecases.createUser({ password, user });
+    const savedUser = await usecases.createUser({ password, user, i18n: getI18n() });
 
     // then
     expect(savedUser).to.be.instanceOf(User);

diff --git a/api/tests/identity-access-management/unit/application/user.controller.test.js b/api/tests/identity-access-management/unit/application/user.controller.test.js
@@ -278,6 +278,7 @@ describe('Unit | Identity Access Management | Application | Controller | User',
             password,
             localeFromHeader,
             campaignCode: null,
+            i18n: undefined,
           };
 
           dependencies.localeService.getCanonicalLocale.returns(localeFromCookie);

diff --git a/api/tests/identity-access-management/unit/domain/usecases/create-user.usecase.test.js b/api/tests/identity-access-management/unit/domain/usecases/create-user.usecase.test.js
@@ -473,6 +473,7 @@ describe('Unit | Identity Access Management | Domain | UseCase | create-user', f
           locale: localeFromHeader,
           token,
           redirectionUrl: expectedRedirectionUrl,
+          i18n: undefined,
         });
       });
 
@@ -508,6 +509,7 @@ describe('Unit | Identity Access Management | Domain | UseCase | create-user', f
             locale: localeFromHeader,
             token,
             redirectionUrl: expectedRedirectionUrl,
+            i18n: undefined,
           });
         });
       });
@@ -545,6 +547,7 @@ describe('Unit | Identity Access Management | Domain | UseCase | create-user', f
             locale: localeFromHeader,
             token,
             redirectionUrl: expectedRedirectionUrl,
+            i18n: undefined,
           });
         });
       });
@@ -583,6 +586,7 @@ describe('Unit | Identity Access Management | Domain | UseCase | create-user', f
         locale: localeFromHeader,
         token,
         redirectionUrl,
+        i18n: undefined,
       });
       expect(createdUser).to.deep.equal(savedUser);
     });

diff --git a/...sts/integration/domain/usecases/create-and-reconcile-user-to-organization-learner_test.js b/...sts/integration/domain/usecases/create-and-reconcile-user-to-organization-learner_test.js
@@ -22,6 +22,9 @@ import * as userService from '../../../../src/shared/domain/services/user-servic
 import * as passwordValidator from '../../../../src/shared/domain/validators/password-validator.js';
 import * as userValidator from '../../../../src/shared/domain/validators/user-validator.js';
 import { catchErr, databaseBuilder, expect } from '../../../test-helper.js';
+import { getI18n } from '../../../tooling/i18n/i18n.js';
+
+const i18n = getI18n();
 
 describe('Integration | UseCases | create-and-reconcile-user-to-organization-learner', function () {
   const pickUserAttributes = ['firstName', 'lastName', 'email', 'username', 'cgu'];
@@ -50,6 +53,7 @@ describe('Integration | UseCases | create-and-reconcile-user-to-organization-lea
         obfuscationService,
         userReconciliationService,
         userService,
+        i18n,
       });
 
       // then
@@ -86,6 +90,7 @@ describe('Integration | UseCases | create-and-reconcile-user-to-organization-lea
         obfuscationService,
         userReconciliationService,
         userService,
+        i18n,
       });
 
       // then
@@ -135,6 +140,7 @@ describe('Integration | UseCases | create-and-reconcile-user-to-organization-lea
           obfuscationService,
           userReconciliationService,
           userService,
+          i18n,
         });
 
         // then
@@ -195,6 +201,7 @@ describe('Integration | UseCases | create-and-reconcile-user-to-organization-lea
             userService,
             passwordValidator,
             userValidator,
+            i18n,
           });
 
           // then
@@ -238,6 +245,7 @@ describe('Integration | UseCases | create-and-reconcile-user-to-organization-lea
             obfuscationService,
             userReconciliationService,
             userService,
+            i18n,
           });
 
           // then
@@ -258,6 +266,7 @@ describe('Integration | UseCases | create-and-reconcile-user-to-organization-lea
             locale,
             password,
             userAttributes,
+            i18n,
           });
 
           // then
@@ -325,6 +334,7 @@ describe('Integration | UseCases | create-and-reconcile-user-to-organization-lea
             obfuscationService,
             userReconciliationService,
             userService,
+            i18n,
           });
 
           // then
@@ -366,6 +376,7 @@ describe('Integration | UseCases | create-and-reconcile-user-to-organization-lea
             userService,
             passwordValidator,
             userValidator,
+            i18n,
           });
 
           // then