forked from AkkomaGang/akkoma
[#114] Added UserInviteToken creation, adjusted invitation email link to include it.
This commit is contained in:
parent
cc83d7ffe7
commit
3cbf16a5fe
3 changed files with 13 additions and 8 deletions
|
@ -38,12 +38,12 @@ def password_reset_email(user, password_reset_token) when is_binary(password_res
|
|||
|> 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 = """
|
||||
|
|
|
@ -336,8 +336,12 @@ def password_reset(conn, params) 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
|
||||
|
|
|
@ -877,10 +877,13 @@ test "it returns 500 when user is not local", %{conn: conn, user: user} 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 @@ test "it returns 500 when user is not local", %{conn: conn, user: user} 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 @@ test "it returns 204", %{conn: conn, user: user} 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
|
||||
|
||||
|
|
Loading…
Reference in a new issue