feat(email): use smtp protocol and @kita/html for email templates

numerique-gouv · Aug 20, 2024 · 230fdd8 · 230fdd8
1 parent f56812b
commit 230fdd8
Show file tree

Hide file tree

Showing 29 changed files with 993 additions and 210 deletions.
diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml
@@ -123,6 +123,9 @@ jobs:
           - 5432:5432
     steps:
       - uses: actions/checkout@v4
+
+      - run: docker compose up --build --detach maildev
+
       - uses: actions/setup-node@v4
         with:
           cache: "npm"

diff --git a/cypress.config.ts b/cypress.config.ts
@@ -23,4 +23,10 @@ export default defineConfig({
       return config;
     },
   },
+  env: {
+    MAILDEV_PROTOCOL: "http",
+    MAILDEV_HOST: "localhost",
+    MAILDEV_SMTP_PORT: "1025",
+    MAILDEV_API_PORT: "1080",
+  },
 });
diff --git a/cypress/e2e/delete_totp/index.cy.ts b/cypress/e2e/delete_totp/index.cy.ts
@@ -1,14 +1,6 @@
 import { generateToken } from "@sunknudsen/totp";
 
 describe("delete TOTP connexion", () => {
-  before(() => {
-    cy.mailslurp().then((mailslurp) =>
-      mailslurp.inboxController.deleteAllInboxEmails({
-        inboxId: "eab4ab97-875d-4ec7-bdcc-04323948ee63",
-      }),
-    );
-  });
-
   it("should delete TOTP application", function () {
     // Visit the signup page
     cy.visit(`/users/start-sign-in`);
@@ -40,21 +32,15 @@ describe("delete TOTP connexion", () => {
 
     cy.contains("L’application d’authentification a bien été supprimée.");
 
-    cy.mailslurp()
-      // use inbox id and a timeout of 30 seconds
-      .then((mailslurp) =>
-        mailslurp.waitForLatestEmail(
-          "eab4ab97-875d-4ec7-bdcc-04323948ee63",
-          60000,
-          true,
-        ),
-      )
-      // check subject of deletion email
-      .then((email) => {
-        expect(email.subject).to.include(
-          "Suppression d'une application d'authentification à double facteur",
-        );
-      });
+    cy.maildevGetLastMessage().then((email) => {
+      expect(email.subject).to.equal(
+        "Suppression d'une application d'authentification à double facteur",
+      );
+      cy.maildevVisitMessageById(email.id);
+      cy.contains(
+        "L'application a été supprimée comme étape de connexion à deux facteurs.",
+      );
+    });
   });
 
   it("should disable TOTP", function () {
@@ -86,20 +72,14 @@ describe("delete TOTP connexion", () => {
 
     cy.contains("Désactiver la validation en deux étapes").click();
 
-    cy.mailslurp()
-      // use inbox id and a timeout of 30 seconds
-      .then((mailslurp) =>
-        mailslurp.waitForLatestEmail(
-          "c9fabb94-9274-4ece-a3d0-54b1987c8588",
-          60000,
-          true,
-        ),
-      )
-      // check subject of deletion email
-      .then((email) => {
-        expect(email.subject).to.include(
-          "Désactivation de la validation en deux étapes",
-        );
-      });
+    cy.maildevGetLastMessage().then((email) => {
+      expect(email.subject).to.equal(
+        "Désactivation de la validation en deux étapes",
+      );
+      cy.maildevVisitMessageById(email.id);
+      cy.contains(
+        "Votre compte MonComptePro n'est plus protégé par la validation en deux",
+      );
+    });
   });
 });
diff --git a/cypress/e2e/update_personal_information/index.cy.ts b/cypress/e2e/update_personal_information/index.cy.ts
@@ -1,12 +1,4 @@
 describe("Signup into new entreprise unipersonnelle", () => {
-  before(() => {
-    cy.mailslurp().then((mailslurp) =>
-      mailslurp.inboxController.deleteAllInboxEmails({
-        inboxId: "716fc7c8-8828-48d5-b748-57dd4e78e55a",
-      }),
-    );
-  });
-
   it("Should send email when user updates personal information", function () {
     // Visit the signup page
     cy.visit(`/users/start-sign-in`);
@@ -31,20 +23,13 @@ describe("Signup into new entreprise unipersonnelle", () => {
 
     cy.contains("Vos informations ont été mises à jour.");
 
-    cy.mailslurp()
-      // use inbox id and a timeout of 30 seconds
-      .then((mailslurp) =>
-        mailslurp.waitForLatestEmail(
-          "716fc7c8-8828-48d5-b748-57dd4e78e55a",
-          60000,
-          true,
-        ),
-      )
-      // check subject of deletion email
-      .then((email) => {
-        expect(email.subject).to.include(
-          "Mise à jour de vos données personnelles",
-        );
-      });
+    cy.maildevGetLastMessage().then((email) => {
+      expect(email.subject).to.equal("Mise à jour de vos données personnelles");
+      cy.maildevVisitMessageById(email.id);
+      cy.contains(
+        "Nous vous informons que vos données personnelles ont été mises à jour avec succès.",
+      );
+      cy.maildevDeleteMessageById(email.id);
+    });
   });
 });
diff --git a/cypress/e2e/update_totp_application/index.cy.ts b/cypress/e2e/update_totp_application/index.cy.ts
@@ -1,13 +1,6 @@
 import { generateToken } from "@sunknudsen/totp";
 
 describe("update TOTP application", () => {
-  before(() => {
-    cy.mailslurp().then((mailslurp) =>
-      mailslurp.inboxController.deleteAllInboxEmails({
-        inboxId: "d2469f84-9547-4190-b989-014876fd54ae",
-      }),
-    );
-  });
   it("should update TOTP application, and replace old app with new", function () {
     // Visit the signup page
     cy.visit(`/users/start-sign-in`);
@@ -52,20 +45,16 @@ describe("update TOTP application", () => {
       });
 
     cy.contains("L’application d’authentification a été modifiée.");
-    cy.mailslurp()
-      // use inbox id and a timeout of 30 seconds
-      .then((mailslurp) =>
-        mailslurp.waitForLatestEmail(
-          "d2469f84-9547-4190-b989-014876fd54ae",
-          60000,
-          true,
-        ),
-      )
-      // check subject of deletion email
-      .then((email) => {
-        expect(email.subject).to.include(
-          "Changement d'application d’authentification",
-        );
-      });
+
+    cy.maildevGetLastMessage().then((email) => {
+      expect(email.subject).to.equal(
+        "Changement d'application d’authentification",
+      );
+      cy.maildevVisitMessageById(email.id);
+      cy.contains(
+        "Le changement d'application d'authentification a bien été prise en compte.",
+      );
+      cy.maildevDeleteMessageById(email.id);
+    });
   });
 });
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
@@ -13,7 +13,7 @@
 // https://on.cypress.io/configuration
 // ***********************************************************
 
-import "cypress-mailslurp";
 import "cypress-axe";
-
+import "cypress-maildev";
+import "cypress-mailslurp";
 import "./commands";
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -67,5 +67,9 @@ services:
       STYLESHEET_URL:
     network_mode: "host"
 
+  maildev:
+    image: soulteary/maildev
+    network_mode: "host"
+
 volumes:
   db-data: