Merge remote-tracking branch 'origin/develop' into matrixmatrix

1 files changed, 0 insertions, 32 deletions

diff --git a/lib/pleroma/web/oauth/fallback_controller.ex b/lib/pleroma/web/oauth/fallback_controller.ex
deleted file mode 100644
index a89ced886..000000000
--- a/lib/pleroma/web/oauth/fallback_controller.ex
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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