Move to GraphQL

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

lib/mobilizon/actors/service/activation.ex

@@ -3,6 +3,7 @@ defmodule Mobilizon.Actors.Service.Activation do
 
   alias Mobilizon.{Mailer, Repo, Actors.User, Actors}
   alias Mobilizon.Email.User, as: UserEmail
+  alias Mobilizon.Actors.Service.Tools
 
   require Logger
 
@@ -15,7 +16,8 @@ defmodule Mobilizon.Actors.Service.Activation do
              "confirmation_sent_at" => nil,
              "confirmation_token" => nil
            }) do
-      {:ok, Repo.preload(user, :actors)}
+      Logger.info("User #{user.email} has been confirmed")
+      {:ok, user}
     else
       _err ->
         {:error, "Invalid token"}
@@ -23,8 +25,12 @@ defmodule Mobilizon.Actors.Service.Activation do
   end
 
   def resend_confirmation_email(%User{} = user, locale \\ "en") do
-    {:ok, user} = Actors.update_user(user, %{"confirmation_sent_at" => DateTime.utc_now()})
-    send_confirmation_email(user, locale)
+    with :ok <- Tools.we_can_send_email(user, :confirmation_sent_at),
+         {:ok, user} <- Actors.update_user(user, %{"confirmation_sent_at" => DateTime.utc_now()}) do
+      send_confirmation_email(user, locale)
+      Logger.info("Sent confirmation email again to #{user.email}")
+      {:ok, user.email}
+    end
   end
 
   def send_confirmation_email(%User{} = user, locale \\ "en") do

lib/mobilizon/actors/service/reset_password.ex

@@ -5,6 +5,7 @@ defmodule Mobilizon.Actors.Service.ResetPassword do
 
   alias Mobilizon.{Mailer, Repo, Actors.User}
   alias Mobilizon.Email.User, as: UserEmail
+  alias Mobilizon.Actors.Service.Tools
 
   @doc """
   Check that the provided token is correct and update provided password
@@ -20,7 +21,7 @@ defmodule Mobilizon.Actors.Service.ResetPassword do
                "reset_password_token" => nil
              })
            ) do
-      {:ok, Repo.preload(user, :actors)}
+      {:ok, user}
     else
       err ->
         {:error, :invalid_token}
@@ -32,11 +33,11 @@ defmodule Mobilizon.Actors.Service.ResetPassword do
   """
   @spec send_password_reset_email(User.t(), String.t()) :: tuple
   def send_password_reset_email(%User{} = user, locale \\ "en") do
-    with :ok <- we_can_send_email(user),
+    with :ok <- Tools.we_can_send_email(user, :reset_password_sent_at),
          {:ok, %User{} = user_updated} <-
            Repo.update(
              User.send_password_reset_changeset(user, %{
-               "reset_password_token" => random_string(30),
+               "reset_password_token" => Tools.random_string(30),
                "reset_password_sent_at" => DateTime.utc_now()
              })
            ) do
@@ -50,28 +51,4 @@ defmodule Mobilizon.Actors.Service.ResetPassword do
       {:error, reason} -> {:error, reason}
     end
   end
-
-  @spec random_string(integer) :: String.t()
-  defp random_string(length) do
-    length
-    |> :crypto.strong_rand_bytes()
-    |> Base.url_encode64()
-  end
-
-  @spec we_can_send_email(User.t()) :: boolean
-  defp we_can_send_email(%User{} = user) do
-    case user.reset_password_sent_at do
-      nil ->
-        :ok
-
-      _ ->
-        case Timex.before?(Timex.shift(user.reset_password_sent_at, hours: 1), DateTime.utc_now()) do
-          true ->
-            :ok
-
-          false ->
-            {:error, :email_too_soon}
-        end
-    end
-  end
 end

lib/mobilizon/actors/service/tools.ex

@@ -0,0 +1,27 @@
+defmodule Mobilizon.Actors.Service.Tools do
+  alias Mobilizon.Actors.User
+
+  @spec we_can_send_email(User.t()) :: boolean
+  def we_can_send_email(%User{} = user, key \\ :reset_password_sent_at) do
+    case Map.get(user, key) do
+      nil ->
+        :ok
+
+      _ ->
+        case Timex.before?(Timex.shift(Map.get(user, key), hours: 1), DateTime.utc_now()) do
+          true ->
+            :ok
+
+          false ->
+            {:error, :email_too_soon}
+        end
+    end
+  end
+
+  @spec random_string(integer) :: String.t()
+  def random_string(length) do
+    length
+    |> :crypto.strong_rand_bytes()
+    |> Base.url_encode64()
+  end
+end