diff options
| author | Roger Braun <roger@rogerbraun.net> | 2018-02-11 09:50:55 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2018-02-11 09:50:55 +0100 |
| commit | 52200998c997576c9008cbe50b0a7b9f0e6134cc (patch) | |
| tree | c0d68f476442b8dd86fca1e182d5c09553800810 /lib/pleroma/web/oauth | |
| parent | 4a13b8488787773d09f67d1a436d5906e2f5b171 (diff) | |
| parent | 0e2ca77eec511857508208d3faeb9217c4496f8a (diff) | |
| download | pleroma-52200998c997576c9008cbe50b0a7b9f0e6134cc.tar.gz | |
Merge branch 'develop' into feature/activitypub
Diffstat (limited to 'lib/pleroma/web/oauth')
| -rw-r--r-- | lib/pleroma/web/oauth/fallback_controller.ex | 12 | ||||
| -rw-r--r-- | lib/pleroma/web/oauth/oauth_controller.ex | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/lib/pleroma/web/oauth/fallback_controller.ex b/lib/pleroma/web/oauth/fallback_controller.ex new file mode 100644 index 000000000..daa110532 --- /dev/null +++ b/lib/pleroma/web/oauth/fallback_controller.ex @@ -0,0 +1,12 @@ +defmodule Pleroma.Web.OAuth.FallbackController do + use Pleroma.Web, :controller + alias Pleroma.Web.OAuth.OAuthController + + # No user/password + def call(conn, _) do + conn + |> put_flash(:error, "Invalid Username/Password") + |> OAuthController.authorize(conn.params) + end + +end
\ No newline at end of file diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index e8483dec0..94318bfa9 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -5,6 +5,11 @@ defmodule Pleroma.Web.OAuth.OAuthController do alias Pleroma.{Repo, User} alias Comeonin.Pbkdf2 + plug :fetch_session + plug :fetch_flash + + action_fallback Pleroma.Web.OAuth.FallbackController + def authorize(conn, params) do render conn, "show.html", %{ response_type: params["response_type"], |