Merge branch 'login-with-email' into 'develop'

When logging in, try treating the login as an email

Closes #245

See merge request pleroma/pleroma!295
This commit is contained in:
kaniini 2018-08-26 21:35:12 +00:00
commit c9e4c45e0e
1 changed files with 10 additions and 2 deletions

View File

@ -8,8 +8,16 @@ defmodule Pleroma.Web.Router do
@public Keyword.get(@instance, :public) @public Keyword.get(@instance, :public)
@registrations_open Keyword.get(@instance, :registrations_open) @registrations_open Keyword.get(@instance, :registrations_open)
def user_fetcher(username) do def user_fetcher(username_or_email) do
{:ok, Repo.get_by(User, %{nickname: username})} {
:ok,
cond do
# First, try logging in as if it was a name
user = Repo.get_by(User, %{nickname: username_or_email}) -> user
# If we get nil, we try using it as an email
user = Repo.get_by(User, %{email: username_or_email}) -> user
end
}
end end
pipeline :api do pipeline :api do