aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/oauth/fallback_controller.ex
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2019-01-28 15:39:14 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2019-01-28 15:39:14 +0300
commitd3f9e6f6fed382ede8e314c370c21e84a119f65a (patch)
treec8cd63007993d25bb8c17b5b83e8761db9de3295 /lib/pleroma/web/oauth/fallback_controller.ex
parent1d2f41642cfec5710055bcf8409778bb362beecb (diff)
parentde0fb88a9cf587b9613e267d5dddfe55b0f414b7 (diff)
downloadpleroma-d3f9e6f6fed382ede8e314c370c21e84a119f65a.tar.gz
[#534] Merged `upstream/develop`.
Diffstat (limited to 'lib/pleroma/web/oauth/fallback_controller.ex')
-rw-r--r--lib/pleroma/web/oauth/fallback_controller.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/oauth/fallback_controller.ex b/lib/pleroma/web/oauth/fallback_controller.ex
index 1eeda3d24..f0fe3b578 100644
--- a/lib/pleroma/web/oauth/fallback_controller.ex
+++ b/lib/pleroma/web/oauth/fallback_controller.ex
@@ -9,7 +9,8 @@ defmodule Pleroma.Web.OAuth.FallbackController do
# No user/password
def call(conn, _) do
conn
+ |> put_status(:unauthorized)
|> put_flash(:error, "Invalid Username/Password")
- |> OAuthController.authorize(conn.params)
+ |> OAuthController.authorize(conn.params["authorization"])
end
end