send email to moderators for pending user - #877

lib/graphql/resolvers/user.ex

@@ -295,6 +295,12 @@ defmodule Mobilizon.GraphQL.Resolvers.User do
         actor = Users.get_actor_for_user(user)
 
         if Config.instance_registrations_moderation?() do
+          Enum.each(Users.list_moderators(), fn moderator ->
+            moderator
+            |> Email.Admin.user_pending(user)
+            |> Email.Mailer.send_email()
+          end)
+
           {:ok,
            %{
              access_token: "",

lib/web/email/admin.ex

@@ -29,6 +29,22 @@ defmodule Mobilizon.Web.Email.Admin do
     |> render_body(:report, %{locale: locale, subject: subject, report: report})
   end
 
+  @spec user_pending(User.t(), User.t()) :: Swoosh.Email.t()
+  def user_pending(%User{email: moderator_email} = moderator, %User{} = user) do
+    locale = Map.get(moderator, :locale, "en")
+    Gettext.put_locale(locale)
+
+    subject =
+      gettext(
+        "New pending user on Mobilizon instance %{instance}",
+        instance: Config.instance_name()
+      )
+
+    [to: moderator_email, subject: subject]
+    |> Email.base_email()
+    |> render_body(:user_pending, %{locale: locale, subject: subject, user: user})
+  end
+
   @spec user_email_change_old(User.t(), String.t()) :: Swoosh.Email.t()
   def user_email_change_old(
         %User{

lib/web/templates/email/user_pending.html.heex

@@ -0,0 +1,73 @@
+<!-- HERO -->
+<tr>
+  <td bgcolor="#474467" align="center" style="padding: 0px 10px 0px 10px;">
+    <!--[if (gte mso 9)|(IE)]>
+      <table align="center" border="0" cellspacing="0" cellpadding="0" width="600">
+        <tr>
+          <td align="center" valign="top" width="600">
+    <![endif]-->
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 600px;">
+      <tr>
+        <td
+          bgcolor="#ffffff"
+          align="center"
+          valign="top"
+          style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;"
+        >
+          <h1 style="font-size: 48px; font-weight: 400; margin: 0;">
+            <%= gettext("New pending user on <b>%{instance}</b>", instance: @instance_name) |> raw %>
+          </h1>
+        </td>
+      </tr>
+    </table>
+    <!--[if (gte mso 9)|(IE)]>
+    </td>
+  </tr>
+</table>
+    <![endif]-->
+  </td>
+</tr>
+<!-- COPY BLOCK -->
+<tr>
+  <td bgcolor="#E6E4F4" align="center" style="padding: 0px 10px 0px 10px;">
+    <!--[if (gte mso 9)|(IE)]>
+      <table align="center" border="0" cellspacing="0" cellpadding="0" width="600">
+        <tr>
+          <td align="center" valign="top" width="600">
+    <![endif]-->
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 600px;">
+      <!-- COPY -->
+      <tr>
+        <td
+          bgcolor="#ffffff"
+          align="left"
+          style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;"
+        >
+          <p style="margin: 0;">
+            <%= gettext("New pending user from %{user} on %{instance}",
+              user: @user.email,
+              instance: @instance_name
+            )
+            |> raw %>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
+          <a
+            href={"#{"#{Mobilizon.Web.Endpoint.url()}/settings/admin/users?pendingFilter=true"}"}
+            target="_blank"
+            style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"
+          >
+            <%= gettext("Login to view the list of pending users") %>
+          </a>
+        </td>
+      </tr>
+    </table>
+    <!--[if (gte mso 9)|(IE)]>
+    </td>
+  </tr>
+</table>
+    <![endif]-->
+  </td>
+</tr>

lib/web/templates/email/user_pending.text.eex

@@ -0,0 +1,3 @@
+<%= gettext "New pending user from %{user} on %{instance}", user: @user.email, instance: @instance_name %>
+
+<%= gettext "Login to view the list of pending users:" %> <%= "#{Mobilizon.Web.Endpoint.url()}/settings/admin/users?pendingFilter=true" %>

test/graphql/resolvers/user_test.exs

@@ -14,7 +14,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
   alias Mobilizon.GraphQL.AbsintheHelpers
 
   alias Mobilizon.Web.Email
-  import Swoosh.TestAssertions
+  import Swoosh.X.TestAssertions
 
   @get_user_query """
   query GetUser($id: ID!) {
@@ -454,6 +454,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert res["errors"] == nil
       assert res["data"]["createUser"]["email"] == @user_creation.email
+      assert_email_sent(to: @user_creation.email)
+      flush_emails()
 
       res =
         conn
@@ -465,6 +467,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(res["errors"])["field"] == "email"
       assert hd(res["errors"])["message"] == ["Cette adresse e-mail est déjà utilisée."]
+      refute_email_sent()
     end
 
     test "create_user/3 doesn't allow registration when registration is closed", %{conn: conn} do
@@ -481,6 +484,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(res["errors"])["field"] == nil
       assert hd(res["errors"])["message"] == "Registrations are not open"
+      refute_email_sent()
+
       Config.put([:instance, :registrations_open], true)
       Config.put([:instance, :registrations_moderation], false)
     end
@@ -498,6 +503,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(res["errors"])["field"] == nil
       assert hd(res["errors"])["message"] == "Moderation text must not be empty"
+      refute_email_sent()
 
       Config.put([:instance, :registrations_open], true)
       Config.put([:instance, :registrations_moderation], false)
@@ -520,6 +526,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
       {:ok, user} = Users.get_user_by_email(@user_creation.email)
       assert user.moderation == @user_creation_with_moderation.moderation
       assert user.role == :pending
+      assert_email_sent(to: user.email)
 
       Config.put([:instance, :registrations_open], true)
       Config.put([:instance, :registrations_moderation], false)
@@ -541,6 +548,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(res["errors"])["field"] == nil
       assert hd(res["errors"])["message"] == "Your email is not on the allowlist"
+      refute_email_sent()
+
       Config.put([:instance, :registrations_open], true)
       Config.put([:instance, :registrations_moderation], false)
       Config.put([:instance, :registration_email_allowlist], [])
@@ -562,6 +571,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       refute res["errors"]
       assert res["data"]["createUser"]["email"] == @user_creation.email
+      assert_email_sent(to: @user_creation.email)
       Config.put([:instance, :registrations_open], true)
       Config.put([:instance, :registrations_moderation], false)
       Config.put([:instance, :registration_email_allowlist], [])
@@ -581,6 +591,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       refute res["errors"]
       assert res["data"]["createUser"]["email"] == @user_creation.email
+      assert_email_sent(to: @user_creation.email)
       Config.put([:instance, :registrations_open], true)
       Config.put([:instance, :registrations_moderation], false)
       Config.put([:instance, :registration_email_allowlist], [])
@@ -605,6 +616,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
       assert hd(res["errors"])["message"] ==
                "Your e-mail has been denied registration or uses a disallowed e-mail provider"
 
+      refute_email_sent()
+
       Config.put([:instance, :registrations_open], true)
       Config.put([:instance, :registrations_moderation], false)
       Config.put([:instance, :registration_email_denylist], [])
@@ -629,6 +642,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
       assert hd(res["errors"])["message"] ==
                "Your e-mail has been denied registration or uses a disallowed e-mail provider"
 
+      refute_email_sent()
+
       Config.put([:instance, :registrations_open], true)
       Config.put([:instance, :registrations_moderation], false)
       Config.put([:instance, :registration_email_denylist], [])
@@ -654,6 +669,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
       assert hd(res["errors"])["message"] ==
                "Your e-mail has been denied registration or uses a disallowed e-mail provider"
 
+      refute_email_sent()
+
       Config.put([:instance, :registrations_open], true)
       Config.put([:instance, :registrations_moderation], false)
       Config.put([:instance, :registration_email_denylist], [])
@@ -675,6 +692,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert res["errors"] == nil
       assert res["data"]["createUser"]["email"] == "test+alias@demo.tld"
+      assert_email_sent(to: "test+alias@demo.tld")
     end
 
     test "test create_user/3 doesn't create an user with bad email", %{conn: conn} do
@@ -689,6 +707,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(res["errors"])["message"] ==
                ["Email doesn't fit required format"]
+
+      refute_email_sent()
     end
   end
 
@@ -720,6 +740,40 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
       assert json_response(res, 200)["data"]["validateUser"]["user"]["id"] == to_string(user.id)
       assert json_response(res, 200)["data"]["validateUser"]["user"]["role"] == "USER"
       assert json_response(res, 200)["data"]["validateUser"]["accessToken"] != ""
+      refute_email_sent()
+      Config.put([:instance, :registrations_open], true)
+      Config.put([:instance, :registrations_moderation], false)
+    end
+
+    test "test validate_user/3 validates an user with moderator", context do
+      Config.put([:instance, :registrations_open], true)
+      Config.put([:instance, :registrations_moderation], false)
+
+      insert(:user, role: :moderator)
+      {:ok, %User{} = user} = Users.register(@valid_actor_params)
+
+      mutation = """
+          mutation {
+            validateUser(
+                  token: "#{user.confirmation_token}"
+              ) {
+                accessToken,
+                user {
+                  id,
+                  role,
+                },
+              }
+            }
+      """
+
+      res =
+        context.conn
+        |> post("/api", AbsintheHelpers.mutation_skeleton(mutation))
+
+      assert json_response(res, 200)["data"]["validateUser"]["user"]["id"] == to_string(user.id)
+      assert json_response(res, 200)["data"]["validateUser"]["user"]["role"] == "USER"
+      assert json_response(res, 200)["data"]["validateUser"]["accessToken"] != ""
+      refute_email_sent()
       Config.put([:instance, :registrations_open], true)
       Config.put([:instance, :registrations_moderation], false)
     end
@@ -757,6 +811,46 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
       assert json_response(res, 200)["data"]["validateUser"]["user"]["id"] == to_string(user.id)
       assert json_response(res, 200)["data"]["validateUser"]["user"]["role"] == "PENDING"
       assert json_response(res, 200)["data"]["validateUser"]["accessToken"] == ""
+      refute_email_sent()
+      Config.put([:instance, :registrations_open], true)
+      Config.put([:instance, :registrations_moderation], false)
+    end
+
+    test "test validate_user/3 validates an user with moderation and moderator", context do
+      Config.put([:instance, :registrations_open], true)
+      Config.put([:instance, :registrations_moderation], true)
+      modo = insert(:user, role: :moderator)
+
+      user =
+        insert(:user,
+          email: "test@test.tld",
+          password: "testest",
+          moderation: "moderation text",
+          confirmation_token: "t0t0"
+        )
+
+      mutation = """
+          mutation {
+            validateUser(
+                  token: "#{user.confirmation_token}"
+              ) {
+                accessToken,
+                user {
+                  id,
+                  role,
+                },
+              }
+            }
+      """
+
+      res =
+        context.conn
+        |> post("/api", AbsintheHelpers.mutation_skeleton(mutation))
+
+      assert json_response(res, 200)["data"]["validateUser"]["user"]["id"] == to_string(user.id)
+      assert json_response(res, 200)["data"]["validateUser"]["user"]["role"] == "PENDING"
+      assert json_response(res, 200)["data"]["validateUser"]["accessToken"] == ""
+      assert_email_sent(to: modo.email)
       Config.put([:instance, :registrations_open], true)
       Config.put([:instance, :registrations_moderation], false)
     end
@@ -784,6 +878,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
         |> post("/api", AbsintheHelpers.mutation_skeleton(mutation))
 
       assert hd(json_response(res, 200)["errors"])["message"] == "Unable to validate user"
+      refute_email_sent()
       Config.put([:instance, :registrations_open], true)
       Config.put([:instance, :registrations_moderation], false)
     end
@@ -833,6 +928,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(res["errors"])["message"] ==
                "No user to validate with this email was found"
+
+      refute_email_sent()
     end
   end
 
@@ -848,6 +945,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
         )
 
       assert res["data"]["sendResetPassword"] == email
+      assert_email_sent(to: email)
     end
 
     test "test send_reset_password/3 with an email with no account", %{conn: conn} do
@@ -860,6 +958,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(res["errors"])["message"] ==
                "No user with this email was found"
+
+      refute_email_sent()
     end
 
     test "test send_reset_password/3 with invalid email", %{conn: conn} do
@@ -872,6 +972,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(res["errors"])["message"] ==
                "This email doesn't seem to be valid"
+
+      refute_email_sent()
     end
 
     test "test send_reset_password/3 for an LDAP user", %{conn: conn} do
@@ -886,6 +988,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(res["errors"])["message"] ==
                "This user can't reset their password"
+
+      refute_email_sent()
     end
 
     test "test send_reset_password/3 for a deactivated user doesn't send email", %{conn: conn} do
@@ -907,6 +1011,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(res["errors"])["message"] ==
                "No user with this email was found"
+
+      refute_email_sent()
     end
   end
 
@@ -923,6 +1029,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
       %Actor{} = insert(:actor, user: user)
       {:ok, _email_sent} = Email.User.send_password_reset_email(user)
       %User{reset_password_token: reset_password_token} = Users.get_user!(user.id)
+      assert_email_sent(to: user.email)
+      flush_emails()
 
       mutation = """
           mutation {
@@ -943,12 +1051,15 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert is_nil(json_response(res, 200)["errors"])
       assert json_response(res, 200)["data"]["resetPassword"]["user"]["id"] == to_string(user.id)
+      refute_email_sent()
     end
 
     test "test reset_password/3 with a password too short", context do
       %User{} = user = insert(:user)
       {:ok, _email_sent} = Email.User.send_password_reset_email(user)
       %User{reset_password_token: reset_password_token} = Users.get_user!(user.id)
+      assert_email_sent(to: user.email)
+      flush_emails()
 
       mutation = """
           mutation {
@@ -969,12 +1080,16 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(json_response(res, 200)["errors"])["message"] ==
                "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
+
+      refute_email_sent()
     end
 
     test "test reset_password/3 with an invalid token", context do
       %User{} = user = insert(:user)
       {:ok, _email_sent} = Email.User.send_password_reset_email(user)
       %User{} = Users.get_user!(user.id)
+      assert_email_sent(to: user.email)
+      flush_emails()
 
       mutation = """
           mutation {
@@ -995,6 +1110,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(json_response(res, 200)["errors"])["message"] ==
                "The token you provided is invalid. Make sure that the URL is exactly the one provided inside the email you got."
+
+      refute_email_sent()
     end
   end
 
@@ -1185,6 +1302,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
         )
 
       assert hd(res["errors"])["message"] == "You need to be logged in"
+      refute_email_sent()
     end
 
     test "test change_default_actor/3 with valid actor", %{conn: conn} do
@@ -1212,6 +1330,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert res["data"]["changeDefaultActor"]["defaultActor"]["preferredUsername"] ==
                actor2.preferred_username
+
+      refute_email_sent()
     end
   end
 
@@ -1293,6 +1413,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert login = json_response(res, 200)["data"]["login"]
       assert Map.has_key?(login, "accessToken") && not is_nil(login["accessToken"])
+      refute_email_sent()
     end
 
     test "change_password/3 with invalid password", %{conn: conn} do
@@ -1322,6 +1443,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
         |> post("/api", AbsintheHelpers.mutation_skeleton(mutation))
 
       assert hd(json_response(res, 200)["errors"])["message"] == "The current password is invalid"
+      refute_email_sent()
     end
 
     test "change_password/3 with same password", %{conn: conn} do
@@ -1351,6 +1473,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(json_response(res, 200)["errors"])["message"] ==
                "The new password must be different"
+
+      refute_email_sent()
     end
 
     test "change_password/3 with new password too short", %{conn: conn} do
@@ -1380,6 +1504,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(json_response(res, 200)["errors"])["message"] ==
                "The password you have chosen is too short. Please make sure your password contains at least 6 characters."
+
+      refute_email_sent()
     end
 
     test "change_password/3 without being authenticated", %{conn: conn} do
@@ -1408,6 +1534,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(json_response(res, 200)["errors"])["message"] ==
                "You need to be logged in"
+
+      refute_email_sent()
     end
   end
 
@@ -1542,6 +1670,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
         )
 
       assert hd(res["errors"])["message"] == "The password provided is invalid"
+      refute_email_sent()
     end
 
     test "change_email/3 with same email", %{conn: conn} do
@@ -1565,6 +1694,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
         )
 
       assert hd(res["errors"])["message"] == "The new email must be different"
+      refute_email_sent()
     end
 
     test "change_email/3 with invalid email", %{conn: conn} do
@@ -1588,6 +1718,7 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
         )
 
       assert hd(res["errors"])["message"] == "The new email doesn't seem to be valid"
+      refute_email_sent()
     end
 
     test "change_password/3 without being authenticated", %{conn: conn} do
@@ -1611,6 +1742,8 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
 
       assert hd(res["errors"])["message"] ==
                "You need to be logged in"
+
+      refute_email_sent()
     end
   end