Fix email change confirmation (#172)

* Update translation files

I run `mix gettext.extract` and `mix gettext.merge priv/gettext`
as it seems that the files were somewhat outdated.

* Fix email change confirmation

Send the confirmation email to the new address

* Tweak email change confirmation email

* Run ./dev.sh format

Author: raulrpearson

lib/claper/accounts/user_notifier.ex

@@ -52,7 +52,7 @@ defmodule Claper.Accounts.UserNotifier do
   Deliver instructions to update a user email.
   """
   def deliver_update_email_instructions(user, url) do
-    Claper.Workers.Mailers.new_update_email(user.id, url) |> Oban.insert()
+    Claper.Workers.Mailers.new_update_email(user.email, url) |> Oban.insert()
 
     {:ok, :enqueued}
   end

lib/claper/workers/mailers.ex

@@ -6,19 +6,25 @@ defmodule Claper.Workers.Mailers do
 
   @impl Oban.Worker
   def perform(%Oban.Job{args: %{"type" => type, "user_id" => user_id, "url" => url}})
-      when type in ["confirm", "reset", "update_email"] do
+      when type in ["confirm", "reset"] do
     user = Claper.Accounts.get_user!(user_id)
 
     email =
       case type do
         "confirm" -> UserNotifier.confirm(user, url)
         "reset" -> UserNotifier.reset(user, url)
-        "update_email" -> UserNotifier.update_email(user, url)
       end
 
     Mailer.deliver(email)
   end
 
+  def perform(%Oban.Job{
+        args: %{"type" => "update_email", "new_email" => new_email, "url" => url}
+      }) do
+    email = UserNotifier.update_email(new_email, url)
+    Mailer.deliver(email)
+  end
+
   def perform(%Oban.Job{args: %{"type" => "magic", "email" => email, "url" => url}}) do
     email = UserNotifier.magic(email, url)
     Mailer.deliver(email)
@@ -50,8 +56,8 @@ defmodule Claper.Workers.Mailers do
     new(%{type: "reset", user_id: user_id, url: url})
   end
 
-  def new_update_email(user_id, url) do
-    new(%{type: "update_email", user_id: user_id, url: url})
+  def new_update_email(new_email, url) do
+    new(%{type: "update_email", new_email: new_email, url: url})
   end
 
   def new_magic_link(email, url) do

lib/claper_web/notifiers/user_notifier.ex

@@ -24,15 +24,15 @@ defmodule ClaperWeb.Notifiers.UserNotifier do
     |> render_body("welcome.html", %{email: email})
   end
 
-  def update_email(user, url) do
+  def update_email(new_email, url) do
     new()
-    |> to(user.email)
+    |> to(new_email)
     |> from(
       {Application.get_env(:claper, :mail) |> Keyword.get(:from_name),
        Application.get_env(:claper, :mail) |> Keyword.get(:from)}
     )
     |> subject(gettext("Update email instructions"))
-    |> render_body("change.html", %{user: user, url: url})
+    |> render_body("change.html", %{url: url})
   end
 
   def confirm(user, url) do

lib/claper_web/templates/user_notifier/change.html.heex

@@ -14,12 +14,12 @@
       <tr>
         <td style="padding:0 35px;">
           <h1 style="color:#1e1e2d; font-weight:500; margin:0;font-size:32px;font-family:'Rubik',sans-serif;">
-            {gettext("Confirm email")}
+            {gettext("Confirm email change")}
           </h1>
           <span style="display:inline-block; vertical-align:middle; margin:29px 0 26px; border-bottom:1px solid #cecece; width:100px;">
           </span>
           <p style="color:#455056; font-size:15px;line-height:24px; margin:0;">
-            {gettext("You can change your email by visiting the URL below")}
+            {gettext("You can confirm your email change by visiting the URL below")}
           </p>
           <a
             href={@url}
@@ -29,7 +29,7 @@
             {gettext("CONFIRM EMAIL")}
           </a>
           <p style="color:#455056; font-size:15px;line-height:24px; margin-top:26px;">
-            {gettext("If you didn't create an account with us, please ignore this.")}
+            {gettext("If you didn't request an email change, please ignore this.")}
           </p>
         </td>
       </tr>