Commit c9e4c45e authored by kaniini's avatar kaniini

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
parents 3448b434 540cce5d
......@@ -8,8 +8,16 @@ defmodule Pleroma.Web.Router do
@public Keyword.get(@instance, :public)
@registrations_open Keyword.get(@instance, :registrations_open)
def user_fetcher(username) do
{:ok, Repo.get_by(User, %{nickname: username})}
def user_fetcher(username_or_email) do
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
pipeline :api do
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment