Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 32 insertions, 0 deletions

diff --git a/lib/pleroma/web/o_auth/fallback_controller.ex b/lib/pleroma/web/o_auth/fallback_controller.ex
new file mode 100644
index 000000000..a89ced886
--- /dev/null
+++ b/lib/pleroma/web/o_auth/fallback_controller.ex
@@ -0,0 +1,32 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.OAuth.FallbackController do
+  use Pleroma.Web, :controller
+  alias Pleroma.Web.OAuth.OAuthController
+
+  def call(conn, {:register, :generic_error}) do
+    conn
+    |> put_status(:internal_server_error)
+    |> put_flash(
+      :error,
+      dgettext("errors", "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, dgettext("errors", "Invalid Username/Password"))
+    |> OAuthController.registration_details(conn.params)
+  end
+
+  def call(conn, _error) do
+    conn
+    |> put_status(:unauthorized)
+    |> put_flash(:error, dgettext("errors", "Invalid Username/Password"))
+    |> OAuthController.authorize(conn.params)
+  end
+end