Merge branch 'bugfix/oauth-password-with-email' into 'develop'
oauth: fix password-based login when username is email address Closes #199 See merge request pleroma/pleroma!220
This commit is contained in:
commit
280ac243aa
|
@ -84,7 +84,7 @@ def token_exchange(
|
|||
%{"grant_type" => "password", "name" => name, "password" => password} = params
|
||||
) do
|
||||
with %App{} = app <- get_app_from_request(conn, params),
|
||||
%User{} = user <- User.get_cached_by_nickname(name),
|
||||
%User{} = user <- User.get_by_nickname_or_email(name),
|
||||
true <- Pbkdf2.checkpw(password, user.password_hash),
|
||||
{:ok, auth} <- Authorization.create_authorization(app, user),
|
||||
{:ok, token} <- Token.exchange_token(app, auth) do
|
||||
|
|
Loading…
Reference in New Issue