aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorCalv Collins <calvcoll@gmail.com>2018-02-08 18:15:59 +0000
committerCalv Collins <calvcoll@gmail.com>2018-02-08 18:15:59 +0000
commit73249fa5ff25c3f40ca79dfb9e4ce49b0dc1326b (patch)
tree2dcd77c57d8d38488e311555d1f5df6c68f3e3eb /lib
parent314f4775c580552543ae7d26d66942b450ba136b (diff)
downloadpleroma-73249fa5ff25c3f40ca79dfb9e4ce49b0dc1326b.tar.gz
Changed fallback controller to handle all cases from OAuthController
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/oauth/fallback_controller.ex11
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/pleroma/web/oauth/fallback_controller.ex b/lib/pleroma/web/oauth/fallback_controller.ex
index 9ba9bc289..daa110532 100644
--- a/lib/pleroma/web/oauth/fallback_controller.ex
+++ b/lib/pleroma/web/oauth/fallback_controller.ex
@@ -2,15 +2,8 @@ defmodule Pleroma.Web.OAuth.FallbackController do
use Pleroma.Web, :controller
alias Pleroma.Web.OAuth.OAuthController
- # No user
- def call(conn, nil) do
- conn
- |> put_flash(:error, "Invalid Username/Password")
- |> OAuthController.authorize(conn.params)
- end
-
- # No password
- def call(conn, false) do
+ # No user/password
+ def call(conn, _) do
conn
|> put_flash(:error, "Invalid Username/Password")
|> OAuthController.authorize(conn.params)