diff options
| author | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-04-10 10:44:54 +0100 |
|---|---|---|
| committer | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-04-10 10:44:54 +0100 |
| commit | be8350baa2f8c9cf9be3f53ee4a0041dada1386f (patch) | |
| tree | 8414fc2108941ccadd9b9fd4dd37c9d3cf731399 /lib/pleroma/web/oauth/fallback_controller.ex | |
| parent | 589629cf3e1bee9a4f6e92b8456d8614eff73c89 (diff) | |
| parent | c8440b5e0c97c5d5c03e4b99e30a61df6ab95319 (diff) | |
| download | pleroma-be8350baa2f8c9cf9be3f53ee4a0041dada1386f.tar.gz | |
Merge branch 'develop' into feature/user-status-subscriptions
Diffstat (limited to 'lib/pleroma/web/oauth/fallback_controller.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/fallback_controller.ex | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/pleroma/web/oauth/fallback_controller.ex b/lib/pleroma/web/oauth/fallback_controller.ex index f0fe3b578..afaa00242 100644 --- a/lib/pleroma/web/oauth/fallback_controller.ex +++ b/lib/pleroma/web/oauth/fallback_controller.ex @@ -6,8 +6,21 @@ defmodule Pleroma.Web.OAuth.FallbackController do use Pleroma.Web, :controller alias Pleroma.Web.OAuth.OAuthController - # No user/password - def call(conn, _) do + def call(conn, {:register, :generic_error}) do + conn + |> put_status(:internal_server_error) + |> put_flash(:error, "Unknown error, please check the details and try again.") + |> OAuthController.registration_details(conn.params) + end + + def call(conn, {:register, _error}) do + conn + |> put_status(:unauthorized) + |> put_flash(:error, "Invalid Username/Password") + |> OAuthController.registration_details(conn.params) + end + + def call(conn, _error) do conn |> put_status(:unauthorized) |> put_flash(:error, "Invalid Username/Password") |