feat: send magic link email with new ip

numerique-gouv · Feb 8, 2024 · 2b94a41 · 2b94a41
1 parent 1c890c5
commit 2b94a41
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/cypress/e2e/signin_with_magic_link.cy.js b/cypress/e2e/signin_with_magic_link.cy.js
@@ -38,9 +38,7 @@ describe("sign-in with magic link", () => {
       // extract the connection link from the email subject
       .then((email) => {
         const matches =
-          /.*<a style="text-decoration:none; color:#fff; font-weight:normal;" target="_blank" href="([^"]+)"><strong>Se connecter<\/strong><\/a>.*/.exec(
-            email.body,
-          );
+          /.*<a href="([^"]+)" class="r13-r default-button".*/.exec(email.body);
         if (matches && matches.length > 0) {
           return matches[1];
         }

diff --git a/src/connectors/brevo.ts b/src/connectors/brevo.ts
@@ -10,14 +10,12 @@ import { BrevoApiError } from "../config/errors";
 import { render } from "../services/renderer";
 import { logger } from "../services/log";
 
-type RemoteDeprecatedTemplateSlug =
-  | "join-organization"
-  | "verify-email"
-  | "magic-link";
+type RemoteDeprecatedTemplateSlug = "join-organization" | "verify-email";
 type RemoteTemplateSlug =
   | "official-contact-email-verification"
   | "choose-sponsor"
-  | "reset-password";
+  | "reset-password"
+  | "magic-link";
 type LocalTemplateSlug =
   | "organization-welcome"
   | "unable-to-auto-join-organization"
@@ -30,7 +28,6 @@ const remoteTemplateSlugToBrevoDeprecatedTemplateId: {
 } = {
   "join-organization": 61,
   "verify-email": 6,
-  "magic-link": 29,
 };
 const defaultBrevoDeprecatedTemplateId = 21;
 const remoteTemplateSlugToBrevoTemplateId: {
@@ -39,8 +36,8 @@ const remoteTemplateSlugToBrevoTemplateId: {
   "official-contact-email-verification": 3,
   "choose-sponsor": 2,
   "reset-password": 5,
+  "magic-link": 1,
   // TODO: progressively uncomment these lines
-  // "magic-link": 1,
   // "join-organization": 4,
   // "verify-email": 6,
 };