diff options
| author | lain <lain@soykaf.club> | 2020-07-29 16:24:22 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-29 16:24:22 +0200 |
| commit | dc36d6e9d21dc47fa9b6332c6444a055f789fabd (patch) | |
| tree | d24ffb684053b9042339396eeb8bc02368ed6602 /lib/pleroma/web/oauth/oauth_controller.ex | |
| parent | f715bf1915b75cb3c5b24d4661a94885aaa1a0ac (diff) | |
| parent | a6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (diff) | |
| download | pleroma-dc36d6e9d21dc47fa9b6332c6444a055f789fabd.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/oauth_controller.ex | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index 7683589cf..61fe81d33 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -337,6 +337,16 @@ defmodule Pleroma.Web.OAuth.OAuthController do ) end + defp handle_token_exchange_error(%Plug.Conn{} = conn, {:account_status, :approval_pending}) do + render_error( + conn, + :forbidden, + "Your account is awaiting approval.", + %{}, + "awaiting_approval" + ) + end + defp handle_token_exchange_error(%Plug.Conn{} = conn, _error) do render_invalid_credentials_error(conn) end |