Merge branch '204-fix' into 'develop'
Fix 500 errors when returning :no_content, fixes #2029 Closes #2029 See merge request pleroma/pleroma!2856
This commit is contained in:
commit
686002164a
3 changed files with 19 additions and 6 deletions
|
@ -18,6 +18,12 @@ def falsy_param?(value),
|
||||||
|
|
||||||
def truthy_param?(value), do: not falsy_param?(value)
|
def truthy_param?(value), do: not falsy_param?(value)
|
||||||
|
|
||||||
|
def json_response(conn, status, _) when status in [204, :no_content] do
|
||||||
|
conn
|
||||||
|
|> put_resp_header("content-type", "application/json")
|
||||||
|
|> send_resp(status, "")
|
||||||
|
end
|
||||||
|
|
||||||
def json_response(conn, status, json) do
|
def json_response(conn, status, json) do
|
||||||
conn
|
conn
|
||||||
|> put_status(status)
|
|> put_status(status)
|
||||||
|
|
|
@ -56,6 +56,13 @@ defp request_content_type(%{conn: conn}) do
|
||||||
[conn: conn]
|
[conn: conn]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp empty_json_response(conn) do
|
||||||
|
body = response(conn, 204)
|
||||||
|
response_content_type(conn, :json)
|
||||||
|
|
||||||
|
body
|
||||||
|
end
|
||||||
|
|
||||||
defp json_response_and_validate_schema(
|
defp json_response_and_validate_schema(
|
||||||
%{
|
%{
|
||||||
private: %{
|
private: %{
|
||||||
|
@ -79,7 +86,7 @@ defp json_response_and_validate_schema(
|
||||||
end
|
end
|
||||||
|
|
||||||
schema = lookup[op_id].responses[status].content[content_type].schema
|
schema = lookup[op_id].responses[status].content[content_type].schema
|
||||||
json = json_response(conn, status)
|
json = if status == 204, do: empty_json_response(conn), else: json_response(conn, status)
|
||||||
|
|
||||||
case OpenApiSpex.cast_value(json, schema, spec) do
|
case OpenApiSpex.cast_value(json, schema, spec) do
|
||||||
{:ok, _data} ->
|
{:ok, _data} ->
|
||||||
|
|
|
@ -439,7 +439,7 @@ test "it appends specified tags to users with specified nicknames", %{
|
||||||
user1: user1,
|
user1: user1,
|
||||||
user2: user2
|
user2: user2
|
||||||
} do
|
} do
|
||||||
assert json_response(conn, :no_content)
|
assert empty_json_response(conn)
|
||||||
assert User.get_cached_by_id(user1.id).tags == ["x", "foo", "bar"]
|
assert User.get_cached_by_id(user1.id).tags == ["x", "foo", "bar"]
|
||||||
assert User.get_cached_by_id(user2.id).tags == ["y", "foo", "bar"]
|
assert User.get_cached_by_id(user2.id).tags == ["y", "foo", "bar"]
|
||||||
|
|
||||||
|
@ -457,7 +457,7 @@ test "it appends specified tags to users with specified nicknames", %{
|
||||||
end
|
end
|
||||||
|
|
||||||
test "it does not modify tags of not specified users", %{conn: conn, user3: user3} do
|
test "it does not modify tags of not specified users", %{conn: conn, user3: user3} do
|
||||||
assert json_response(conn, :no_content)
|
assert empty_json_response(conn)
|
||||||
assert User.get_cached_by_id(user3.id).tags == ["unchanged"]
|
assert User.get_cached_by_id(user3.id).tags == ["unchanged"]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -485,7 +485,7 @@ test "it removes specified tags from users with specified nicknames", %{
|
||||||
user1: user1,
|
user1: user1,
|
||||||
user2: user2
|
user2: user2
|
||||||
} do
|
} do
|
||||||
assert json_response(conn, :no_content)
|
assert empty_json_response(conn)
|
||||||
assert User.get_cached_by_id(user1.id).tags == []
|
assert User.get_cached_by_id(user1.id).tags == []
|
||||||
assert User.get_cached_by_id(user2.id).tags == ["y"]
|
assert User.get_cached_by_id(user2.id).tags == ["y"]
|
||||||
|
|
||||||
|
@ -503,7 +503,7 @@ test "it removes specified tags from users with specified nicknames", %{
|
||||||
end
|
end
|
||||||
|
|
||||||
test "it does not modify tags of not specified users", %{conn: conn, user3: user3} do
|
test "it does not modify tags of not specified users", %{conn: conn, user3: user3} do
|
||||||
assert json_response(conn, :no_content)
|
assert empty_json_response(conn)
|
||||||
assert User.get_cached_by_id(user3.id).tags == ["unchanged"]
|
assert User.get_cached_by_id(user3.id).tags == ["unchanged"]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1777,7 +1777,7 @@ test "sets password_reset_pending to true", %{conn: conn} do
|
||||||
conn =
|
conn =
|
||||||
patch(conn, "/api/pleroma/admin/users/force_password_reset", %{nicknames: [user.nickname]})
|
patch(conn, "/api/pleroma/admin/users/force_password_reset", %{nicknames: [user.nickname]})
|
||||||
|
|
||||||
assert json_response(conn, 204) == ""
|
assert empty_json_response(conn) == ""
|
||||||
|
|
||||||
ObanHelpers.perform_all()
|
ObanHelpers.perform_all()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue