moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MastodonUI login: Show error message on error.

This commit is contained in:
Roger Braun 2017-11-23 12:06:14 +01:00
parent ad90da07f5
commit d16b613929
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -559,7 +559,7 @@ def index(%{assigns: %{user: user}} = conn, _params) do
def login(conn, _) do def login(conn, _) do
conn conn
|> render(MastodonView, "login.html") |> render(MastodonView, "login.html", %{error: false})
end end
defp get_or_make_app() do defp get_or_make_app() do
@ -581,6 +581,10 @@ def login_post(conn, %{"authorization" => %{ "name" => name, "password" => passw
conn conn
|> put_session(:oauth_token, token.token) |> put_session(:oauth_token, token.token)
|> redirect(to: "/web/getting-started") |> redirect(to: "/web/getting-started")
else
_e ->
conn
|> render(MastodonView, "login.html", %{error: "Wrong username or password"})
end end
end end

3
lib/pleroma/web/templates/mastodon_api/mastodon/login.html.eex
View File

@ -1,4 +1,7 @@
<h2>Login in to Mastodon Frontend</h2> <h2>Login in to Mastodon Frontend</h2>
<%= if @error do %>
<h2><%= @error %></h2>
<% end %>
<%= form_for @conn, mastodon_api_path(@conn, :login), [as: "authorization"], fn f -> %> <%= form_for @conn, mastodon_api_path(@conn, :login), [as: "authorization"], fn f -> %>
<%= text_input f, :name, placeholder: "Username" %> <%= text_input f, :name, placeholder: "Username" %>
<br> <br>