Merge remote-tracking branch 'upstream/develop' into patch-image-description

[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..f0fe3b5785b11902d02cf852d625d7f1fc2e3668 100644 (file)
--- a/lib/pleroma/web/oauth/fallback_controller.ex
+++ b/lib/pleroma/web/oauth/fallback_controller.ex
@@ -1,12 +1,16 @@
-defmodule Pleroma.Web.OAuth.FallbackController do
-    use Pleroma.Web, :controller
-    alias Pleroma.Web.OAuth.OAuthController
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
 
-    # No user/password
-    def call(conn, _) do
-        conn
-        |> put_flash(:error, "Invalid Username/Password")
-        |> OAuthController.authorize(conn.params)
-    end
+defmodule Pleroma.Web.OAuth.FallbackController do
+  use Pleroma.Web, :controller
+  alias Pleroma.Web.OAuth.OAuthController
 
-end
\ No newline at end of file
+  # No user/password
+  def call(conn, _) do
+    conn
+    |> put_status(:unauthorized)
+    |> put_flash(:error, "Invalid Username/Password")
+    |> OAuthController.authorize(conn.params["authorization"])
+  end
+end