From 91da5ae9772b64baf267e3f77316bd8312b2980a Mon Sep 17 00:00:00 2001 From: ClementGld Date: Tue, 3 May 2022 16:57:05 +0200 Subject: [PATCH 1/6] feat: modify template to have easy acces sendgrid --- apps/lenra/lib/lenra/services/email_services.ex | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/apps/lenra/lib/lenra/services/email_services.ex b/apps/lenra/lib/lenra/services/email_services.ex index d14cdf5f..3c5b5d90 100644 --- a/apps/lenra/lib/lenra/services/email_services.ex +++ b/apps/lenra/lib/lenra/services/email_services.ex @@ -10,17 +10,8 @@ defmodule Lenra.EmailService do new_email() |> to(email_address) |> from("no-reply@lenra.io") - |> SendGridHelper.with_template("d-bd160809d9a04b07ac6925a823f8f61c") - |> SendGridHelper.add_dynamic_field("subject", "Bienvenue !") - |> SendGridHelper.add_dynamic_field( - "body_hello", - "Bonjour " <> email_address <> ",
Merci pour votre inscription! Vous rejoignez une communauté incroyable" - ) + |> SendGridHelper.with_template("d-311a3dc52f6d44c2b613e3367e7ba82b") |> SendGridHelper.add_dynamic_field("code", code) - |> SendGridHelper.add_dynamic_field( - "body_help", - "Ce code vous permet de valider votre inscription.
Si vous rencontrez un problème contactez-nous à l'adresse mail suivante : contact@lenra.io" - ) end @spec create_recovery_email(String.t(), String.t()) :: Bamboo.Email.t() From 73c401597abca9cf67e23b3c19260d01fcb50c4a Mon Sep 17 00:00:00 2001 From: ClementGld Date: Wed, 4 May 2022 10:24:36 +0200 Subject: [PATCH 2/6] modify password lost and invitation --- .../lib/lenra/services/email_services.ex | 32 ++++--------------- .../lenra/lib/lenra/services/user_services.ex | 3 +- .../lenra/services/user_services_test.exs | 11 +++---- 3 files changed, 13 insertions(+), 33 deletions(-) diff --git a/apps/lenra/lib/lenra/services/email_services.ex b/apps/lenra/lib/lenra/services/email_services.ex index 3c5b5d90..6f60a5f8 100644 --- a/apps/lenra/lib/lenra/services/email_services.ex +++ b/apps/lenra/lib/lenra/services/email_services.ex @@ -11,45 +11,27 @@ defmodule Lenra.EmailService do |> to(email_address) |> from("no-reply@lenra.io") |> SendGridHelper.with_template("d-311a3dc52f6d44c2b613e3367e7ba82b") - |> SendGridHelper.add_dynamic_field("code", code) + |> SendGridHelper.add_dynamic_field("token", code) end @spec create_recovery_email(String.t(), String.t()) :: Bamboo.Email.t() def create_recovery_email(email_address, code) do + # base template ID : d-4f7744c575434313a767f1b11cc389c1 new_email() |> to(email_address) |> from("no-reply@lenra.io") - |> SendGridHelper.with_template("d-bd160809d9a04b07ac6925a823f8f61c") - |> SendGridHelper.add_dynamic_field("subject", "Votre code de vérification") - |> SendGridHelper.add_dynamic_field( - "body_hello", - "Bonjour " <> email_address <> ",
Modifiez votre mot de passe à l'aide du code suivant" - ) - |> SendGridHelper.add_dynamic_field("code", code) - |> SendGridHelper.add_dynamic_field( - "body_help", - "Ce code vous permet de modifier votre mot de passe.
Si vous rencontrez un problème contactez-nous à l'adresse mail suivante : contact@lenra.io" - ) + |> SendGridHelper.with_template("d-4f7744c575434313a767f1b11cc389c1") + |> SendGridHelper.add_dynamic_field("token", code) end @spec create_invitation_email(String.t(), String.t(), String.t()) :: Bamboo.Email.t() def create_invitation_email(email_address, application_name, app_link) do + # base template ID : d-61866b0c62b347d3880155d680036f65 new_email() |> to(email_address) |> from("no-reply@lenra.io") - |> SendGridHelper.with_template("d-1d702d4b28b94b2da1bb713ac091f9fa") - |> SendGridHelper.add_dynamic_field("subject", "Invitation à rejoindre une application sur Lenra") - |> SendGridHelper.add_dynamic_field( - "body_hello", - "Bonjour,
Vous avez été invité à rejoindre " <> - application_name <> - " sur Lenra.
Pour y accéder, cliquez sur le lien suivant:" - ) + |> SendGridHelper.with_template("d-61866b0c62b347d3880155d680036f65") + |> SendGridHelper.add_dynamic_field("application_name", application_name) |> SendGridHelper.add_dynamic_field("link", app_link) - |> SendGridHelper.add_dynamic_field( - "body_help", - "Si vous rencontrez un problème contactez-nous à l'adresse mail suivante : contact@lenra.io" - ) - |> SendGridHelper.add_dynamic_field("goodbye", "A bientôt !") end end diff --git a/apps/lenra/lib/lenra/services/user_services.ex b/apps/lenra/lib/lenra/services/user_services.ex index 8bbfbd9f..12fab0ee 100644 --- a/apps/lenra/lib/lenra/services/user_services.ex +++ b/apps/lenra/lib/lenra/services/user_services.ex @@ -32,8 +32,7 @@ defmodule Lenra.UserServices do RegistrationCodeServices.registration_code_changeset(user) end ) - ## Temporary disable the email sending for the registration. - # |> Ecto.Multi.run(:add_event, &add_registration_events/2) + |> Ecto.Multi.run(:add_event, &add_registration_events/2) |> Repo.transaction() end diff --git a/apps/lenra/test/lenra/services/user_services_test.exs b/apps/lenra/test/lenra/services/user_services_test.exs index 31c411c4..6c3ccec2 100644 --- a/apps/lenra/test/lenra/services/user_services_test.exs +++ b/apps/lenra/test/lenra/services/user_services_test.exs @@ -22,14 +22,13 @@ defmodule UserServicesTest do assert String.length(registration_code.code) == 8 end - # Uncomment when the email service is enabled - # test "send email after registration" do - # {:ok, %{inserted_user: user, inserted_registration_code: registration_code}} = register_john_doe() + test "send email after registration" do + {:ok, %{inserted_user: user, inserted_registration_code: registration_code}} = register_john_doe() - # email = EmailService.create_welcome_email(user.email, registration_code.code) + email = EmailService.create_welcome_email(user.email, registration_code.code) - # assert_delivered_email(email) - # end + assert_delivered_email(email) + end test "send email for a password recovery" do {:ok, %{inserted_user: user}} = register_john_doe() From 7a21fb576cd572d58aebde4b79a9f3a7f9f2df11 Mon Sep 17 00:00:00 2001 From: ClementGld Date: Wed, 4 May 2022 10:32:21 +0200 Subject: [PATCH 3/6] comment send registration email --- apps/lenra/lib/lenra/services/user_services.ex | 3 ++- apps/lenra/test/lenra/services/user_services_test.exs | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/apps/lenra/lib/lenra/services/user_services.ex b/apps/lenra/lib/lenra/services/user_services.ex index 12fab0ee..a77d74ed 100644 --- a/apps/lenra/lib/lenra/services/user_services.ex +++ b/apps/lenra/lib/lenra/services/user_services.ex @@ -32,7 +32,8 @@ defmodule Lenra.UserServices do RegistrationCodeServices.registration_code_changeset(user) end ) - |> Ecto.Multi.run(:add_event, &add_registration_events/2) + ## Temporary disable the email sending for the registration + # |> Ecto.Multi.run(:add_event, &add_registration_events/2) |> Repo.transaction() end diff --git a/apps/lenra/test/lenra/services/user_services_test.exs b/apps/lenra/test/lenra/services/user_services_test.exs index 6c3ccec2..0257c179 100644 --- a/apps/lenra/test/lenra/services/user_services_test.exs +++ b/apps/lenra/test/lenra/services/user_services_test.exs @@ -22,13 +22,14 @@ defmodule UserServicesTest do assert String.length(registration_code.code) == 8 end - test "send email after registration" do - {:ok, %{inserted_user: user, inserted_registration_code: registration_code}} = register_john_doe() + # Uncomment when the email service is enables + # test "send email after registration" do + # {:ok, %{inserted_user: user, inserted_registration_code: registration_code}} = register_john_doe() - email = EmailService.create_welcome_email(user.email, registration_code.code) + # email = EmailService.create_welcome_email(user.email, registration_code.code) - assert_delivered_email(email) - end + # assert_delivered_email(email) + # end test "send email for a password recovery" do {:ok, %{inserted_user: user}} = register_john_doe() From 52c76f11121abfd9b6542cbd476db8268b46f2a5 Mon Sep 17 00:00:00 2001 From: Jonas Martinez <36544012+jonas-martinez@users.noreply.github.com> Date: Wed, 4 May 2022 11:29:33 +0200 Subject: [PATCH 4/6] Update apps/lenra/lib/lenra/services/user_services.ex --- apps/lenra/lib/lenra/services/user_services.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/lenra/lib/lenra/services/user_services.ex b/apps/lenra/lib/lenra/services/user_services.ex index a77d74ed..8bbfbd9f 100644 --- a/apps/lenra/lib/lenra/services/user_services.ex +++ b/apps/lenra/lib/lenra/services/user_services.ex @@ -32,7 +32,7 @@ defmodule Lenra.UserServices do RegistrationCodeServices.registration_code_changeset(user) end ) - ## Temporary disable the email sending for the registration + ## Temporary disable the email sending for the registration. # |> Ecto.Multi.run(:add_event, &add_registration_events/2) |> Repo.transaction() end From 2bcf82e619eac09228b40b620d4afe2bcd92a338 Mon Sep 17 00:00:00 2001 From: Jonas Martinez <36544012+jonas-martinez@users.noreply.github.com> Date: Wed, 4 May 2022 11:29:49 +0200 Subject: [PATCH 5/6] Update apps/lenra/test/lenra/services/user_services_test.exs --- apps/lenra/test/lenra/services/user_services_test.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/lenra/test/lenra/services/user_services_test.exs b/apps/lenra/test/lenra/services/user_services_test.exs index 0257c179..31c411c4 100644 --- a/apps/lenra/test/lenra/services/user_services_test.exs +++ b/apps/lenra/test/lenra/services/user_services_test.exs @@ -22,7 +22,7 @@ defmodule UserServicesTest do assert String.length(registration_code.code) == 8 end - # Uncomment when the email service is enables + # Uncomment when the email service is enabled # test "send email after registration" do # {:ok, %{inserted_user: user, inserted_registration_code: registration_code}} = register_john_doe() From 938a98aff62c0d4cb8c640d2d75f387a2292968f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Guillaud?= <91874264+ClementGld@users.noreply.github.com> Date: Wed, 4 May 2022 14:15:06 +0200 Subject: [PATCH 6/6] Update apps/lenra/lib/lenra/services/email_services.ex Co-authored-by: Jonas Martinez <36544012+jonas-martinez@users.noreply.github.com> --- apps/lenra/lib/lenra/services/email_services.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/lenra/lib/lenra/services/email_services.ex b/apps/lenra/lib/lenra/services/email_services.ex index 6f60a5f8..c6028464 100644 --- a/apps/lenra/lib/lenra/services/email_services.ex +++ b/apps/lenra/lib/lenra/services/email_services.ex @@ -32,6 +32,6 @@ defmodule Lenra.EmailService do |> from("no-reply@lenra.io") |> SendGridHelper.with_template("d-61866b0c62b347d3880155d680036f65") |> SendGridHelper.add_dynamic_field("application_name", application_name) - |> SendGridHelper.add_dynamic_field("link", app_link) + |> SendGridHelper.add_dynamic_field("app_link", app_link) end end