projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/hide-follows-remote
[akkoma]
/
lib
/
pleroma
/
web
/
oauth
/
oauth_controller.ex
diff --git
a/lib/pleroma/web/oauth/oauth_controller.ex
b/lib/pleroma/web/oauth/oauth_controller.ex
index 3f8e3b0747c927d8510b638005bec0ed2535c373..ef53b7ae348c506eace423b7dae2399b1f0ced40 100644
(file)
--- a/
lib/pleroma/web/oauth/oauth_controller.ex
+++ b/
lib/pleroma/web/oauth/oauth_controller.ex
@@
-90,7
+90,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
redirect(conn, external: url)
else
conn
redirect(conn, external: url)
else
conn
- |> put_flash(:error,
"Unlisted redirect_uri."
)
+ |> put_flash(:error,
dgettext("errors", "Unlisted redirect_uri.")
)
|> redirect(external: redirect_uri(conn, redirect_uri))
end
end
|> redirect(external: redirect_uri(conn, redirect_uri))
end
end
@@
-128,7
+128,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
redirect(conn, external: url)
else
conn
redirect(conn, external: url)
else
conn
- |> put_flash(:error,
"Unlisted redirect_uri."
)
+ |> put_flash(:error,
dgettext("errors", "Unlisted redirect_uri.")
)
|> redirect(external: redirect_uri(conn, redirect_uri))
end
end
|> redirect(external: redirect_uri(conn, redirect_uri))
end
end
@@
-142,7
+142,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
# Per https://github.com/tootsuite/mastodon/blob/
# 51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L39
conn
# Per https://github.com/tootsuite/mastodon/blob/
# 51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L39
conn
- |> put_flash(:error,
"This action is outside the authorized scopes"
)
+ |> put_flash(:error,
dgettext("errors", "This action is outside the authorized scopes")
)
|> put_status(:unauthorized)
|> authorize(params)
end
|> put_status(:unauthorized)
|> authorize(params)
end
@@
-155,7
+155,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
# Per https://github.com/tootsuite/mastodon/blob/
# 51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L76
conn
# Per https://github.com/tootsuite/mastodon/blob/
# 51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L76
conn
- |> put_flash(:error,
"Your login is missing a confirmed e-mail address"
)
+ |> put_flash(:error,
dgettext("errors", "Your login is missing a confirmed e-mail address")
)
|> put_status(:forbidden)
|> authorize(params)
end
|> put_status(:forbidden)
|> authorize(params)
end
@@
-176,9
+176,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
json(conn, Token.Response.build(user, token, response_attrs))
else
json(conn, Token.Response.build(user, token, response_attrs))
else
- _error ->
- put_status(conn, 400)
- |> json(%{error: "Invalid credentials"})
+ _error -> render_invalid_credentials_error(conn)
end
end
end
end
@@
-192,9
+190,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
json(conn, Token.Response.build(user, token, response_attrs))
else
json(conn, Token.Response.build(user, token, response_attrs))
else
- _error ->
- put_status(conn, 400)
- |> json(%{error: "Invalid credentials"})
+ _error -> render_invalid_credentials_error(conn)
end
end
end
end
@@
-214,18
+210,13
@@
defmodule Pleroma.Web.OAuth.OAuthController do
{:auth_active, false} ->
# Per https://github.com/tootsuite/mastodon/blob/
# 51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L76
{:auth_active, false} ->
# Per https://github.com/tootsuite/mastodon/blob/
# 51e154f5e87968d6bb115e053689767ab33e80cd/app/controllers/api/base_controller.rb#L76
- conn
- |> put_status(:forbidden)
- |> json(%{error: "Your login is missing a confirmed e-mail address"})
+ render_error(conn, :forbidden, "Your login is missing a confirmed e-mail address")
{:user_active, false} ->
{:user_active, false} ->
- conn
- |> put_status(:forbidden)
- |> json(%{error: "Your account is currently disabled"})
+ render_error(conn, :forbidden, "Your account is currently disabled")
_error ->
_error ->
- put_status(conn, 400)
- |> json(%{error: "Invalid credentials"})
+ render_invalid_credentials_error(conn)
end
end
end
end
@@
-247,9
+238,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
{:ok, token} <- Token.exchange_token(app, auth) do
json(conn, Token.Response.build_for_client_credentials(token))
else
{:ok, token} <- Token.exchange_token(app, auth) do
json(conn, Token.Response.build_for_client_credentials(token))
else
- _error ->
- put_status(conn, 400)
- |> json(%{error: "Invalid credentials"})
+ _error -> render_invalid_credentials_error(conn)
end
end
end
end
@@
-271,9
+260,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
# Response for bad request
defp bad_request(%Plug.Conn{} = conn, _) do
# Response for bad request
defp bad_request(%Plug.Conn{} = conn, _) do
- conn
- |> put_status(500)
- |> json(%{error: "Bad request"})
+ render_error(conn, :internal_server_error, "Bad request")
end
@doc "Prepares OAuth request to provider for Ueberauth"
end
@doc "Prepares OAuth request to provider for Ueberauth"
@@
-304,9
+291,11
@@
defmodule Pleroma.Web.OAuth.OAuthController do
def request(%Plug.Conn{} = conn, params) do
message =
if params["provider"] do
def request(%Plug.Conn{} = conn, params) do
message =
if params["provider"] do
- "Unsupported OAuth provider: #{params["provider"]}."
+ dgettext("errors", "Unsupported OAuth provider: %{provider}.",
+ provider: params["provider"]
+ )
else
else
- "Bad OAuth request."
+ dgettext("errors", "Bad OAuth request.")
end
conn
end
conn
@@
-320,7
+309,10
@@
defmodule Pleroma.Web.OAuth.OAuthController do
message = Enum.join(messages, "; ")
conn
message = Enum.join(messages, "; ")
conn
- |> put_flash(:error, "Failed to authenticate: #{message}.")
+ |> put_flash(
+ :error,
+ dgettext("errors", "Failed to authenticate: %{message}.", message: message)
+ )
|> redirect(external: redirect_uri(conn, params["redirect_uri"]))
end
|> redirect(external: redirect_uri(conn, params["redirect_uri"]))
end
@@
-350,7
+342,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
Logger.debug(inspect(["OAUTH_ERROR", error, conn.assigns]))
conn
Logger.debug(inspect(["OAUTH_ERROR", error, conn.assigns]))
conn
- |> put_flash(:error,
"Failed to set up user account."
)
+ |> put_flash(:error,
dgettext("errors", "Failed to set up user account.")
)
|> redirect(external: redirect_uri(conn, params["redirect_uri"]))
end
end
|> redirect(external: redirect_uri(conn, params["redirect_uri"]))
end
end
@@
-468,4
+460,8
@@
defmodule Pleroma.Web.OAuth.OAuthController do
|> String.split()
|> Enum.at(0)
end
|> String.split()
|> Enum.at(0)
end
+
+ defp render_invalid_credentials_error(conn) do
+ render_error(conn, :bad_request, "Invalid credentials")
+ end
end
end