squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change validation error status codes to be more appropriate

Browse Source
This commit is contained in:
rinpatch 2019-05-21 17:12:38 +03:00
parent ee68244141
commit 0407ffe75f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -488,12 +488,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
case get_cached_status_or_post(conn, params) do case get_cached_status_or_post(conn, params) do
{:ignore, message} -> {:ignore, message} ->
conn conn
|> put_status(401) |> put_status(422)
|> json(%{error: message}) |> json(%{error: message})
{:error, message} -> {:error, message} ->
conn conn
|> put_status(401) |> put_status(422)
|> json(%{error: message}) |> json(%{error: message})
{_, activity} -> {_, activity} ->

8
test/web/mastodon_api/mastodon_api_controller_test.exs
View File

@ -181,7 +181,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
"poll" => %{"options" => Enum.map(0..limit, fn _ -> "desu" end), "expires_in" => 1} "poll" => %{"options" => Enum.map(0..limit, fn _ -> "desu" end), "expires_in" => 1}
}) })
%{"error" => error} = json_response(conn, 401) %{"error" => error} = json_response(conn, 422)
assert error == "Poll can't contain more than #{limit} options" assert error == "Poll can't contain more than #{limit} options"
end end
@ -200,7 +200,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
} }
}) })
%{"error" => error} = json_response(conn, 401) %{"error" => error} = json_response(conn, 422)
assert error == "Poll options cannot be longer than #{limit} characters each" assert error == "Poll options cannot be longer than #{limit} characters each"
end end
@ -219,7 +219,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
} }
}) })
%{"error" => error} = json_response(conn, 401) %{"error" => error} = json_response(conn, 422)
assert error == "Expiration date is too soon" assert error == "Expiration date is too soon"
end end
@ -238,7 +238,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
} }
}) })
%{"error" => error} = json_response(conn, 401) %{"error" => error} = json_response(conn, 422)
assert error == "Expiration date is too far in the future" assert error == "Expiration date is too far in the future"
end end
end end