Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'

[akkoma] / lib / pleroma / web / oauth / fallback_controller.ex

diff --git a/lib/pleroma/web/oauth/fallback_controller.ex b/lib/pleroma/web/oauth/fallback_controller.ex
index daa11053243ba5da3b05fdd186348d7f7b460106..a89ced8862aa35ea739ae1b125dc95beb63bee55 100644 (file)
--- a/lib/pleroma/web/oauth/fallback_controller.ex
+++ b/lib/pleroma/web/oauth/fallback_controller.ex
@@ -1,12 +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
+  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
 
-    # No user/password
-    def call(conn, _) do
-        conn
-        |> put_flash(:error, "Invalid Username/Password")
-        |> OAuthController.authorize(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
 
-end
\ No newline at end of file
+  def call(conn, _error) do
+    conn
+    |> put_status(:unauthorized)
+    |> put_flash(:error, dgettext("errors", "Invalid Username/Password"))
+    |> OAuthController.authorize(conn.params)
+  end
+end