From 73249fa5ff25c3f40ca79dfb9e4ce49b0dc1326b Mon Sep 17 00:00:00 2001 From: Calv Collins Date: Thu, 8 Feb 2018 18:15:59 +0000 Subject: [PATCH] Changed fallback controller to handle all cases from OAuthController --- lib/pleroma/web/oauth/fallback_controller.ex | 11 ++--------- 1 file 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)