From 3cbf16a5fe9f7618cae557eb260093881febd1d1 Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Thu, 13 Dec 2018 17:58:40 +0300 Subject: [PATCH] [#114] Added UserInviteToken creation, adjusted invitation email link to include it. --- lib/pleroma/emails/user_email.ex | 4 ++-- lib/pleroma/web/twitter_api/twitter_api_controller.ex | 8 ++++++-- test/web/twitter_api/twitter_api_controller_test.exs | 9 +++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/pleroma/emails/user_email.ex b/lib/pleroma/emails/user_email.ex index 47dcd42e0..ee41ce50a 100644 --- a/lib/pleroma/emails/user_email.ex +++ b/lib/pleroma/emails/user_email.ex @@ -38,12 +38,12 @@ defmodule Pleroma.UserEmail do |> html_body(html_body) end - def user_invitation_email(user, to_email, to_name \\ nil) do + def user_invitation_email(user, user_invite_token, to_email, to_name \\ nil) do registration_url = Router.Helpers.redirect_url( Endpoint, :registration_page, - "" + user_invite_token.token ) html_body = """ diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index d51d71299..0607a1a6a 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -336,8 +336,12 @@ defmodule Pleroma.Web.TwitterAPI.Controller do def confirm_email(_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"]), + with true <- + Pleroma.Config.get([:instance, :invites_enabled]) && + !Pleroma.Config.get([:instance, :registrations_open]), + {:ok, invite_token} <- Pleroma.UserInviteToken.create_token(), + email <- + Pleroma.UserEmail.user_invitation_email(user, invite_token, email, params["name"]), {:ok, _} <- Pleroma.Mailer.deliver(email) do json_response(conn, :no_content, "") end diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index cbb5f7796..e5c6f848d 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -877,10 +877,13 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do setup [:valid_user] setup do + registrations_open = Pleroma.Config.get([:instance, :registrations_open]) invites_enabled = Pleroma.Config.get([:instance, :invites_enabled]) + Pleroma.Config.put([:instance, :registrations_open], false) Pleroma.Config.put([:instance, :invites_enabled], true) on_exit(fn -> + Pleroma.Config.put([:instance, :registrations_open], registrations_open) Pleroma.Config.put([:instance, :invites_enabled], invites_enabled) :ok end) @@ -888,7 +891,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do :ok end - test "it returns 204", %{conn: conn, user: user} do + test "sends invitation and returns 204", %{conn: conn, user: user} do recipient_email = "foo@bar.com" recipient_name = "J. D." @@ -899,9 +902,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do assert json_response(conn, :no_content) - Swoosh.TestAssertions.assert_email_sent( - Pleroma.UserEmail.user_invitation_email(user, recipient_email, recipient_name) - ) + Swoosh.TestAssertions.assert_email_sent() end end