projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
[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 1eeda3d245a2cba087413b8b0f7bc4f81fa8d9eb..f0fe3b5785b11902d02cf852d625d7f1fc2e3668 100644
(file)
--- 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
# No user/password
def call(conn, _) do
conn
+ |> put_status(:unauthorized)
|> put_flash(:error, "Invalid Username/Password")
|> put_flash(:error, "Invalid Username/Password")
- |> OAuthController.authorize(conn.params)
+ |> OAuthController.authorize(conn.params
["authorization"]
)
end
end
end
end