Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
18b9467d
Commit
18b9467d
authored
Dec 13, 2018
by
Ivan Tashkinov
Browse files
[
#114
] Removed `email_invite` implementation (to be addressed separately).
parent
00744c6b
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file @
18b9467d
...
...
@@ -335,13 +335,7 @@ 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"
]),
{
: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
)
...
...
test/web/twitter_api/twitter_api_controller_test.exs
View file @
18b9467d
...
...
@@ -873,38 +873,6 @@ test "it returns 500 when user is not local", %{conn: conn, user: user} 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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment