hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

MastoAPI and OAuth: allow login with either email or username.

Browse source
This commit is contained in:
eal 2018-04-18 13:13:57 +03:00
commit 947431e9aa
5 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/oauth/oauth_controller.ex
View file

@ -29,7 +29,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do
"redirect_uri" => redirect_uri
} = params
}) do
with %User{} = user <- User.get_cached_by_nickname(name),
with %User{} = user <- User.get_by_nickname_or_email(name),
true <- Pbkdf2.checkpw(password, user.password_hash),
%App{} = app <- Repo.get_by(App, client_id: client_id),
{:ok, auth} <- Authorization.create_authorization(app, user) do