mirrors/akkoma
1
0
Fork 1
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-10 03:17:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Send an identifier alongside with error message in OAuthController

Browse source
This commit is contained in:
Maxim Filippov 2019-10-01 18:10:04 +03:00
parent b35a0f0ce4
commit 0f9c2c8b87
3 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/pleroma/web/oauth/oauth_controller.ex
View file

@ -212,13 +212,31 @@ defmodule Pleroma.Web.OAuth.OAuthController do
{:auth_active, false} -> {:auth_active, false} ->
# Per https://github.com/tootsuite/mastodon/blob/ # Per https://github.com/tootsuite/mastodon/blob/
# 51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L76 # 51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L76
render_error(conn, :forbidden, "Your login is missing a confirmed e-mail address") render_error(
conn,
:forbidden,
"Your login is missing a confirmed e-mail address",
%{},
"missing_confirmed_email"
)
{:user_active, false} -> {:user_active, false} ->
render_error(conn, :forbidden, "Your account is currently disabled") render_error(
conn,
:forbidden,
"Your account is currently disabled",
%{},
"account_is_disabled"
)
{:password_reset_pending, true} -> {:password_reset_pending, true} ->
render_error(conn, :forbidden, "Password reset is required") render_error(
conn,
:forbidden,
"Password reset is required",
%{},
"password_reset_required"
)
_error -> _error ->
render_invalid_credentials_error(conn) render_invalid_credentials_error(conn)

11
lib/pleroma/web/translation_helpers.ex
View file

@ -3,14 +3,21 @@
# SPDX-License-Identifier: AGPL-3.0-only # SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TranslationHelpers do defmodule Pleroma.Web.TranslationHelpers do
defmacro render_error(conn, status, msgid, bindings \\ Macro.escape(%{})) do defmacro render_error(
conn,
status,
msgid,
bindings \\ Macro.escape(%{}),
identifier \\ Macro.escape("")
) do
quote do quote do
require Pleroma.Web.Gettext require Pleroma.Web.Gettext
unquote(conn) unquote(conn)
|> Plug.Conn.put_status(unquote(status)) |> Plug.Conn.put_status(unquote(status))
|> Phoenix.Controller.json(%{ |> Phoenix.Controller.json(%{
error: Pleroma.Web.Gettext.dgettext("errors", unquote(msgid), unquote(bindings)) error: Pleroma.Web.Gettext.dgettext("errors", unquote(msgid), unquote(bindings)),
identifier: unquote(identifier)
}) })
end end
end end

1
test/web/oauth/oauth_controller_test.exs
View file

@ -852,6 +852,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
assert resp = json_response(conn, 403) assert resp = json_response(conn, 403)
assert resp["error"] == "Password reset is required" assert resp["error"] == "Password reset is required"
assert resp["identifier"] == "password_reset_required"
refute Map.has_key?(resp, "access_token") refute Map.has_key?(resp, "access_token")
end end