[#114] Initial implementation of user email invitations.

diff --git a/lib/pleroma/emails/user_email.ex b/lib/pleroma/emails/user_email.ex
index 46d8b9c2d65f26646855aff0967ea628f7b07afa..47dcd42e0ca9decad6ab4c57cd174f67cc1a6597 100644 (file)
--- a/lib/pleroma/emails/user_email.ex
+++ b/lib/pleroma/emails/user_email.ex
@@ -9,10 +9,13 @@ defmodule Pleroma.UserEmail do
 
   defp instance_name, do: instance_config()[:name]
 
-  defp from do
+  defp sender do
     {instance_name(), instance_config()[:email]}
   end
 
+  defp recipient(email, nil), do: email
+  defp recipient(email, name), do: {name, email}
+
   def password_reset_email(user, password_reset_token) when is_binary(password_reset_token) do
     password_reset_url =
       Router.Helpers.util_url(
@@ -29,9 +32,30 @@ defmodule Pleroma.UserEmail do
     """
 
     new()
-    |> to({user.name, user.email})
-    |> from(from())
+    |> to(recipient(user.email, user.name))
+    |> from(sender())
     |> subject("Password reset")
     |> html_body(html_body)
   end
+
+  def user_invitation_email(user, to_email, to_name \\ nil) do
+    registration_url =
+      Router.Helpers.redirect_url(
+        Endpoint,
+        :registration_page,
+        ""
+      )
+
+    html_body = """
+    <h3>You are invited to #{instance_name()}</h3>
+    <p>#{user.name} invites you to join #{instance_name()}, an instance of Pleroma federated social networking platform.</p>
+    <p>Click the following link to register: <a href="#{registration_url}">accept invitation</a>.</p>
+    """
+
+    new()
+    |> to(recipient(to_email, to_name))
+    |> from(sender())
+    |> subject("Invitation to #{instance_name()}")
+    |> html_body(html_body)
+  end
 end

diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index cacfbbf918ade744b83c09ce39898dca3d85dd5c..cbde45e52fbbfd4f5eaf8d128b93c827fa6821a6 100644 (file)
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -168,7 +168,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
           private: if(Keyword.get(instance, :public, true), do: "0", else: "1"),
           accountActivationRequired:
             if(Keyword.get(instance, :account_activation_required, false), do: "1", else: "0"),
-          invitesEnabled: if(Keyword.get(instance, :invites_enabled, true), do: "1", else: "0"),
+          invitesEnabled: if(Keyword.get(instance, :invites_enabled, false), do: "1", else: "0"),
           vapidPublicKey: vapid_public_key
         }
 

diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index a45fdcf517d8e0bdf5220e99a35e54686663f33a..d51d712991fadb57aaf014bbcc57418cbaf596b8 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -335,7 +335,13 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
 
   def confirm_email(_conn, _params), do: :noop
 
-  def email_invite(_conn, _params), do: :noop
+  def email_invite(%{assigns: %{user: user}} = conn, %{"email" => email} = params) do
+    with true <- Pleroma.Config.get([:instance, :invites_enabled]),
+         email <- Pleroma.UserEmail.user_invitation_email(user, email, params["name"]),
+         {:ok, _} <- Pleroma.Mailer.deliver(email) do
+      json_response(conn, :no_content, "")
+    end
+  end
 
   def update_avatar(%{assigns: %{user: user}} = conn, params) do
     {:ok, object} = ActivityPub.upload(params, type: :avatar)

diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index c16c0cdc0f32759bcead129ccf2ca72cbed7669f..cbb5f77962b0d0a9cc7d1087d0da5ffa2700ae38 100644 (file)
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -873,6 +873,38 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     end
   end
 
+  describe "POST /api/email_invite, with valid parameters" do
+    setup [:valid_user]
+
+    setup do
+      invites_enabled = Pleroma.Config.get([:instance, :invites_enabled])
+      Pleroma.Config.put([:instance, :invites_enabled], true)
+
+      on_exit(fn ->
+        Pleroma.Config.put([:instance, :invites_enabled], invites_enabled)
+        :ok
+      end)
+
+      :ok
+    end
+
+    test "it returns 204", %{conn: conn, user: user} do
+      recipient_email = "foo@bar.com"
+      recipient_name = "J. D."
+
+      conn =
+        conn
+        |> assign(:user, user)
+        |> post("/api/email_invite?email=#{recipient_email}&name=#{recipient_name}")
+
+      assert json_response(conn, :no_content)
+
+      Swoosh.TestAssertions.assert_email_sent(
+        Pleroma.UserEmail.user_invitation_email(user, recipient_email, recipient_name)
+      )
+    end
+  end
+
   describe "GET /api/externalprofile/show" do
     test "it returns the user", %{conn: conn} do
       user = insert(:user)