Browse Source

[#114] Removed `email_invite` implementation (to be addressed separately).

tags/v0.9.9
Ivan Tashkinov 5 years ago
parent
commit
18b9467d1a
2 changed files with 1 additions and 39 deletions
  1. +1
    -7
      lib/pleroma/web/twitter_api/twitter_api_controller.ex
  2. +0
    -32
      test/web/twitter_api/twitter_api_controller_test.exs

+ 1
- 7
lib/pleroma/web/twitter_api/twitter_api_controller.ex View File

@@ -335,13 +335,7 @@ 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"]),
{:ok, _} <- Pleroma.Mailer.deliver(email) do
json_response(conn, :no_content, "")
end
end
def email_invite(_conn, _params), do: :noop

def update_avatar(%{assigns: %{user: user}} = conn, params) do
{:ok, object} = ActivityPub.upload(params, type: :avatar)


+ 0
- 32
test/web/twitter_api/twitter_api_controller_test.exs View File

@@ -873,38 +873,6 @@ 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)


Loading…
Cancel
Save